Changeset 32411 for gs3-extensions/solr

Timestamp:

2018-08-31T18:43:12+12:00 (6 years ago)

Author:

ak19

Message:

Next incremental change: now GS3 solr ext java code goes through ProtocolPortProperties.java to obtain the port and protocol. Will hereafter need to make ProtocolPortProperties constructors throw an exception on error and update all code using it.

Location:

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service

Files:

• GS2SolrSearch.java (modified) (2 diffs)
• SolrSearch.java (modified) (2 diffs)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java

@@ -49 +49 @@
 import org.greenstone.gsdl3.util.SolrQueryWrapper;
 import org.greenstone.util.GlobalProperties;
+import org.greenstone.util.ProtocolPortProperties;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -96 +97 @@
             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.http", "8383");
-            String protocol = globalProperties.getProperty("server.protocol", "http");
+            //String port = globalProperties.getProperty("tomcat.port.http", "8383");
+            //String protocol = globalProperties.getProperty("server.protocol", "http");
+            ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties);
+            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();
             String solrContext = globalProperties.getProperty("solr.context", "solr");
             

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/SolrSearch.java

@@ -7 +7 @@
 import org.greenstone.gsdl3.util.*;
 import org.greenstone.util.GlobalProperties;
+import org.greenstone.util.ProtocolPortProperties;
 
 // XML classes
@@ -46 +47 @@
         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.http", "8383");
-        String protocol = globalProperties.getProperty("server.protocol", "http");
+        //String port = globalProperties.getProperty("tomcat.port.http", "8383");
+        //String protocol = globalProperties.getProperty("server.protocol", "http");
+        ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties);
+        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();
         String solrContext = globalProperties.getProperty("solr.context", "solr");