Changeset 32357 for main/trunk/greenstone3/src

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>.

Location:

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

Files:

• gsdl3/service/FedoraServiceProxy.java (modified) (2 diffs)
• gsdl3/util/ServletRealmCheck.java (modified) (4 diffs)
• server/Server3.java (modified) (3 diffs)
• server/Server3Property.java (modified) (1 diff)
• util/GlobalProperties.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java

@@ -39 +39 @@
 import org.greenstone.gsdl3.util.OID;
 import org.greenstone.gsdl3.util.XMLConverter;
+import org.greenstone.util.ProtocolPortProperties;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -142 +143 @@
         globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties"));
         String host = globalProperties.getProperty("tomcat.server", "localhost");
-        String port = globalProperties.getProperty("tomcat.port", "8383");
-        String protocol = "http";
+        ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties);
+        if(protocolPortProps.hadError()) {
+        logger.error("Error with port/protocol in global.properties: " + protocolPortProps.getErrorMsg());
+        return false; // configure has failed
+        }
+        String protocol = protocolPortProps.getProtocol();
+        String port = protocolPortProps.getPort();
+
         String username = "fedoraIntCallUser"; //"fedoraAdmin"
         String password = "changeme"; //"<user password>"

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/ServletRealmCheck.java

@@ -29 +29 @@
 import java.net.URLConnection;
 import java.util.Properties;
+
+import org.greenstone.util.ProtocolPortProperties;
 
 /**
@@ -86 +88 @@
         // get the property value and print it out
         String servername = buildProps.getProperty("tomcat.server");
-        String port = buildProps.getProperty("tomcat.port");
+        //String protocol = buildProps.getProperty("server.protocol", "http");
+        //String port = buildProps.getProperty("tomcat.port"+protocol, "8383");
+        
+        ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(buildProps);
+        if(protocolPortProps.hadError()) {
+            throw new Exception("**** ERROR with port and/or protocol in build.properties:\n" + protocolPortProps.getErrorMsg());
+        }
+        String protocol = protocolPortProps.getProtocol();
+        String port = protocolPortProps.getPort();
         int portNum = Integer.parseInt(port);
         
@@ -94 +104 @@
             urlSuffix = urlSuffix + "&col="+collection;
         }
-        URL authenticationUrl = new URL("http", servername, portNum, urlSuffix);
+        URL authenticationUrl = new URL(protocol, servername, portNum, urlSuffix);
         
         HttpURLConnection conn = (HttpURLConnection)authenticationUrl.openConnection();     
@@ -120 +130 @@
         System.out.print(result); // don't add newline to end
         
-    } catch (IOException ex) {
+    } catch (Exception ex) {
         ex.printStackTrace();
     } finally {

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");

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

@@ -14 +14 @@
     }
 
+    Server3Property(String protocol)
+    {
+    // Initialising customised final variables 
+    // Version number, WEB_PORT, autoenter, startbrowser
+    // For GS3, the last two are controlled by the same property
+    super("3", "tomcat.port."+protocol, "server.auto.start", "server.auto.start", 
+          "server.keep.port", "server.external.access");
+    }
 }

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

@@ -181 +181 @@
 
             //port
-            portSpecifier = properties.getProperty("tomcat.port");
+            portSpecifier = properties.getProperty("tomcat.port"); // support for legacy tomcat.port?
+            if(portSpecifier == null) {
+                portSpecifier = protocolSpecifier.startsWith("https") ? properties.getProperty("tomcat.port.https") : properties.getProperty("tomcat.port.http");
+            }
             if (portSpecifier == null || portSpecifier.equals("") 
                 || (protocolSpecifier.equals("http://") && portSpecifier.equals("80"))