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

Timestamp:

2009-04-15T14:53:44+12:00 (15 years ago)

Author:

ak19

Message:

Updated several files so that the Server2 code in server.jar interacts with GLI code so that the local GS2 server for Linux works the same way as the GS2 Local Library Server on windows

File:

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

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

@@ -62 +62 @@
     reloadConfigProperties();
 
-    dictionary = new Dictionary("server", lang, this.getClass().getClassLoader());
-
+    dictionary = new Dictionary("server", lang, this.getClass().getClassLoader());  
     }
 
@@ -69 +68 @@
     {
     String auto_start = config_properties.getProperty(BaseServer.Property.AUTOSTART, "true");
-
     if (auto_start.equals("true") || auto_start.equals("1")) {
         String start_browser = config_properties.getProperty(BaseServer.Property.START_BROWSER, "true");
@@ -78 +76 @@
         else{
         start();
-        }  
+        }
+        
+        server_control_.setState(java.awt.Frame.ICONIFIED); // minimise the server interface window
     } else {
         reload(); // browser URL or other important properties may not yet be initialised
@@ -86 +86 @@
     }
 
-    // package access method
+    // package access methods
     BaseServerControl getServerControl() { 
     return server_control_; 
@@ -103 +103 @@
     public abstract void reload(); // reload properties, since they may have changed
     protected void preStop() {}
-
+    protected void postStart() {}
+    
     public void reconfigRequired()
     {
@@ -126 +127 @@
            recordError(CONFIGURE_CMD);
        }
-       reload();
+       reload(); // work out the browserURL again
        configure_required_ = false;
     }
@@ -137 +138 @@
     if (state != RunTarget.SUCCESS){
         recordError(START_CMD);
-            server_state_ = SERVER_START_FAILED;  
-            
+            server_state_ = SERVER_START_FAILED;            
     }               
     else{
         recordSuccess(START_CMD); 
             server_state_ = SERVER_STARTED; 
+        postStart();
         }