zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mic...@apache.org
Subject svn commit: r1577413 - in /zookeeper/branches/branch-3.4: CHANGES.txt bin/zkCli.cmd bin/zkEnv.cmd bin/zkServer.cmd
Date Fri, 14 Mar 2014 02:54:50 GMT
Author: michim
Date: Fri Mar 14 02:54:50 2014
New Revision: 1577413

URL: http://svn.apache.org/r1577413
Log:
ZOOKEEPER-1888. ZkCli.cmd commands fail with "'java' is not recognized as an internal or external
command" (Ivan Mitic via michim)

Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    zookeeper/branches/branch-3.4/bin/zkCli.cmd
    zookeeper/branches/branch-3.4/bin/zkEnv.cmd
    zookeeper/branches/branch-3.4/bin/zkServer.cmd

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1577413&r1=1577412&r2=1577413&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Fri Mar 14 02:54:50 2014
@@ -1,3 +1,11 @@
+Backward compatible changes:
+
+BUGFIXES:
+
+  ZOOKEEPER-1888. ZkCli.cmd commands fail with "'java' is not recognized as an
+  internal or external command" (Ivan Mitic via michim)
+
+
 Release 3.4.6 - 2014-03-10 
 
 Backward compatible changes:

Modified: zookeeper/branches/branch-3.4/bin/zkCli.cmd
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkCli.cmd?rev=1577413&r1=1577412&r2=1577413&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/bin/zkCli.cmd (original)
+++ zookeeper/branches/branch-3.4/bin/zkCli.cmd Fri Mar 14 02:54:50 2014
@@ -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
 

Modified: zookeeper/branches/branch-3.4/bin/zkEnv.cmd
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkEnv.cmd?rev=1577413&r1=1577412&r2=1577413&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/bin/zkEnv.cmd (original)
+++ zookeeper/branches/branch-3.4/bin/zkEnv.cmd Fri Mar 14 02:54:50 2014
@@ -32,3 +32,16 @@ SET CLASSPATH=%~dp0..\build\classes;%~dp
 
 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
\ No newline at end of file

Modified: zookeeper/branches/branch-3.4/bin/zkServer.cmd
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkServer.cmd?rev=1577413&r1=1577412&r2=1577413&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/bin/zkServer.cmd (original)
+++ zookeeper/branches/branch-3.4/bin/zkServer.cmd Fri Mar 14 02:54:50 2014
@@ -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
-



Mime
View raw message