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

Timestamp:

2009-04-01T19:31:09+13:00 (15 years ago)

Author:

ak19

Message:

Updated Server files for Linux GS2 Local Library Server to work the same way as the Windows GS2 LLS. Basically the major difference is that build.properties is no longer used but glisite.cfg or llssite.cfg depending on whether or not gs2-server.sh is launched from gli. There are a few additional changes required for this to keep it consistent with the way the Windows GS2 LLS works: storing the preview URL in glisite.cfg/llssite.cfg while the server is running and removing it when the server has stopped, Server2.java's main method taking the configfile as an additional parameter (and corresponding adjustments in the gsicontrol.sh script of GS2).

File:

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

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

@@ -24 +24 @@
     static protected final int SERVER_START_FAILED = 1;
     static protected final int BROWSER_LAUNCHED = 2;
-    static protected final int BROWSER_LAUNCH_FAILED = 3; 
+    static protected final int BROWSER_LAUNCH_FAILED = 3;
+    static protected final int START_SERVER = 4;
  
-    static protected Properties build_properties;
+    static protected Properties config_properties;
     static protected Logger logger_;
 
-    static public File build_properties_file;
+    static public File config_properties_file;
     static public Dictionary dictionary;
     static public BaseProperty Property;
@@ -37 +38 @@
     protected String gsdl_home;
     protected String logs_folder;
+    protected boolean start_browser;
+
     protected BaseServerControl server_control_;    
     
-    protected BaseServer(String gsdl_home, String lang, String build_properties_path, String logs)
+    protected BaseServer(String gsdl_home, String lang, String config_properties_path, String logs)
     {
     this.gsdl_home = gsdl_home;
@@ -49 +52 @@
     logger_ = Logger.getLogger(BaseServer.class.getName());
 
-    build_properties_file = new File(build_properties_path);
-
-    if (!build_properties_file.exists()) {
-        logger_.fatal("Can't find build.properties file "+build_properties_path);
+    config_properties_file = new File(config_properties_path);
+    
+    if (!config_properties_file.exists()) {
+        logger_.fatal("Can't find configuration file "+config_properties_path);
         System.exit(1);
     }
     
-    build_properties = new Properties();
-    reloadBuildProperties();
-    
+    config_properties = new Properties();
+    reloadConfigProperties();
+
     dictionary = new Dictionary("server", lang, this.getClass().getClassLoader());
 
@@ -65 +68 @@
     public void autoStart()
     {
-    String auto_start = build_properties.getProperty(BaseServer.Property.AUTOSTART);
-    if (auto_start != null && auto_start.equals("true")) {
-        restart();
-    }
-    else{
-        start();
-    }  
-    
+    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");
+
+        if (start_browser.equals("true") || start_browser.equals("1")) {
+        restart();
+        }
+        else{
+        start();
+        }  
+    } else {
+        reload(); // browser URL or other important properties may not yet be initialised
+        server_state_ = START_SERVER;
+        server_control_.updateControl();
+    }
     }
 
@@ -91 +102 @@
     public abstract String getBrowserURL();
     public abstract void reload(); // reload properties, since they may have changed
+    protected void preStop() {}
 
     public void reconfigRequired()
@@ -118 +130 @@
     }
     else{
-        recordSuccess(CONFIGURE_CMD); 
+        recordSuccess(CONFIGURE_CMD);
     }
     
@@ -162 +174 @@
     String url = getBrowserURL();
     //recordError("**** browserURL: " + url);
-    BrowserLauncher launcher = new BrowserLauncher(build_properties.getProperty(BaseServer.Property.BROWSER_PATH),url);
+    BrowserLauncher launcher = new BrowserLauncher(config_properties.getProperty(BaseServer.Property.BROWSER_PATH, ""),url);
         logger_.info(message);
 
@@ -203 +215 @@
 
     public void stop(boolean silent) {
+    preStop();
     if(!silent) {
         server_control_.displayMessage(dictionary.get("ServerControl.Stopping"));
@@ -217 +230 @@
     }
     
-    public  void reloadBuildProperties() {
+    public  void reloadConfigProperties() {
     try {
-        FileInputStream in = new FileInputStream(build_properties_file);
+        FileInputStream in = new FileInputStream(config_properties_file);
 
         if (in != null) {
-        logger_.info("loading build properties");
-        build_properties.load(in);
+        logger_.info("loading configuration properties: " + config_properties_file);
+        config_properties.load(in);
         in.close();
         } else {
-        logger_.error("Couldn't load build properties!");
+        logger_.error("Couldn't load configuration properties from " + config_properties_file + "!");
         }
     } catch (Exception e) {
-        logger_.error("Exception trying to reload build.properties: "+e);
+        logger_.error("Exception trying to reload configuration properties " +config_properties_file + ": " +e);
     }