Changeset 32334 for main/trunk/greenstone3/src

Timestamp:

2018-08-14T15:50:12+12:00 (6 years ago)

Author:

ak19

Message:

All the changes (still preliminary) that use tomcat.https.port and tomcat.http.port to determine tomcat.port and write it out to build.xml. Now the server application won't quite work: it can't change the port numbers as its code only knows to write out the tomcat.port, and the actual tomcat port (https or http) will remain unaffected. But I'll fix this later, as there may be a better way to do this.

Location:

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

Files:

• server/BaseServerSettings.java (modified) (1 diff)
• util/GlobalProperties.java (modified) (2 diffs)

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

@@ -52 +52 @@
         catch(Exception e){
         logger.error(e);
+        System.err.println("Unable to proceed. Port number property " + BaseServer.Property.WEB_PORT + " doesn't exist\nor contains a non-numeric value");
+        exit(-1);
     } 
 

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

@@ -153 +153 @@
 
             //protocol
-            if (properties.getProperty("tomcat.protocol") == null || properties.getProperty("tomcat.protocol").equals(""))
+            if (properties.getProperty("server.protocol") == null || properties.getProperty("server.protocol").equals(""))
             {
                 protocolSpecifier = "http://";
@@ -159 +159 @@
             else
             {
-                if (properties.getProperty("tomcat.protocol").endsWith("://"))
-                {
-                    protocolSpecifier = properties.getProperty("tomcat.protocol");
+                if (properties.getProperty("server.protocol").endsWith("://"))
+                {
+                    protocolSpecifier = properties.getProperty("server.protocol");
                 }
                 else
                 {
-                    protocolSpecifier = properties.getProperty("tomcat.protocol") + "://";
+                    protocolSpecifier = properties.getProperty("server.protocol") + "://";
                 }
             }