Changeset 24388 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.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/Gatherer.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -373 +373 @@
                 }
                 else {
-                    GS3ServerThread thread = new GS3ServerThread(gsdl_path, "start");
+                    GS3ServerThread thread = new GS3ServerThread(gsdl3_src_path, "restart");
                     thread.start();
                 }
@@ -715 +715 @@
             String shellCommand = null;
             Process p = null;
-            if (Utility.isWindows()) {              
-                p = Runtime.getRuntime().exec("cmd /C \"cd " + Configuration.gsdl_path + File.separator + ".. && ant stop\"\"");    
+            if (Utility.isWindows()) {
+                // cmd /C "cd "C:\path\to\greenstone3" && ant stop"
+                p = Runtime.getRuntime().exec("cmd /C \"cd \"" + Configuration.gsdl3_src_path + File.separator + "\" && ant stop\"");   
             } else {
-                p = Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "ant stop -f \"" + Configuration.gsdl_path + ".." + File.separator + "build.xml\""});
+                p = Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "ant stop -f \"" + Configuration.gsdl3_src_path + File.separator + "build.xml\""});
             }
             } catch(Exception e) {