Changeset 31665 for main/trunk/greenstone3/src/java/org/greenstone/server/BaseServer.java

Timestamp:

2017-05-08T21:18:21+12:00 (7 years ago)

Author:

ak19

Message:

GS3 source code now updated to use SafeProcess instead of Process (calling Runtime.exec() directly). The use of SafeProcess in RunTarget and BrowserLauncher has been tested on Linux. GDBMWrapper, MapRetrieve and admin/guiext's Command.java are not tested. For GDBMWrapper, because it's in a bit of code that works with txtgz databases. MapRetrive.java and Command.java are untested because I don't know how to test them.

File:

• main/trunk/greenstone3/src/java/org/greenstone/server/BaseServer.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/server/BaseServer.java

@@ -86 +86 @@
         if (configure_required_){
         server_control_.displayMessage(dictionary.get("ServerControl.Configuring"));
-        int state = runTarget(CONFIGURE_CMD);
+        int state = run(CONFIGURE_CMD);
         
         if (state != RunTarget.SUCCESS){
@@ -114 +114 @@
 
     protected abstract int runTarget(String cmd);
+
+    protected int run(String cmd) {
+    int result = runTarget(cmd);
+    server_control_.repaint();
+    // from Java 7, can just call revalidate() instead of invalidate() and validate():
+    server_control_.invalidate();
+    server_control_.validate();
+    return result;
+    }
+
     public abstract String getBrowserURL();
     public abstract void reload(); // reload properties, since they may have changed
@@ -136 +146 @@
         if (configure_required_){
         server_control_.displayMessage(dictionary.get("ServerControl.Configuring"));
-        state = runTarget(CONFIGURE_CMD);
+        state = run(CONFIGURE_CMD);
         
        if (state != RunTarget.SUCCESS){
@@ -153 +163 @@
         logger_.error("Exception trying to sleep: " + e);
     }
-        state = runTarget(START_CMD);
+        state = run(START_CMD);
     
     if (state != RunTarget.SUCCESS){
@@ -239 +249 @@
         server_control_.displayMessage(dictionary.get("ServerControl.Stopping"));
     }
-    int state = runTarget(STOP_CMD);
+    int state = run(STOP_CMD);
     
         if (state != RunTarget.SUCCESS){