Changeset 32411 for gs3-extensions
- Timestamp:
- 2018-08-31T18:43:12+12:00 (6 years ago)
- Location:
- gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java
r32410 r32411 49 49 import org.greenstone.gsdl3.util.SolrQueryWrapper; 50 50 import org.greenstone.util.GlobalProperties; 51 import org.greenstone.util.ProtocolPortProperties; 51 52 import org.w3c.dom.Document; 52 53 import org.w3c.dom.Element; … … 96 97 globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties")); 97 98 String host = globalProperties.getProperty("tomcat.server", "localhost"); 98 String port = globalProperties.getProperty("tomcat.port.http", "8383"); 99 String protocol = globalProperties.getProperty("server.protocol", "http"); 99 //String port = globalProperties.getProperty("tomcat.port.http", "8383"); 100 //String protocol = globalProperties.getProperty("server.protocol", "http"); 101 ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties); 102 if(protocolPortProps.hadError()) { 103 throw new Exception("**** ERROR with port and/or protocol in build.properties:\n" + protocolPortProps.getErrorMsg()); 104 } 105 String protocol = protocolPortProps.getProtocol(); 106 String port = protocolPortProps.getPort(); 100 107 String solrContext = globalProperties.getProperty("solr.context", "solr"); 101 108 -
gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/SolrSearch.java
r32410 r32411 7 7 import org.greenstone.gsdl3.util.*; 8 8 import org.greenstone.util.GlobalProperties; 9 import org.greenstone.util.ProtocolPortProperties; 9 10 10 11 // XML classes … … 46 47 globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties")); 47 48 String host = globalProperties.getProperty("tomcat.server", "localhost"); 48 String port = globalProperties.getProperty("tomcat.port.http", "8383"); 49 String protocol = globalProperties.getProperty("server.protocol", "http"); 49 //String port = globalProperties.getProperty("tomcat.port.http", "8383"); 50 //String protocol = globalProperties.getProperty("server.protocol", "http"); 51 ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties); 52 if(protocolPortProps.hadError()) { 53 throw new Exception("**** ERROR with port and/or protocol in build.properties:\n" + protocolPortProps.getErrorMsg()); 54 } 55 String protocol = protocolPortProps.getProtocol(); 56 String port = protocolPortProps.getPort(); 50 57 String solrContext = globalProperties.getProperty("solr.context", "solr"); 51 58
Note:
See TracChangeset
for help on using the changeset viewer.