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

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

@@ -44 +44 @@
 
         try {
-        this.portNum = Integer.parseInt(server.build_properties.getProperty(BaseServer.Property.WEB_PORT));
+        this.portNum = Integer.parseInt(server.config_properties.getProperty(BaseServer.Property.WEB_PORT));
     }
         catch(Exception e){
@@ -50 +50 @@
     } 
 
-        this.browserPath = server.build_properties.getProperty(BaseServer.Property.BROWSER_PATH);
+        this.browserPath = server.config_properties.getProperty(BaseServer.Property.BROWSER_PATH);
         
         if (this.browserPath == null || this.browserPath.equals("")){
@@ -60 +60 @@
     }
 
-    String auto_start_str = server.build_properties.getProperty(BaseServer.Property.AUTOSTART);
+    String auto_start_str = server.config_properties.getProperty(BaseServer.Property.AUTOSTART);
     if ((auto_start_str.trim()).equals("true")) {
         this.autoStart = true;
@@ -222 +222 @@
     
     public void actionPerformed(ActionEvent ev) {
-        // save everything to build_properties if things have changed
+        // save everything to config_properties if things have changed
          boolean has_changed = false;
              boolean require_restart = false;
@@ -268 +268 @@
         
         ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
-        oldFileLines = scriptReadWrite.readInFile(BaseServer.build_properties_file);
+        oldFileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
         
         newFileLines = scriptReadWrite.queryReplace(oldFileLines, BaseServer.Property.WEB_PORT, portNum+"");
@@ -284 +284 @@
         newFileLines = scriptReadWrite.queryReplace(newFileLines,BaseServer.Property.BROWSER_PATH, browserPath);
 
-        scriptReadWrite.writeOutFile(BaseServer.build_properties_file,
+        scriptReadWrite.writeOutFile(BaseServer.config_properties_file,
                          newFileLines);
-        server.reloadBuildProperties();
+        server.reloadConfigProperties();
         if (require_restart){
             JOptionPane.showMessageDialog(null,server.dictionary.get("ServerSetting.SettingChanged"),"Info", JOptionPane.INFORMATION_MESSAGE);