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

Timestamp:

2011-08-10T18:54:49+12:00 (13 years ago)

Author:

ak19

Message:

Fixed bug in starting and stopping GS3 server on Windows.

File:

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

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

@@ -42 +42 @@
 public class GS3ServerThread extends Thread
 {
-    String _gsdl_path = "";
+    String _gsdl3_src_path = "";
     String _ant_command = "";
     
-    public GS3ServerThread(String gsdl_path, String ant_command)
+    public GS3ServerThread(String gsdl3_src_path, String ant_command)
     {
-    _gsdl_path = gsdl_path;
-    _ant_command = ant_command;
+    _gsdl3_src_path = gsdl3_src_path;
+    _ant_command = ant_command; // "restart"
     }
     
@@ -62 +62 @@
                 _ant_command = "start";
             }
-            p = Runtime.getRuntime().exec("cmd /C \"cd " + _gsdl_path + File.separator + ".. && ant " + _ant_command + "\"\""); 
+            // The path in quotes, and the entire sequence of commands in quotes as well
+            // E.g. the following works: cmd /C "cd "C:\path\to\greenstone3" && ant stop"
+            // and it preserves any spaces in the path to GSDL3SRCHOME (_gsdl3_src_path).
+            p = Runtime.getRuntime().exec("cmd /C \"cd \"" + _gsdl3_src_path + File.separator + "\" && ant " + _ant_command + "\"");    
             }
         else
@@ -69 +72 @@
                 _ant_command = "restart";
             }
-            p = Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "ant " + _ant_command + " -f \"" + _gsdl_path + ".." + File.separator + "build.xml\""});
+            p = Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "ant " + _ant_command + " -f \"" + _gsdl3_src_path + File.separator + "build.xml\""});
             }
         }