Changeset 18868 for greenstone3/trunk/src/java/org/greenstone/server/Server2.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/Server2.java (modified) (6 diffs)

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

@@ -6 +6 @@
 import java.io.FileOutputStream;
 import java.util.Properties;
+import java.util.ArrayList;
 
 import org.apache.log4j.*;
@@ -16 +17 @@
     protected String libraryURL;
 
-    public Server2(String gsdl2_home, String lang)
+    public Server2(String gsdl2_home, String lang, String configfile)
     {
-    super(gsdl2_home, lang,
-          gsdl2_home+File.separator+"lib"+File.separator+"java"+File.separator+"build.properties",
-          "etc"+File.separator+"logs-gsi"); 
+    super(gsdl2_home, lang, configfile, "etc"+File.separator+"logs-gsi");   
+                   // configfile can be either glisite.cfg or llssite.cfg
+
 
     Property = new Server2Property();
@@ -30 +31 @@
     START_CMD     = "web-start";
     RESTART_CMD   = "web-restart";
-    CONFIGURE_CMD = "configure-web";
+    CONFIGURE_CMD = "configure-web " + configfile;
     STOP_CMD      = "web-stop";
 
@@ -122 +123 @@
         recordError("Could not open gsdlsite_cfg for reading, using default library prefix.");
         }
-        reloadBuildProperties();
-        host = build_properties.getProperty("apache.server", host);
-        port = build_properties.getProperty("apache.port", port);
+        reloadConfigProperties();
+        port = config_properties.getProperty("portnumber", port);
 
     } catch(Exception e) {
@@ -132 +132 @@
 
     libraryURL = "http://" + host + ":" + port + suffix;
-    //recordSuccess("**** browser URL is: " + libraryURL);
     
+    // the URL has been changed
+    // write the URL to the file since this should work like GS2's Local Lib Server for Windows
+    ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
+    ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
+    scriptReadWrite.replaceOrAddLine(fileLines, "url", libraryURL, true);
+    scriptReadWrite.writeOutFile(config_properties_file, fileLines);
     }
     
+    // About to stop the webserver
+    // Custom GS2 action: remove the url property from the config file
+    protected void preStop() {
+    ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
+    ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
+    if (fileLines.contains("url="+getBrowserURL())) {
+        // would be last element, remove it:
+        fileLines.remove(fileLines.size()-1);
+    }
+    scriptReadWrite.writeOutFile(config_properties_file, fileLines);
+    }
 
     public static void main (String[] args)
     {
-        if ((args.length < 1) || (args.length>2)) {
-        System.err.println("Usage: java org.greenstone.server.Server2 <gsdl2-home-dir> [lang]");
+        if ((args.length < 1) || (args.length > 3)) {
+        System.err.println("Usage: java org.greenstone.server.Server2 <gsdl2-home-dir> [lang] [--config=configfile]");
         System.exit(1);
     }
@@ -151 +167 @@
     }
     
-    String lang = (args.length==2) ? args[1] : "en";
-    new Server2(gsdl2_home,lang);
+    String lang = (args.length>=2) ? args[1] : "en";
+    
+    // if no config file is given, then the following defaults to llssite.cfg
+    String configfile = (args.length==3 && args[2].startsWith("--config=")) ? args[2] : gsdl2_home+File.separator+"llssite.cfg";
+    int equalSign = configfile.indexOf('=');
+    if(equalSign != -1) {
+        configfile = configfile.substring(equalSign+1);
+    }
+
+    new Server2(gsdl2_home,lang,configfile);
     }
 }