You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by eh...@apache.org on 2014/10/28 04:05:19 UTC
svn commit: r1634770 - in /lucene/dev/trunk/solr: ./ bin/
example/example-DIH/solr/db/conf/ example/example-DIH/solr/mail/conf/
example/example-DIH/solr/rss/conf/ example/example-DIH/solr/solr/conf/
example/example-DIH/solr/tika/conf/ example/example-s...
Author: ehatcher
Date: Tue Oct 28 03:05:19 2014
New Revision: 1634770
URL: http://svn.apache.org/r1634770
Log:
SOLR-6661: Adjust all example configurations to allow overriding error-prone relative paths for solrconfig.xml <lib> references with solr.install.dir system property; bin/solr scripts will set it appropriately.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/bin/solr
lucene/dev/trunk/solr/bin/solr.cmd
lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1634770&r1=1634769&r2=1634770&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Oct 28 03:05:19 2014
@@ -192,6 +192,7 @@ New Features
* SOLR-6655: SimplePostTool now features -Dhost, -Dport, and -Dc (for core/collection)
properties to allow easier overriding of just the right piece of the Solr URL.
+ (ehatcher)
Bug Fixes
----------------------
@@ -374,6 +375,10 @@ Other Changes
* SOLR-6651: Fix wrong timeout logged in waitForReplicasToComeUp. (shalin)
+* SOLR-6661: Adjust all example configurations to allow overriding error-prone
+ relative paths for solrconfig.xml <lib> references with solr.install.dir
+ system property; bin/solr scripts will set it appropriately. (ehatcher)
+
================== 4.10.1 ==================
Bug Fixes
Modified: lucene/dev/trunk/solr/bin/solr
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/bin/solr?rev=1634770&r1=1634769&r2=1634770&view=diff
==============================================================================
--- lucene/dev/trunk/solr/bin/solr (original)
+++ lucene/dev/trunk/solr/bin/solr Tue Oct 28 03:05:19 2014
@@ -877,6 +877,7 @@ function launch_solr() {
-DSTOP.PORT=$stop_port -DSTOP.KEY=$STOP_KEY \
$SOLR_HOST_ARG -Djetty.port=$SOLR_PORT \
-Dsolr.solr.home=$SOLR_HOME \
+-Dsolr.install.dir=$SOLR_TIP \
-Duser.timezone=$SOLR_TIMEZONE \
-Djava.net.preferIPv4Stack=true -Dsolr.autoSoftCommit.maxTime=3000"
Modified: lucene/dev/trunk/solr/bin/solr.cmd
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/bin/solr.cmd?rev=1634770&r1=1634769&r2=1634770&view=diff
==============================================================================
--- lucene/dev/trunk/solr/bin/solr.cmd (original)
+++ lucene/dev/trunk/solr/bin/solr.cmd Tue Oct 28 03:05:19 2014
@@ -522,10 +522,10 @@ cd "%SOLR_SERVER_DIR%"
IF "%FG%"=="1" (
REM run solr in the foreground
"%JAVA%" -server -Xss256k %SOLR_JAVA_MEM% %START_OPTS% -DSTOP.PORT=%STOP_PORT% -DSTOP.KEY=%STOP_KEY% ^
- -Djetty.port=%SOLR_PORT% -Dsolr.solr.home="%SOLR_HOME%" -jar start.jar
+ -Djetty.port=%SOLR_PORT% -Dsolr.solr.home="%SOLR_HOME%" -Dsolr.install.dir="%SOLR_TIP%" -jar start.jar
) ELSE (
START "" "%JAVA%" -server -Xss256k %SOLR_JAVA_MEM% %START_OPTS% -DSTOP.PORT=%STOP_PORT% -DSTOP.KEY=%STOP_KEY% ^
- -Djetty.port=%SOLR_PORT% -Dsolr.solr.home="%SOLR_HOME%" -jar start.jar > "%SOLR_SERVER_DIR%\logs\solr-%SOLR_PORT%-console.log"
+ -Djetty.port=%SOLR_PORT% -Dsolr.solr.home="%SOLR_HOME%" -Dsolr.install.dir="%SOLR_TIP%" -jar start.jar > "%SOLR_SERVER_DIR%\logs\solr-%SOLR_PORT%-console.log"
)
goto done
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1634770&r1=1634769&r2=1634770&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml Tue Oct 28 03:05:19 2014
@@ -72,19 +72,19 @@
The examples below can be used to load some solr-contribs along
with their external dependencies.
-->
- <lib dir="../../../../dist/" regex="solr-dataimporthandler-.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-dataimporthandler-.*\.jar" />
- <lib dir="../../../../contrib/extraction/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-cell-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
- <lib dir="../../../../contrib/clustering/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-clustering-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
- <lib dir="../../../../contrib/langid/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-langid-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
- <lib dir="../../../../contrib/velocity/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-velocity-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
<!-- an exact 'path' can be used instead of a 'dir' to specify a
specific jar file. This will cause a serious error to be logged
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1634770&r1=1634769&r2=1634770&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Tue Oct 28 03:05:19 2014
@@ -72,22 +72,22 @@
The examples below can be used to load some solr-contribs along
with their external dependencies.
-->
- <lib dir="../../../../contrib/dataimporthandler/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-dataimporthandler-.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/dataimporthandler/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-dataimporthandler-.*\.jar" />
- <lib dir="../../../../contrib/dataimporthandler-extras/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/dataimporthandler-extras/lib/" regex=".*\.jar" />
- <lib dir="../../../../contrib/extraction/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-cell-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
- <lib dir="../../../../contrib/clustering/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-clustering-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
- <lib dir="../../../../contrib/langid/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-langid-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
- <lib dir="../../../../contrib/velocity/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-velocity-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
<!-- an exact 'path' can be used instead of a 'dir' to specify a
specific jar file. This will cause a serious error to be logged
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1634770&r1=1634769&r2=1634770&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Tue Oct 28 03:05:19 2014
@@ -72,19 +72,19 @@
The examples below can be used to load some solr-contribs along
with their external dependencies.
-->
- <lib dir="../../../../dist/" regex="solr-dataimporthandler-.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-dataimporthandler-.*\.jar" />
- <lib dir="../../../../contrib/extraction/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-cell-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
- <lib dir="../../../../contrib/clustering/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-clustering-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
- <lib dir="../../../../contrib/langid/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-langid-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
- <lib dir="../../../../contrib/velocity/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-velocity-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
<!-- an exact 'path' can be used instead of a 'dir' to specify a
specific jar file. This will cause a serious error to be logged
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml?rev=1634770&r1=1634769&r2=1634770&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml Tue Oct 28 03:05:19 2014
@@ -72,19 +72,19 @@
The examples below can be used to load some solr-contribs along
with their external dependencies.
-->
- <lib dir="../../../../dist/" regex="solr-dataimporthandler-.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-dataimporthandler-.*\.jar" />
- <lib dir="../../../../contrib/extraction/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-cell-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
- <lib dir="../../../../contrib/clustering/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-clustering-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
- <lib dir="../../../../contrib/langid/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-langid-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
- <lib dir="../../../../contrib/velocity/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-velocity-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
<!-- an exact 'path' can be used instead of a 'dir' to specify a
specific jar file. This will cause a serious error to be logged
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1634770&r1=1634769&r2=1634770&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Tue Oct 28 03:05:19 2014
@@ -72,20 +72,20 @@
The examples below can be used to load some solr-contribs along
with their external dependencies.
-->
- <lib dir="../../../../contrib/dataimporthandler/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-dataimporthandler-.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/dataimporthandler/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-dataimporthandler-.*\.jar" />
- <lib dir="../../../../contrib/extraction/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-cell-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
- <lib dir="../../../../contrib/clustering/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-clustering-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
- <lib dir="../../../../contrib/langid/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-langid-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
- <lib dir="../../../../contrib/velocity/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-velocity-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
<!-- an exact 'path' can be used instead of a 'dir' to specify a
specific jar file. This will cause a serious error to be logged
Modified: lucene/dev/trunk/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml?rev=1634770&r1=1634769&r2=1634770&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml Tue Oct 28 03:05:19 2014
@@ -72,17 +72,17 @@
The examples below can be used to load some solr-contribs along
with their external dependencies.
-->
- <lib dir="../../../../contrib/extraction/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-cell-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
- <lib dir="../../../../contrib/clustering/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-clustering-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
- <lib dir="../../../../contrib/langid/lib/" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-langid-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
- <lib dir="../../../../contrib/velocity/lib" regex=".*\.jar" />
- <lib dir="../../../../dist/" regex="solr-velocity-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
<!-- an exact 'path' can be used instead of a 'dir' to specify a
specific jar file. This will cause a serious error to be logged
Modified: lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml?rev=1634770&r1=1634769&r2=1634770&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml Tue Oct 28 03:05:19 2014
@@ -72,17 +72,17 @@
The examples below can be used to load some solr-contribs along
with their external dependencies.
-->
- <lib dir="../../../contrib/extraction/lib" regex=".*\.jar" />
- <lib dir="../../../dist/" regex="solr-cell-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../..}/contrib/extraction/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../..}/dist/" regex="solr-cell-\d.*\.jar" />
- <lib dir="../../../contrib/clustering/lib/" regex=".*\.jar" />
- <lib dir="../../../dist/" regex="solr-clustering-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../..}/contrib/clustering/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
- <lib dir="../../../contrib/langid/lib/" regex=".*\.jar" />
- <lib dir="../../../dist/" regex="solr-langid-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../..}/contrib/langid/lib/" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../..}/dist/" regex="solr-langid-\d.*\.jar" />
- <lib dir="../../../contrib/velocity/lib" regex=".*\.jar" />
- <lib dir="../../../dist/" regex="solr-velocity-\d.*\.jar" />
+ <lib dir="${solr.install.dir:../../..}/contrib/velocity/lib" regex=".*\.jar" />
+ <lib dir="${solr.install.dir:../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
<!-- an exact 'path' can be used instead of a 'dir' to specify a
specific jar file. This will cause a serious error to be logged