Author: eevans
Date: Fri Mar 26 15:52:02 2010
New Revision: 927933
URL: http://svn.apache.org/viewvc?rev=927933&view=rev
Log:
remove build/lib/jars from runtime search paths
Patch by eevans for CASSANDRA-850
Modified:
cassandra/branches/cassandra-0.6/bin/cassandra-cli.bat
cassandra/branches/cassandra-0.6/bin/cassandra.bat
cassandra/branches/cassandra-0.6/bin/cassandra.in.sh
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=927933&r1=927932&r2=927933&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/bin/cassandra-cli.bat (original)
+++ cassandra/branches/cassandra-0.6/bin/cassandra-cli.bat Fri Mar 26 15:52:02
2010
@@ -26,8 +26,6 @@ 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
-REM In developer mode, we need to include the ivy downloaded jars.
-for %%i in (%CASSANDRA_HOME%\build\lib\jars\*.jar) do call :append %%~fi
goto okClasspath
:append
@@ -50,4 +48,4 @@ pause
:finally
-ENDLOCAL
\ No newline at end of file
+ENDLOCAL
Modified: cassandra/branches/cassandra-0.6/bin/cassandra.bat
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/bin/cassandra.bat?rev=927933&r1=927932&r2=927933&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/bin/cassandra.bat (original)
+++ cassandra/branches/cassandra-0.6/bin/cassandra.bat Fri Mar 26 15:52:02 2010
@@ -48,8 +48,6 @@ 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
-REM In developer mode, we need to include the ivy downloaded jars.
-for %%i in (%CASSANDRA_HOME%\build\lib\jars\*.jar) do call :append %%~fi
goto okClasspath
:append
Modified: cassandra/branches/cassandra-0.6/bin/cassandra.in.sh
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/bin/cassandra.in.sh?rev=927933&r1=927932&r2=927933&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/bin/cassandra.in.sh (original)
+++ cassandra/branches/cassandra-0.6/bin/cassandra.in.sh Fri Mar 26 15:52:02
2010
@@ -32,7 +32,7 @@ cassandra_bin=$cassandra_home/build/clas
# The java classpath (required)
CLASSPATH=$CASSANDRA_CONF:$cassandra_bin
-for jar in $cassandra_home/lib/*.jar $cassandra_home/build/lib/jars/*.jar; do
+for jar in $cassandra_home/lib/*.jar; do
CLASSPATH=$CLASSPATH:$jar
done
