From 90e3ec44030b31f853dfd02d6cd3a4a74d990b94 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Fri, 27 Jan 2012 14:55:18 +0000 Subject: [PATCH 1/2] fix classpath quoting patch by Nick Bailey and jbellis for CASSANDRA-3744 --- bin/json2sstable.bat | 6 +++--- bin/nodetool.bat | 3 +-- bin/sstable2json.bat | 6 +++--- bin/sstablekeys.bat | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/bin/json2sstable.bat b/bin/json2sstable.bat index ceb7987f03..b42c34edb5 100644 --- a/bin/json2sstable.bat +++ b/bin/json2sstable.bat @@ -32,11 +32,11 @@ REM Ensure that any user defined CLASSPATH variables are not used on startup set CLASSPATH="%CASSANDRA_HOME%\conf" REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable. -for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append %%~fi +for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i" goto okClasspath :append -set CLASSPATH=%CLASSPATH%;%1%2 +set CLASSPATH=%CLASSPATH%;%1 goto :eof :okClasspath @@ -55,7 +55,7 @@ set TOOLS_PARAMS=%TOOLS_PARAMS% %1 goto :eof :runTool -"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp "%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS% +"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%" %TOOLS_PARAMS% goto finally :err diff --git a/bin/nodetool.bat b/bin/nodetool.bat index a78c1c96e5..200fb4a9d4 100644 --- a/bin/nodetool.bat +++ b/bin/nodetool.bat @@ -24,7 +24,6 @@ REM Ensure that any user defined CLASSPATH variables are not used on startup set CLASSPATH="%CASSANDRA_HOME%\conf" REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable. -rem for %%i in (%CASSANDRA_HOME%\lib*.jar) do call :append %%~fi for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i" goto okClasspath @@ -39,7 +38,7 @@ goto runNodeTool :runNodeTool echo Starting NodeTool -"%JAVA_HOME%\bin\java" -cp "%CASSANDRA_CLASSPATH%" -Dlog4j.configuration=log4j-tools.properties org.apache.cassandra.tools.NodeCmd %* +"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% -Dlog4j.configuration=log4j-tools.properties org.apache.cassandra.tools.NodeCmd %* goto finally :err diff --git a/bin/sstable2json.bat b/bin/sstable2json.bat index cc4cbce083..45dcd50873 100644 --- a/bin/sstable2json.bat +++ b/bin/sstable2json.bat @@ -32,11 +32,11 @@ REM Ensure that any user defined CLASSPATH variables are not used on startup set CLASSPATH="%CASSANDRA_HOME%\conf" REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable. -for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append %%~fi +for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i" goto okClasspath :append -set CLASSPATH=%CLASSPATH%;%1%2 +set CLASSPATH=%CLASSPATH%;%1 goto :eof :okClasspath @@ -55,7 +55,7 @@ set TOOLS_PARAMS=%TOOLS_PARAMS% %1 goto :eof :runTool -"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp "%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS% +"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%" %TOOLS_PARAMS% goto finally :err diff --git a/bin/sstablekeys.bat b/bin/sstablekeys.bat index 7d6446a7de..88b33bc6a0 100644 --- a/bin/sstablekeys.bat +++ b/bin/sstablekeys.bat @@ -32,11 +32,11 @@ REM Ensure that any user defined CLASSPATH variables are not used on startup set CLASSPATH="%CASSANDRA_HOME%\conf" REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable. -for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append %%~fi +for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i" goto okClasspath :append -set CLASSPATH=%CLASSPATH%;%1%2 +set CLASSPATH=%CLASSPATH%;%1 goto :eof :okClasspath @@ -49,7 +49,7 @@ set TOOLS_PARAMS= goto runTool :runTool -"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp "%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %1 -e +"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp %CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%" %1 -e goto finally :err From 2a1ec27e2621709bf3f85a71ef2061d3f48b7598 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Fri, 27 Jan 2012 15:03:02 +0000 Subject: [PATCH 2/2] s/goto err/goto :err/ --- bin/cassandra-cli.bat | 2 +- bin/cassandra.bat | 2 +- bin/json2sstable.bat | 2 +- bin/nodetool.bat | 2 +- bin/sstable2json.bat | 2 +- bin/sstablekeys.bat | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/cassandra-cli.bat b/bin/cassandra-cli.bat index a4d01023e0..0d52bdf48c 100644 --- a/bin/cassandra-cli.bat +++ b/bin/cassandra-cli.bat @@ -19,7 +19,7 @@ if "%OS%" == "Windows_NT" setlocal if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0.. -if NOT DEFINED JAVA_HOME goto err +if NOT DEFINED JAVA_HOME goto :err REM Ensure that any user defined CLASSPATH variables are not used on startup set CLASSPATH= diff --git a/bin/cassandra.bat b/bin/cassandra.bat index 58e9611a78..283abe9454 100644 --- a/bin/cassandra.bat +++ b/bin/cassandra.bat @@ -26,7 +26,7 @@ if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD% popd if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.thrift.CassandraDaemon -if NOT DEFINED JAVA_HOME goto err +if NOT DEFINED JAVA_HOME goto :err REM ***** JAVA options ***** set JAVA_OPTS=-ea^ diff --git a/bin/json2sstable.bat b/bin/json2sstable.bat index b42c34edb5..dc1e8f664d 100644 --- a/bin/json2sstable.bat +++ b/bin/json2sstable.bat @@ -20,7 +20,7 @@ if "%OS%" == "Windows_NT" setlocal if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0.. if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF="%CASSANDRA_HOME%\conf" if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.tools.SSTableImport -if NOT DEFINED JAVA_HOME goto err +if NOT DEFINED JAVA_HOME goto :err REM ***** JAVA options ***** set JAVA_OPTS=^ diff --git a/bin/nodetool.bat b/bin/nodetool.bat index 200fb4a9d4..2f74687e00 100644 --- a/bin/nodetool.bat +++ b/bin/nodetool.bat @@ -18,7 +18,7 @@ if "%OS%" == "Windows_NT" setlocal if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0.. -if NOT DEFINED JAVA_HOME goto err +if NOT DEFINED JAVA_HOME goto :err REM Ensure that any user defined CLASSPATH variables are not used on startup set CLASSPATH="%CASSANDRA_HOME%\conf" diff --git a/bin/sstable2json.bat b/bin/sstable2json.bat index 45dcd50873..9544e0caab 100644 --- a/bin/sstable2json.bat +++ b/bin/sstable2json.bat @@ -20,7 +20,7 @@ if "%OS%" == "Windows_NT" setlocal if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0.. if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF="%CASSANDRA_HOME%\conf" if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.tools.SSTableExport -if NOT DEFINED JAVA_HOME goto err +if NOT DEFINED JAVA_HOME goto :err REM ***** JAVA options ***** set JAVA_OPTS=^ diff --git a/bin/sstablekeys.bat b/bin/sstablekeys.bat index 88b33bc6a0..6a483ba083 100644 --- a/bin/sstablekeys.bat +++ b/bin/sstablekeys.bat @@ -20,7 +20,7 @@ if "%OS%" == "Windows_NT" setlocal if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0.. if NOT DEFINED CASSANDRA_CONF set CASSANDRA_CONF="%CASSANDRA_HOME%\conf" if NOT DEFINED CASSANDRA_MAIN set CASSANDRA_MAIN=org.apache.cassandra.tools.SSTableExport -if NOT DEFINED JAVA_HOME goto err +if NOT DEFINED JAVA_HOME goto :err REM ***** JAVA options ***** set JAVA_OPTS=^