Changeset 32378 for gs3-extensions

Timestamp:

2018-08-24T20:44:34+12:00 (6 years ago)

Author:

Georgiy Litvinov

Message:

Get solr servlet name from build properties. Fixed port number property name

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

@@ -62 +62 @@
 {
 
-  public static final String SOLR_SERVLET_SUFFIX = "/solr";
   protected static final String SORT_ORDER_PARAM = "sortOrder";
   protected static final String SORT_ORDER_DESCENDING = "1";
@@ -97 +96 @@
             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 port = globalProperties.getProperty("tomcat.port.http", "8383");
             String protocol = globalProperties.getProperty("tomcat.protocol", "http");
+            String solrContext = globalProperties.getProperty("solr.context", "solr");
             
             String portStr = port.equals("80") ? "" : ":"+port;
-            solr_servlet_base_url = protocol+"://"+host+portStr+SOLR_SERVLET_SUFFIX;
+            solr_servlet_base_url = protocol+"://"+host+portStr+"/"+solrContext;
         } catch(Exception e) {
             logger.error("Error reading greenstone's tomcat solr server properties from global.properties", e);

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

@@ -31 +31 @@
 public class SolrSearch extends LuceneSearch {
 
-    public static final String SOLR_SERVLET_SUFFIX = "/solr";
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.SolrSearch.class.getName());
 
@@ -47 +46 @@
         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 port = globalProperties.getProperty("tomcat.port.http", "8383");
         String protocol = globalProperties.getProperty("tomcat.protocol", "http");
+        String solrContext = globalProperties.getProperty("solr.context", "solr");
         
         String portStr = port.equals("80") ? "" : ":"+port;
-        solr_servlet_base_url = protocol+"://"+host+portStr+SOLR_SERVLET_SUFFIX;
+        solr_servlet_base_url = protocol+"://"+host+portStr+"/"+solrContext;
     } catch(Exception e) {
         logger.error("Error reading greenstone's tomcat solr server properties from global.properties", e);