Changeset 18693

Timestamp:

2009-03-16T17:40:58+13:00 (15 years ago)

Author:

ak19

Message:

Changes to server.properties files so that the one for GS2 can be merged with the one for GS3. Corresponding changes in the java code.

Location:

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

Files:

• BaseProperty.java (modified) (1 diff)
• BaseServerControl.java (modified) (2 diffs)
• BaseServerSettings.java (modified) (1 diff)
• Server2Property.java (modified) (1 diff)
• Server2Settings.java (modified) (1 diff)
• Server3Property.java (modified) (1 diff)
• Server3Settings.java (modified) (1 diff)

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

@@ -16 +16 @@
     public final String BROWSER_PATH = "browser.path";
 
-    protected BaseProperty(String gsdl_home, 
-               String gsdl_version, String web_port) 
+    public final String SERVER_CONTROL;
+    public final String SERVER_SETTINGS;
+    
+    protected BaseProperty(String version, String web_port) 
     {
-    GSDL_HOME = gsdl_home;
-    GSDL_VERSION = gsdl_version;
+    // property names
     WEB_PORT = web_port;
+    GSDL_HOME = "gsdl"+version +".home";
+    GSDL_VERSION = "gsdl"+version+".version";
+    SERVER_CONTROL = "Server"+version+"Control";
+    SERVER_SETTINGS = "Server"+version+"Settings";
     }
 

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

@@ -50 +50 @@
 
 
-        String title = BaseServer.dictionary.get("ServerControl.Title");           
+        String title = BaseServer.dictionary.get(BaseServer.Property.SERVER_CONTROL+".Title");           
         title_label.setText(stringToHTML(title)); 
         title_label.setOpaque(false);   
@@ -58 +58 @@
 
         JLabel version_label = new JLabel();
-        String version = BaseServer.dictionary.get("ServerControl.Version").toLowerCase();
+        String version = BaseServer.dictionary.get(BaseServer.Property.SERVER_CONTROL+".Version").toLowerCase();
          
         version_label.setText(stringToHTML(version)); 

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

@@ -81 +81 @@
     setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
 
-    JLabel port_label = new JLabel(BaseServer.dictionary.get("ServerSettings.Tomcat_Port"));
+    JLabel port_label = new JLabel(BaseServer.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".Port"));
 
     portNumber_spinner = new JSpinner(new SpinnerNumberModel(portNum,1,65535,1));

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

@@ -8 +8 @@
     {
     // Initialising customised final variables 
-    // GSDL_HOME, GSDL_VERSION, WEB_PORT
-    super("gsdl2.home", "gsdl2.version", "apache.port");
+    // Version number, WEB_PORT
+    super("2", "apache.port");
     }
 

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

@@ -15 +15 @@
     protected JPanel createServletPanel()
     {
-    JLabel prefix_label = new JLabel(server.dictionary.get("ServerSettings.Library_Prefix"));
+    JLabel prefix_label = new JLabel(server.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".URL"));
 
     JComboBox prefix_combobox = new JComboBox();

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

@@ -8 +8 @@
     {
     // Initialising customised final variables 
-    // GSDL_HOME, GSDL_VERSION, WEB_PORT
-    super("gsdl3.home", "gsdl3.version", "tomcat.port");
+    // Version number, WEB_PORT
+    super("3", "tomcat.port");
     }
 

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

@@ -27 +27 @@
     {
 
-    JLabel servlet_label = new JLabel(server.dictionary.get("ServerSettings.Servlet"));
+    JLabel servlet_label = new JLabel(server.dictionary.get(BaseServer.Property.SERVER_SETTINGS+".URL"));
 
     servlet_combobox = new JComboBox();