svn commit: r1610463 - in /lucene/dev/trunk/solr: CHANGES.txt example/scripts/cloud-scripts/zkcli.bat

[el...@apache.org]

Author: elyograg
Date: Mon Jul 14 17:31:14 2014
New Revision: 1610463

URL: http://svn.apache.org/r1610463
Log:
SOLR-6120: Print a helpful error message from zkcli.bat when war is not extracted.

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/example/scripts/cloud-scripts/zkcli.bat

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1610463&r1=1610462&r2=1610463&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Jul 14 17:31:14 2014
@@ -209,6 +209,10 @@ Other Changes
 
 * SOLR-6228: Fixed bug in TestReplicationHandler.doTestIndexAndConfigReplication. (shalin)
 
+* SOLR-6120: On Windows, when the war is not extracted, the zkcli.bat script
+  will print a helpful message indicating that the war must be unzipped instead
+  of a java error about a missing class.
+
 ==================  4.9.0 ==================
 
 Versions of Major Components

Modified: lucene/dev/trunk/solr/example/scripts/cloud-scripts/zkcli.bat
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/scripts/cloud-scripts/zkcli.bat?rev=1610463&r1=1610462&r2=1610463&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/scripts/cloud-scripts/zkcli.bat (original)
+++ lucene/dev/trunk/solr/example/scripts/cloud-scripts/zkcli.bat Mon Jul 14 17:31:14 2014
@@ -1,3 +1,4 @@
+@echo off
 REM You can override pass the following parameters to this script:
 REM 
 
@@ -8,4 +9,13 @@ REM  Find location of this script
 set SDIR=%~dp0
 if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
 
+IF exist %SDIR%\..\..\solr-webapp\webapp\nul (
+  echo %SDIR%\....\..\solr-webapp\webapp exists
+) ELSE (
+  echo -------------------
+  echo Unzip example\webapps\solr.war to example\solr-webapp\. to use this script.
+  echo Starting the Solr example via start.jar will also do this extraction.
+  echo -------------------
+)
+
 "%JVM%" -Dlog4j.configuration="file:%SDIR%\log4j.properties" -classpath "%SDIR%\..\..\solr-webapp\webapp\WEB-INF\lib\*;%SDIR%\..\..\lib\ext\*" org.apache.solr.cloud.ZkCLI %*