svn commit: r1865347 - in /ofbiz: ofbiz-framework/trunk/framework/base/config/jndi.properties ofbiz-plugins/trunk/solr/config/solrconfig.properties ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java

Author: jleroux
Date: Sat Aug 17 11:34:01 2019
New Revision: 1865347

URL: http://svn.apache.org/viewvc?rev=1865347&view=rev
Log:
Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment property for Solr to load faster

Fixes previous commit where I hastily harcoded in jndi.properties file

Used a system property which can be used to define a JNDI environment
property

Modified:
    ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties
    ofbiz/ofbiz-plugins/trunk/solr/config/solrconfig.properties
    ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java

Modified: ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties?rev=1865347&r1=1865346&r2=1865347&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties Sat Aug 17 11:34:01 2019
@@ -31,5 +31,3 @@ java.naming.provider.url=rmi://127.0.0.1
 # Security settings - not enabled
 #java.naming.security.principal=<username>
 #java.naming.security.credentials=<password>
-
-solr/home=C:\projectsASF\ofbiz\plugins\solr\home
\ No newline at end of file

Modified: ofbiz/ofbiz-plugins/trunk/solr/config/solrconfig.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/config/solrconfig.properties?rev=1865347&r1=1865346&r2=1865347&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/config/solrconfig.properties (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/config/solrconfig.properties Sat Aug 17 11:34:01 2019
@@ -50,3 +50,6 @@ solr.client.trust.selfsigned.cert=true
 solr.log.dir=runtime/logs/solr
 # Defines Solr log level
 solr.log.level=INFO
+
+# Define the location of its home, speeds loading
+solr/home=/plugins/solr/home

Modified: ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java?rev=1865347&r1=1865346&r2=1865347&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java Sat Aug 17 11:34:01 2019
@@ -66,6 +66,7 @@ public class OFBizSolrContextFilter exte
         Properties props = System.getProperties();
         props.setProperty("solr.log.dir", UtilProperties.getPropertyValue("solrconfig", "solr.log.dir", "runtime/logs/solr"));
         props.setProperty("solr.log.level", UtilProperties.getPropertyValue("solrconfig", "solr.log.level", "INFO"));
+        props.setProperty("solr/home", UtilProperties.getPropertyValue("solrconfig", "solr/home"));
         super.init(config);
     }