Changeset 35661 for main/trunk/gli

Timestamp:

2021-10-21T18:58:59+13:00 (3 years ago)

Author:

davidb

Message:

Adjusted solution to how -noclasspath is explicitly set by Greenstone3 so we don't get the ant vs ant.jar cross-contamination problem. Previously it had been dealt with inside the GLI GS3ServerThread.java code (explicitly adding it in). In this update, the ANT_ARGS environment variable is set in gs3-setup.bash, thereby triggering the same outcome, but only needs to be done in one place.

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/GS3ServerThread.java (modified) (5 diffs)

main/trunk/gli/src/org/greenstone/gatherer/util/GS3ServerThread.java

@@ -63 +63 @@
     {
     ///System.err.println("**** GS3 server : " + _ant_command);
-
-    // NOTE on the use of 'noclasspath'
-    //
-    // The inclusion of the '-noclasspath' flag is to avoid the ant bash/bat script finding the ant.jar in
-    // Greenstone's web/WEB-INF area which ends up on CLASSPATH as a consequence of gs3-setup being run,
-    // which -- because that ant.jar file was produced by an older JDK -- then messes up our build.xml test for
-    // the version of java being using.  The test ends up being told the java version is 1.7, even if we are
-    // running a JDK8 or above!
-    //
-    // In more detail ...
-    // The ant.jar file we have in web/WEB-INF is from an ant v1.8.2 install make with a JDK7, and has the
-    // undesirable side affect of changing the Java properties for 'ant.version' and 'ant.java.version'.  In the
-    // case of the latter (ant.java.version = 1.7), this then means that when -- in our top-level build.xml
-    // file -- we test to make sure we are running a JDK8 or better, we get the answer 1.7 and so fail-out at that
-    // point (even though our JDK is newer than this).
-    //
-    // We get the problem in gli because gs3-setup.sh is run before the Java code is launched, which then goes
-    // on to run 'ant'.  By this point CLASSPATH has been set, containing ant.jar.  You don't necessarily see the
-    // problem running things like 'ant start' and 'ant stop' on the command line, as 'ant' is already running
-    // before build.xml triggers the sourcing of gs3-setup.bash.
-    
     
     SafeProcess p = null;
@@ -93 +72 @@
         // The path in quotes, and the entire sequence of commands in quotes as well
         // E.g. the following works in a Runtime.exec() call:
-        // cmd /C "cd "C:\path\to\greenstone3" && ant -noclasspath stop"
+        // cmd /C "cd "C:\path\to\greenstone3" && ant stop"
         // and it preserves any spaces in the path to GSDL3SRCHOME (_gsdl3_src_path).
-        p = new SafeProcess("cmd /C \"cd \"" + _gsdl3_src_path + File.separator + "\" && ant -noclasspath " + _ant_command + "\"");
+        p = new SafeProcess("cmd /C \"cd \"" + _gsdl3_src_path + File.separator + "\" && ant " + _ant_command + "\"");
     }
     else {
@@ -101 +80 @@
         _ant_command = "restart";
         }
-        p = new SafeProcess(new String[]{"/bin/bash", "-c", "ant -noclasspath " + _ant_command + " -f \"" + _gsdl3_src_path + File.separator + "build.xml\""});
+        p = new SafeProcess(new String[]{"/bin/bash", "-c", "ant " + _ant_command + " -f \"" + _gsdl3_src_path + File.separator + "build.xml\""});
     }
     
@@ -142 +121 @@
     SafeProcess p = null;
     if (Utility.isWindows()) {
-        // cmd /C "cd "C:\path\to\greenstone3" && ant -noclasspath stop"
-        p = new SafeProcess("cmd /C \"cd \"" + Configuration.gsdl3_src_path + File.separator + "\" && ant -noclasspath stop\"");    
+        // cmd /C "cd "C:\path\to\greenstone3" && ant stop"
+        p = new SafeProcess("cmd /C \"cd \"" + Configuration.gsdl3_src_path + File.separator + "\" && ant stop\""); 
     } else {
-        p = new SafeProcess(new String[]{"/bin/bash", "-c", "ant -noclasspath stop -f \"" + Configuration.gsdl3_src_path + File.separator + "build.xml\""});
+        p = new SafeProcess(new String[]{"/bin/bash", "-c", "ant stop -f \"" + Configuration.gsdl3_src_path + File.separator + "build.xml\""});
     }
 
@@ -171 +150 @@
 
     public static boolean isServerRunning() {
-    String antCmd = "ant -noclasspath verbose-check-tomcat-running";
+    String antCmd = "ant verbose-check-tomcat-running";
     
     SafeProcess p = null;