Changeset 18670

Timestamp:

2009-03-13T13:14:12+13:00 (15 years ago)

Author:

ak19

Message:

Overloaded methods of BaseServer getBrowserURL() and reload(), so that GlobalProperties is only used in GS3's Server class now.

File:

• greenstone3/trunk/src/java/org/greenstone/server/Server3.java (modified) (3 diffs)

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

@@ -6 +6 @@
 import org.greenstone.server.BaseServer;
 import org.greenstone.server.BaseProperty;
+import org.greenstone.gsdl3.util.GlobalProperties;
 
 public class Server3 extends BaseServer
@@ -12 +13 @@
     public Server3(String gsdl3_src_home, String lang)
     {
-    super(gsdl3_src_home,lang);         
+    super(gsdl3_src_home,lang, gsdl3_src_home+File.separatorChar+"build.properties");
 
     Property = new Server3Property();
@@ -36 +37 @@
     }
     
+    public String getBrowserURL() {
+    return GlobalProperties.getGSDL3WebAddress()+ build_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET);
+    }
+
+    public void reload() {
+    GlobalProperties.reload(); // properties file may have changed, so reload it
+    }
+
     public static void main (String[] args) 
     {