Author: gdusbabek
Date: Wed May 5 20:40:17 2010
New Revision: 941476
URL: http://svn.apache.org/viewvc?rev=941476&view=rev
Log:
make startup work on windows. Patch by Leif Hallgren, reviewed by Gary Dusbabek
and tested by n] (IRC nick).
Modified:
cassandra/branches/cassandra-0.6/bin/cassandra.bat
Modified: cassandra/branches/cassandra-0.6/bin/cassandra.bat
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/bin/cassandra.bat?rev=941476&r1=941475&r2=941476&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/bin/cassandra.bat (original)
+++ cassandra/branches/cassandra-0.6/bin/cassandra.bat Wed May 5 20:40:17 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.thrift.CassandraDaemon
if NOT DEFINED JAVA_HOME goto err
@@ -47,22 +47,22 @@ REM Ensure that any user defined CLASSPA
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
+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
REM Include the build\classes directory so it works in development
-set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes
+set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes"
set CASSANDRA_PARAMS=-Dcassandra -Dstorage-config="%CASSANDRA_CONF%"
-Dcassandra-foreground=yes
goto runDaemon
:runDaemon
echo Starting Cassandra Server
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp
"%CASSANDRA_CLASSPATH%" "%CASSANDRA_MAIN%"
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% %CASSANDRA_PARAMS% -cp
%CASSANDRA_CLASSPATH% "%CASSANDRA_MAIN%"
goto finally
:err
