Fix stress classpath and slf4j warnings. Patch by Nick Bailey, reviewed by Kirk True for CASSANDRA-4276
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5796542a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5796542a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5796542a Branch: refs/heads/trunk Commit: 5796542aa45a5defa0cadcb03662c527daa5f634 Parents: 5177d56 Author: Brandon Williams <[email protected]> Authored: Tue May 29 17:36:07 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue May 29 17:36:07 2012 -0500 ---------------------------------------------------------------------- build.xml | 3 --- tools/bin/cassandra.in.sh | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5796542a/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 33d8357..a42748b 100644 --- a/build.xml +++ b/build.xml @@ -781,9 +781,6 @@ <mkdir dir="${build.dir}/tools/lib/" /> <jar destfile="${build.dir}/tools/lib/stress.jar" manifest="${stress.manifest}"> <fileset dir="${stress.build.classes}"/> - <fileset dir="${basedir}/build/classes/main" /> - <fileset dir="${basedir}/build/classes/thrift" /> - <zipgroupfileset dir="${build.lib}" includes="*.jar" /> </jar> </target> http://git-wip-us.apache.org/repos/asf/cassandra/blob/5796542a/tools/bin/cassandra.in.sh ---------------------------------------------------------------------- diff --git a/tools/bin/cassandra.in.sh b/tools/bin/cassandra.in.sh index aad3257..74f1cc8 100644 --- a/tools/bin/cassandra.in.sh +++ b/tools/bin/cassandra.in.sh @@ -37,6 +37,9 @@ cassandra_bin=$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift # The java classpath (required) CLASSPATH=$CASSANDRA_CONF:$cassandra_bin +for jar in $CASSANDRA_HOME/tools/lib/*.jar; do + CLASSPATH=$CLASSPATH:$jar +done for jar in $CASSANDRA_HOME/lib/*.jar; do CLASSPATH=$CLASSPATH:$jar done
