svn commit: r1794133 - in /ofbiz/branches: release15.12/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml release16.11/ release16.11/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml

Author: jleroux
Date: Sat May  6 10:57:15 2017
New Revision: 1794133

URL: http://svn.apache.org/viewvc?rev=1794133&view=rev
Log:
"Applied fix BY HAND from trunk plugins for revision: 1794132"
------------------------------------------------------------------------
Fixed: Could not obtain Lock on lucene index Lock
(OFBIZ-7265)

In my last commit (r1792257) I did not use the right location.
It's now in runtime\indexes\solr which is the obviously right place in OFBiz!

Modified:
    ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release15.12/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml

Modified: ofbiz/branches/release15.12/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml?rev=1794133&r1=1794132&r2=1794133&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml Sat May  6 10:57:15 2017
@@ -101,7 +101,7 @@
        replication is in use, this should match the replication
        configuration.
     -->
-  <dataDir>${solr.data.dir:home/solrdefault/runtime/indexes/}</dataDir>
+  <dataDir>${solr.data.dir:runtime/indexes/solr/}</dataDir>
 
 
   <!-- The DirectoryFactory to use for indexes.

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May  6 10:57:15 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792638,1794008
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792638,1794008,1794132
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml?rev=1794133&r1=1794132&r2=1794133&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/solr/home/solrdefault/conf/solrconfig.xml Sat May  6 10:57:15 2017
@@ -101,7 +101,7 @@
        replication is in use, this should match the replication
        configuration.
     -->
-  <dataDir>${solr.data.dir:home/solrdefault/runtime/indexes/}</dataDir>
+  <dataDir>${solr.data.dir:runtime/indexes/solr/}</dataDir>
 
 
   <!-- The DirectoryFactory to use for indexes.