Changeset 24333

Timestamp:

2011-07-25T16:25:49+12:00 (12 years ago)

Author:

ak19

Message:

1. Sam had already update GLI for GS3 to issue ant start calls on starting up, so that the preview button would work for GLI running against GS3. Now an ant stop call is issued on GLI exit to match the startup sequence (note that this needs to be done in the main thread since we don't want GLI's main thread to exit which may then not have resulted in an ant stop being issued in a timely manner from its own separate GS3ServerThread). 2. Sam's GS3ServerThread class moved into its own class file.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (4 diffs)
• util/GS3ServerThread.java (added)

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

@@ -58 +58 @@
 import org.greenstone.gatherer.metadata.FilenameEncoding;
 import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
+import org.greenstone.gatherer.util.GS3ServerThread;
 import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -372 +373 @@
                 }
                 else {
-                    GS3ServerThread thread = new GS3ServerThread(gsdl_path);
+                    GS3ServerThread thread = new GS3ServerThread(gsdl_path, "start");
                     thread.start();
                 }
@@ -705 +706 @@
         if (isGsdlRemote) {
             remoteGreenstoneServer.exit();
+        } else if (GS3) { // stop the local tomcat web server when running GS3
+            // can't call ant stop from its own thread - what if GLI has exited by then?
+            // issue call to ant stop from the main GLI thread
+            //GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl_path, "stop");
+            //thread.start();
+
+            try {
+            String shellCommand = null;
+            Process p = null;
+            if (Utility.isWindows()) {              
+                p = Runtime.getRuntime().exec("cmd /C \"cd " + Configuration.gsdl_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\""});
+            }
+            } catch(Exception e) {
+            System.err.println("Exception when trying to stop the tomcat web server: " + e);
+            DebugStream.printStackTrace(e);
+            }
+            
         }
 
@@ -1595 +1615 @@
     }
     
-    public class GS3ServerThread extends Thread
-    {
-        String _gsdl_path = "";
-        
-        public GS3ServerThread(String gsdl_path)
-        {
-            _gsdl_path = gsdl_path;
-        }
-        
-        public void run()
-        {
-            try
-            {
-                String shellCommand = null;
-                Process p = null;
-                if (Utility.isWindows())
-                {
-                    p = Runtime.getRuntime().exec("cmd /C \"cd " + _gsdl_path + File.separator + ".. && ant start\"\"");    
-                }
-                else
-                {
-                    p = Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "ant restart -f \"" + _gsdl_path + ".." + File.separator + "build.xml\""});
-                }
-            }
-            catch(Exception ex)
-            {
-                ex.printStackTrace();
-            }
-        }
-    }
 }