Changeset 25387 for main/trunk

Timestamp:

2012-04-16T19:22:23+12:00 (12 years ago)

Author:

ak19

Message:

The GSDL3 web address constructed in GlobalProperties.java had been changed into a relative URL recently, but Server3.java still requires the full URL for the browser to open the correct page. So now GlobalProperties maintains a full URL variable alongside.

Location:

main/trunk/greenstone3/src/java/org/greenstone

Files:

• server/Server3.java (modified) (1 diff)
• util/GlobalProperties.java (modified) (3 diffs)

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

@@ -40 +40 @@
     
     public String getBrowserURL() {
-    return GlobalProperties.getGSDL3WebAddress()+ config_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET);
+    return GlobalProperties.getFullGSDL3WebAddress()+ config_properties.getProperty(BaseServer.Property.DEFAULT_SERVLET);
     }
 

main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java

@@ -36 +36 @@
     private static String gsdl3_home = null;
     private static String gsdl3_web_address = null;
+        private static String full_gsdl3_web_address = null;
 
     // Note, that if the servlet is reloadable, then it is reloaded each time the file is changed.
@@ -73 +74 @@
     {
         return gsdl3_web_address;
+    }
+
+        public static String getFullGSDL3WebAddress()
+    {
+        return full_gsdl3_web_address;
     }
 
@@ -156 +162 @@
 
             //string it all together
-            //gsdl3_web_address = protocolSpecifier + hostSpecifier + portSpecifier + contextSpecifier;
+            full_gsdl3_web_address = protocolSpecifier + hostSpecifier + portSpecifier + contextSpecifier;
             gsdl3_web_address = contextSpecifier;
         }