Author: jleroux
Date: Sat Aug 17 11:39:20 2019
New Revision: 1865350
URL: http://svn.apache.org/viewvc?rev=1865350&view=rev
Log:
"Applied fix from plugins for revision: 1865347"
------------------------------------------------------------------------
r1865347 | jleroux | 2019-08-17 13:34:01 +0200 (sam. 17 août 2019) | 9 lignes
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-plugins/branches/release18.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release18.12/solr/config/solrconfig.properties
ofbiz/ofbiz-plugins/branches/release18.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
Propchange: ofbiz/ofbiz-plugins/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 11:39:20 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900
/ofbiz/branches/multitenant20100310/plugins:921280-927264
/ofbiz/branches/release13.07/plugins:1547657
-/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466
+/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466,1865347
Modified:
ofbiz/ofbiz-plugins/branches/release18.12/solr/config/solrconfig.properties
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/solr/config/solrconfig.properties?rev=1865350&r1=1865349&r2=1865350&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/solr/config/solrconfig.properties
(original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/solr/config/solrconfig.properties
Sat Aug 17 11:39:20 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/branches/release18.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java?rev=1865350&r1=1865349&r2=1865350&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/branches/release18.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
(original)
+++
ofbiz/ofbiz-plugins/branches/release18.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
Sat Aug 17 11:39:20 2019
@@ -68,6 +68,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);
}
