Changeset 32410

Show
Ignore:
Timestamp:
31.08.2018 18:38:59 (11 months ago)
Author:
ak19
Message:

Incremental fix. In GS3's solr ext java code: global.properties also uses server.protocol not tomcat.protocol. Next fix will use ProtocolPortProperties?

Location:
gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java

    r32378 r32410  
    9797            String host = globalProperties.getProperty("tomcat.server", "localhost"); 
    9898            String port = globalProperties.getProperty("tomcat.port.http", "8383"); 
    99             String protocol = globalProperties.getProperty("tomcat.protocol", "http"); 
     99            String protocol = globalProperties.getProperty("server.protocol", "http"); 
    100100            String solrContext = globalProperties.getProperty("solr.context", "solr"); 
    101101             
  • gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/SolrSearch.java

    r32378 r32410  
    4747        String host = globalProperties.getProperty("tomcat.server", "localhost"); 
    4848        String port = globalProperties.getProperty("tomcat.port.http", "8383"); 
    49         String protocol = globalProperties.getProperty("tomcat.protocol", "http"); 
     49        String protocol = globalProperties.getProperty("server.protocol", "http"); 
    5050        String solrContext = globalProperties.getProperty("solr.context", "solr"); 
    5151