Changeset 32357 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/ServletRealmCheck.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/gsdl3/util/ServletRealmCheck.java (modified) (4 diffs)

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 {