You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/04/09 02:15:43 UTC
svn commit: r1465836 - in /lucene/dev/trunk/solr:
cloud-dev/solrcloud-extzk-start.sh cloud-dev/solrcloud-multi-start.sh
cloud-dev/solrcloud-start.sh example/cloud-scripts/zkcli.bat
example/cloud-scripts/zkcli.sh
Author: markrmiller
Date: Tue Apr 9 00:15:43 2013
New Revision: 1465836
URL: http://svn.apache.org/r1465836
Log:
SOLR-4691: zkcli.sh/bat is broken because it cannot find the logging jars.
Modified:
lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh
lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh
lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh
lucene/dev/trunk/solr/example/cloud-scripts/zkcli.bat
lucene/dev/trunk/solr/example/cloud-scripts/zkcli.sh
Modified: lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh?rev=1465836&r1=1465835&r2=1465836&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh Tue Apr 9 00:15:43 2013
@@ -24,7 +24,7 @@ cp -r -f example example4
cp -r -f example example5
cp -r -f example example6
-java -classpath lib/*:dist/*:build/lucene-libs/* org.apache.solr.cloud.ZkController "$zkaddress" 8983 example/solr/conf conf1
+java -classpath "example/solr-webapp/webapp/WEB-INF/lib/*:example/lib/ext/" org.apache.solr.cloud.ZkController "$zkaddress" 8983 example/solr/conf conf1
cd example
java -DzkHost="$zkaddress" -DnumShards=2 -DSTOP.PORT=7983 -DSTOP.KEY=key -jar start.jar 1>example.log 2>&1 &
Modified: lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh?rev=1465836&r1=1465835&r2=1465836&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh Tue Apr 9 00:15:43 2013
@@ -24,7 +24,7 @@ cp -r -f example example4
cp -r -f example example5
cp -r -f example example6
-java -classpath lib/*:dist/*:build/lucene-libs/* org.apache.solr.cloud.ZkCLI -cmd upconf -zkhost 127.0.0.1:9983 -solrhome example/multicore -runzk 8983
+java -classpath "example/solr-webapp/webapp/WEB-INF/lib/*:example/lib/ext/" org.apache.solr.cloud.ZkCLI -cmd upconf -zkhost 127.0.0.1:9983 -solrhome example/multicore -runzk 8983
cd example
java -DzkRun -DnumShards=2 -DSTOP.PORT=7983 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>example.log 2>&1 &
Modified: lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh?rev=1465836&r1=1465835&r2=1465836&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh Tue Apr 9 00:15:43 2013
@@ -25,7 +25,7 @@ cp -r -f example example4
cp -r -f example example5
cp -r -f example example6
-java -classpath "example/solr-webapp/webapp/WEB-INF/lib/*" org.apache.solr.cloud.ZkCLI -cmd bootstrap -zkhost 127.0.0.1:9983 -solrhome example/solr -runzk 8983
+java -classpath "example/solr-webapp/webapp/WEB-INF/lib/*:example/lib/ext/" org.apache.solr.cloud.ZkCLI -cmd bootstrap -zkhost 127.0.0.1:9983 -solrhome example/solr -runzk 8983
cd example
java -DzkRun -DnumShards=2 -DSTOP.PORT=7983 -DSTOP.KEY=key -jar start.jar 1>example.log 2>&1 &
Modified: lucene/dev/trunk/solr/example/cloud-scripts/zkcli.bat
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/cloud-scripts/zkcli.bat?rev=1465836&r1=1465835&r2=1465836&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/cloud-scripts/zkcli.bat (original)
+++ lucene/dev/trunk/solr/example/cloud-scripts/zkcli.bat Tue Apr 9 00:15:43 2013
@@ -9,4 +9,4 @@ set SDIR=%~dp0
if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
-"%JVM%" -classpath "%SDIR%\..\solr-webapp\webapp\WEB-INF\lib\*" org.apache.solr.cloud.ZkCLI %*
+"%JVM%" -classpath "%SDIR%\..\solr-webapp\webapp\WEB-INF\lib\*;%SDIR%\..\lib\ext" org.apache.solr.cloud.ZkCLI %*
Modified: lucene/dev/trunk/solr/example/cloud-scripts/zkcli.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/cloud-scripts/zkcli.sh?rev=1465836&r1=1465835&r2=1465836&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/cloud-scripts/zkcli.sh (original)
+++ lucene/dev/trunk/solr/example/cloud-scripts/zkcli.sh Tue Apr 9 00:15:43 2013
@@ -10,5 +10,5 @@ JVM="java"
sdir="`dirname \"$0\"`"
-$JVM -classpath "$sdir/../solr-webapp/webapp/WEB-INF/lib/*" org.apache.solr.cloud.ZkCLI ${1+"$@"}
+$JVM -classpath "$sdir/../solr-webapp/webapp/WEB-INF/lib/*:$sdir/../lib/ext/*" org.apache.solr.cloud.ZkCLI ${1+"$@"}