svn commit: r1865351 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./ solr/config/solrconfig.properties solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java

Author: jleroux
Date: Sat Aug 17 11:39:37 2019
New Revision: 1865351

URL: http://svn.apache.org/viewvc?rev=1865351&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/release17.12/   (props changed)
    ofbiz/ofbiz-plugins/branches/release17.12/solr/config/solrconfig.properties
    ofbiz/ofbiz-plugins/branches/release17.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java

Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 11:39:37 2019
@@ -11,4 +11,4 @@
 /ofbiz/branches/multitenant20100310/plugins:921280-927264
 /ofbiz/branches/release13.07/plugins:1547657
 /ofbiz/ofbiz-framework/trunk:1836107
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838797,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838797,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466,1865347

Modified: ofbiz/ofbiz-plugins/branches/release17.12/solr/config/solrconfig.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/solr/config/solrconfig.properties?rev=1865351&r1=1865350&r2=1865351&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/solr/config/solrconfig.properties (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/solr/config/solrconfig.properties Sat Aug 17 11:39:37 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/release17.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java?rev=1865351&r1=1865350&r2=1865351&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java Sat Aug 17 11:39:37 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);
     }