Author: jbellis
Date: Tue Nov 9 15:55:24 2010
New Revision: 1033044
URL: http://svn.apache.org/viewvc?rev=1033044&view=rev
Log:
Update windows .bat files towork outside of main Cassandra
patch by Vladimir Loncar; reviewed by Ben Coverston for CASSANDRA-1713
Modified:
cassandra/branches/cassandra-0.6/CHANGES.txt
cassandra/branches/cassandra-0.6/bin/cassandra-cli.bat
cassandra/branches/cassandra-0.6/bin/json2sstable.bat
cassandra/branches/cassandra-0.6/bin/nodetool.bat
cassandra/branches/cassandra-0.6/bin/sstable2json.bat
Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=1033044&r1=1033043&r2=1033044&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Tue Nov 9 15:55:24 2010
@@ -1,4 +1,9 @@
0.6.7
+ * Update windows .bat files to work outside of main Cassandra
+ directory (CASSANDRA-1713)
+
+
+0.6.7
* quorum read optimization (CASSANDRA-1622)
* update GC settings in cassandra.bat (CASSANDRA-1636)
* fix hinted handoff replay (CASSANDRA-1656)
Modified: cassandra/branches/cassandra-0.6/bin/cassandra-cli.bat
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/bin/cassandra-cli.bat?rev=1033044&r1=1033043&r2=1033044&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/bin/cassandra-cli.bat (original)
+++ cassandra/branches/cassandra-0.6/bin/cassandra-cli.bat Tue Nov 9 15:55:24
2010
@@ -18,7 +18,7 @@
@echo off
if "%OS%" == "Windows_NT" setlocal
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%
+if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
if NOT DEFINED JAVA_HOME goto err
REM Ensure that any user defined CLASSPATH variables are not used on startup
Modified: cassandra/branches/cassandra-0.6/bin/json2sstable.bat
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/bin/json2sstable.bat?rev=1033044&r1=1033043&r2=1033044&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/bin/json2sstable.bat (original)
+++ cassandra/branches/cassandra-0.6/bin/json2sstable.bat Tue Nov 9 15:55:24
2010
@@ -1,68 +1,68 @@
-...@rem
-...@rem Licensed to the Apache Software Foundation (ASF) under one or more
-...@rem contributor license agreements. See the NOTICE file distributed with
-...@rem this work for additional information regarding copyright ownership.
-...@rem The ASF licenses this file to You under the Apache License, Version
2.0
-...@rem (the "License"); you may not use this file except in compliance with
-...@rem the License. You may obtain a copy of the License at
-...@rem
-...@rem http://www.apache.org/licenses/LICENSE-2.0
-...@rem
-...@rem Unless required by applicable law or agreed to in writing, software
-...@rem distributed under the License is distributed on an "AS IS" BASIS,
-...@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-...@rem See the License for the specific language governing permissions and
-...@rem limitations under the License.
-
-...@echo off
-if "%OS%" == "Windows_NT" setlocal
-
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%
-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
-
-REM ***** JAVA options *****
-set JAVA_OPTS=^
- -Dlog4j.configuration=log4j-tools.properties^
- -Dstorage-config=storage-conf.xml
-
-REM ***** CLASSPATH library setting *****
-
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-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
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1%2
-goto :eof
-
-:okClasspath
-REM Include the build\classes directory so it works in development
-set
CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes;%CASSANDRA_CONF%
-
-set CASSANDRA_PARAMS=
-set TOOLS_PARAMS=
-
-FOR %%A IN (%*) DO call :appendToolsParams %%A
-
-goto runTool
-
-:appendToolsParams
-set TOOLS_PARAMS=%TOOLS_PARAMS% %1
-goto :eof
-
-:runTool
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp
"%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS%
-goto finally
-
-:err
-echo JAVA_HOME environment variable must be set!
-pause
-
-:finally
-
-ENDLOCAL
+...@rem
+...@rem Licensed to the Apache Software Foundation (ASF) under one or more
+...@rem contributor license agreements. See the NOTICE file distributed with
+...@rem this work for additional information regarding copyright ownership.
+...@rem The ASF licenses this file to You under the Apache License, Version
2.0
+...@rem (the "License"); you may not use this file except in compliance with
+...@rem the License. You may obtain a copy of the License at
+...@rem
+...@rem http://www.apache.org/licenses/LICENSE-2.0
+...@rem
+...@rem Unless required by applicable law or agreed to in writing, software
+...@rem distributed under the License is distributed on an "AS IS" BASIS,
+...@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+...@rem See the License for the specific language governing permissions and
+...@rem limitations under the License.
+
+...@echo off
+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
+
+REM ***** JAVA options *****
+set JAVA_OPTS=^
+ -Dlog4j.configuration=log4j-tools.properties^
+ -Dstorage-config=storage-conf.xml
+
+REM ***** CLASSPATH library setting *****
+
+REM Ensure that any user defined CLASSPATH variables are not used on startup
+set CLASSPATH=
+
+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
+goto okClasspath
+
+:append
+set CLASSPATH=%CLASSPATH%;%1%2
+goto :eof
+
+:okClasspath
+REM Include the build\classes directory so it works in development
+set
CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes;%CASSANDRA_CONF%
+
+set CASSANDRA_PARAMS=
+set TOOLS_PARAMS=
+
+FOR %%A IN (%*) DO call :appendToolsParams %%A
+
+goto runTool
+
+:appendToolsParams
+set TOOLS_PARAMS=%TOOLS_PARAMS% %1
+goto :eof
+
+:runTool
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp
"%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%" %TOOLS_PARAMS%
+goto finally
+
+:err
+echo JAVA_HOME environment variable must be set!
+pause
+
+:finally
+
+ENDLOCAL
Modified: cassandra/branches/cassandra-0.6/bin/nodetool.bat
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/bin/nodetool.bat?rev=1033044&r1=1033043&r2=1033044&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/bin/nodetool.bat (original)
+++ cassandra/branches/cassandra-0.6/bin/nodetool.bat Tue Nov 9 15:55:24 2010
@@ -17,7 +17,7 @@
@echo off
if "%OS%" == "Windows_NT" setlocal
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%
+if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
if NOT DEFINED JAVA_HOME goto err
REM Ensure that any user defined CLASSPATH variables are not used on startup
Modified: cassandra/branches/cassandra-0.6/bin/sstable2json.bat
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/bin/sstable2json.bat?rev=1033044&r1=1033043&r2=1033044&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/bin/sstable2json.bat (original)
+++ cassandra/branches/cassandra-0.6/bin/sstable2json.bat Tue Nov 9 15:55:24
2010
@@ -17,7 +17,7 @@
@echo off
if "%OS%" == "Windows_NT" setlocal
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%CD%
+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
@@ -56,7 +56,6 @@ set TOOLS_PARAMS=%TOOLS_PARAMS% %1
goto :eof
:runTool
-echo "%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
