Changeset 32357 for main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java

Timestamp:

2018-08-22T22:08:05+12:00 (6 years ago)

Author:

ak19

Message:

GS3 Java code has moved away from using tomcat.port to using tomcat.port.<protocol>.

File:

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

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

@@ -11 +11 @@
 import org.greenstone.server.BaseProperty;
 import org.greenstone.util.GlobalProperties;
+import org.greenstone.util.ProtocolPortProperties;
 import org.greenstone.util.RunAnt;
 
@@ -16 +17 @@
 {
         String opt_ant_properties = null;
+        ProtocolPortProperties protocolPortProps = null;
 
     public Server3(String gsdl3_src_home, String lang)
@@ -21 +23 @@
         super(gsdl3_src_home, lang, gsdl3_src_home + File.separatorChar + "build.properties", "web"+File.separator+"logs");
 
-        Property = new Server3Property();
+        // config properties are loaded into the config_properties object
+        // now test the port and protocol values are sane or exit.
+        protocolPortProps = new ProtocolPortProperties(config_properties);
+        if(protocolPortProps.hadError()) {
+            String errorMsg = "Error with port/protocol in " + config_properties_file + ": " + protocolPortProps.getErrorMsg();
+
+            // print it everywhere, because port/protocol misconfiguration is a fatal error and we're exiting
+            logger_.error(errorMsg);
+            System.err.println(errorMsg);
+            // If error, then quit this app as soon as possible
+            System.exit(-1);
+        }   
+        
+        Property = protocolPortProps.legacyMode ? new Server3Property() : new Server3Property(protocolPortProps.getProtocol());
 
         String frame_title = dictionary.get("ServerControl.Frame_Title");