lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r1598287 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/example/ solr/example/scripts/cloud-scripts/zkcli.sh
Date Thu, 29 May 2014 13:06:17 GMT
Author: shalin
Date: Thu May 29 13:06:17 2014
New Revision: 1598287

URL: http://svn.apache.org/r1598287
Log:
SOLR-6120: zkcli.sh should expand solr.war automatically instead of throwing ClassNotFoundException

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/example/   (props changed)
    lucene/dev/branches/branch_4x/solr/example/scripts/cloud-scripts/zkcli.sh

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1598287&r1=1598286&r2=1598287&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Thu May 29 13:06:17 2014
@@ -77,6 +77,9 @@ Bug Fixes
 
 * SOLR-6118: 'expand.sort' didn't support function queries. (David Smiley)
 
+* SOLR-6120: zkcli.sh should expand solr.war automatically instead of throwing
+  ClassNotFoundException. (sebastian badea, shalin)
+
 Other Changes
 ---------------------
 

Modified: lucene/dev/branches/branch_4x/solr/example/scripts/cloud-scripts/zkcli.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/scripts/cloud-scripts/zkcli.sh?rev=1598287&r1=1598286&r2=1598287&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/scripts/cloud-scripts/zkcli.sh (original)
+++ lucene/dev/branches/branch_4x/solr/example/scripts/cloud-scripts/zkcli.sh Thu May 29 13:06:17
2014
@@ -9,5 +9,9 @@ JVM="java"
 
 sdir="`dirname \"$0\"`"
 
+if [ ! -d "$sdir/../../solr-webapp/webapp" ]; then
+  unzip $sdir/../../webapps/solr.war -d $sdir/../../solr-webapp/webapp
+fi
+
 PATH=$JAVA_HOME/bin:$PATH $JVM -Dlog4j.configuration=file:$sdir/log4j.properties -classpath
"$sdir/../../solr-webapp/webapp/WEB-INF/lib/*:$sdir/../../lib/ext/*" org.apache.solr.cloud.ZkCLI
${1+"$@"}
 



Mime
View raw message