ZOOKEEPER-1888. ZkCli.cmd commands fail with "'java' is not recognized as an internal or external command" (Ivan Mitic via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1576127 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -564,6 +564,9 @@ BUGFIXES:
   ZOOKEEPER-1779. ReconfigTest littering the source root with test files
   (Abhiraj Butala via michim)
 
+  ZOOKEEPER-1888. ZkCli.cmd commands fail with "'java' is not recognized as an
+  internal or external command" (Ivan Mitic via michim)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

bin/zkCli.cmd

@@ -18,7 +18,7 @@ setlocal
 call "%~dp0zkEnv.cmd"
 
 set ZOOMAIN=org.apache.zookeeper.ZooKeeperMain
-java "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" -cp "%CLASSPATH%" %ZOOMAIN% %*
+call %JAVA% "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" -cp "%CLASSPATH%" %ZOOMAIN% %*
 
 endlocal
 

bin/zkEnv.cmd

@@ -32,3 +32,16 @@ SET CLASSPATH=%~dp0..\build\classes;%~dp0..\build\lib\*;%CLASSPATH%
 
 set ZOOCFG=%ZOOCFGDIR%\zoo.cfg
 
+@REM setup java environment variables
+
+if not defined JAVA_HOME (
+  echo Error: JAVA_HOME is not set.
+  goto :eof
+)
+
+if not exist %JAVA_HOME%\bin\java.exe (
+  echo Error: JAVA_HOME is incorrectly set.
+  goto :eof
+)
+
+set JAVA=%JAVA_HOME%\bin\java

bin/zkServer.cmd

@@ -19,7 +19,6 @@ call "%~dp0zkEnv.cmd"
 
 set ZOOMAIN=org.apache.zookeeper.server.quorum.QuorumPeerMain
 echo on
-java "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" -cp "%CLASSPATH%" %ZOOMAIN% "%ZOOCFG%" %*
+call %JAVA% "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" -cp "%CLASSPATH%" %ZOOMAIN% "%ZOOCFG%" %*
 
 endlocal
-