Changeset 32344 for main/trunk/greenstone3

Timestamp:

2018-08-16T16:06:50+12:00 (6 years ago)

Author:

ak19

Message:

1. Writing out tomcat.port.http(s) to global.properties only of set to a sensible value, else filter them with empty string for value. 2. GlobalProperties.java now maintains the default web URL and the web url for the other protocol if a port was provided for the other protocol.

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (2 diffs)
• src/java/org/greenstone/util/GlobalProperties.java (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -1431 +1431 @@
 
     <antcall target="set-perl-shebangs" inheritAll="true" />
-    
+    
     <filter token="gsdlhome" value="${gs2build.home}"/>
     <filter token="gsdlhomequoted" value="&quot;${gs2build.home}&quot;"/>
@@ -1443 +1443 @@
     <filter token="tomcat.server" value="${tomcat.server}"/>
     <filter token="tomcat.port" value="${internal.tomcat.port}"/>
-    <filter token="tomcat.port.http" value="${tomcat.port.http}"/>
-    <filter token="tomcat.port.https" value="${tomcat.port.https}"/>
+    <!-- add filters for tomcat.port.http and tomcat.port.https depending on if
+     these are set. If any is not set, set its filter to the empty string -->
+    <if>
+      <bool><isset property="tomcat.port.http"/></bool>
+      <filter token="tomcat.port.http" value="${tomcat.port.http}"/>
+      <else><filter token="tomcat.port.http" value=""/></else>
+    </if>
+    <if>
+      <bool><isset property="tomcat.port.https"/></bool>
+      <filter token="tomcat.port.https" value="${tomcat.port.https}"/>
+      <else><filter token="tomcat.port.https" value=""/></else>
+    </if>
     <filter token="greenstone.context" value="${greenstone.context}"/>
     <filter token="derbyserver" value="${derby.server}"/>

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

@@ -40 +40 @@
     private static String full_gsdl3_web_address = null;
 
+    private static String http_full_gsdl3_web_address = null;
+    private static String https_full_gsdl3_web_address = null;
+
     /** get the value of the property 'key'. returns null if not found */
     public static String getProperty(String key)
@@ -207 +210 @@
             full_gsdl3_web_address = protocolSpecifier + hostSpecifier + portSpecifier + contextSpecifier;
             gsdl3_web_address = contextSpecifier;
+
+            // set the http and https variants of the full web address, if they're meant to be available
+            if(protocolSpecifier.startsWith("https")) { // check the default protocol, then set the address for the other protocol too
+                https_full_gsdl3_web_address = full_gsdl3_web_address;
+
+                // and set http version, if sufficient properties are available
+                String httpPort = properties.getProperty("tomcat.port.http");
+                if(httpPort != null && !httpPort.equals("")) {
+                http_full_gsdl3_web_address = "http://" + hostSpecifier + httpPort + contextSpecifier;
+                }
+            } else { // default protocol was http
+                http_full_gsdl3_web_address = full_gsdl3_web_address;
+
+                // and set https version, if sufficient properties are available
+                String httpsPort = properties.getProperty("tomcat.port.https");
+                if(httpsPort != null && !httpsPort.equals("")) {
+                https_full_gsdl3_web_address = "https://" + hostSpecifier + httpsPort + contextSpecifier;
+                }
+            }
         }
         catch (Exception e)