You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by gd...@apache.org on 2010/06/11 19:11:16 UTC
svn commit: r953775 - in /cassandra/trunk/bin: json2sstable.bat nodetool.bat
sstable2json.bat
Author: gdusbabek
Date: Fri Jun 11 17:11:16 2010
New Revision: 953775
URL: http://svn.apache.org/viewvc?rev=953775&view=rev
Log:
hopeful modifications to window batch files. patch by gdusbabek, reviewed by jbellis. CASSANDRA-1110
Modified:
cassandra/trunk/bin/json2sstable.bat
cassandra/trunk/bin/nodetool.bat
cassandra/trunk/bin/sstable2json.bat
Modified: cassandra/trunk/bin/json2sstable.bat
URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/json2sstable.bat?rev=953775&r1=953774&r2=953775&view=diff
==============================================================================
--- cassandra/trunk/bin/json2sstable.bat (original)
+++ cassandra/trunk/bin/json2sstable.bat Fri Jun 11 17:11:16 2010
@@ -24,13 +24,12 @@ if NOT DEFINED JAVA_HOME goto err
REM ***** JAVA options *****
set JAVA_OPTS=^
- -Dlog4j.configuration=log4j-tools.properties^
- -Dstorage-config=storage-conf.xml
+ -Dlog4j.configuration=log4j-tools.properties
REM ***** CLASSPATH library setting *****
REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
+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
Modified: cassandra/trunk/bin/nodetool.bat
URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/nodetool.bat?rev=953775&r1=953774&r2=953775&view=diff
==============================================================================
--- cassandra/trunk/bin/nodetool.bat (original)
+++ cassandra/trunk/bin/nodetool.bat Fri Jun 11 17:11:16 2010
@@ -21,7 +21,7 @@ if NOT DEFINED CASSANDRA_HOME set CASSAN
if NOT DEFINED JAVA_HOME goto err
REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
+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
@@ -39,7 +39,7 @@ goto runNodeTool
:runNodeTool
echo Starting NodeTool
-"%JAVA_HOME%\bin\java" -cp "%CASSANDRA_CLASSPATH%" -Dstorage-config=%CASSANDRA_HOME%\conf\ -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
Modified: cassandra/trunk/bin/sstable2json.bat
URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/sstable2json.bat?rev=953775&r1=953774&r2=953775&view=diff
==============================================================================
--- cassandra/trunk/bin/sstable2json.bat (original)
+++ cassandra/trunk/bin/sstable2json.bat Fri Jun 11 17:11:16 2010
@@ -24,13 +24,12 @@ if NOT DEFINED JAVA_HOME goto err
REM ***** JAVA options *****
set JAVA_OPTS=^
- -Dlog4j.configuration=log4j-tools.properties^
- -Dstorage-config=storage-conf.xml
+ -Dlog4j.configuration=log4j-tools.properties
REM ***** CLASSPATH library setting *****
REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
+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