Author: eevans Date: Tue Mar 1 01:32:16 2011 New Revision: 1075609 URL: http://svn.apache.org/viewvc?rev=1075609&view=rev Log: compile thrift generated classes to separate jar
Patch by eevans; reviewed by tjake for CASSANDRA-1848 Modified: cassandra/trunk/bin/cassandra-cli.bat cassandra/trunk/bin/cassandra.bat cassandra/trunk/bin/cassandra.in.sh cassandra/trunk/bin/clustertool.bat cassandra/trunk/bin/json2sstable.bat cassandra/trunk/bin/nodetool.bat cassandra/trunk/bin/schematool.bat cassandra/trunk/bin/sstable2json.bat cassandra/trunk/bin/sstablekeys.bat cassandra/trunk/build.xml cassandra/trunk/contrib/circuit/bin/circuit cassandra/trunk/contrib/circuit/build.xml cassandra/trunk/contrib/javautils/build.xml cassandra/trunk/contrib/pig/build.xml cassandra/trunk/contrib/stress/bin/stress cassandra/trunk/contrib/stress/build.xml cassandra/trunk/contrib/word_count/bin/word_count cassandra/trunk/contrib/word_count/bin/word_count_setup cassandra/trunk/contrib/word_count/build.xml cassandra/trunk/test/cassandra.in.sh Modified: cassandra/trunk/bin/cassandra-cli.bat URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/cassandra-cli.bat?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/bin/cassandra-cli.bat (original) +++ cassandra/trunk/bin/cassandra-cli.bat Tue Mar 1 01:32:16 2011 @@ -34,7 +34,7 @@ goto :eof :okClasspath REM Include the build\classes\main directory so it works in development -set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main" +set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift" goto runCli :runCli Modified: cassandra/trunk/bin/cassandra.bat URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/cassandra.bat?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/bin/cassandra.bat (original) +++ cassandra/trunk/bin/cassandra.bat Tue Mar 1 01:32:16 2011 @@ -55,7 +55,7 @@ goto :eof :okClasspath REM Include the build\classes\main directory so it works in development -set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main" +set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift" set CASSANDRA_PARAMS=-Dcassandra -Dcassandra-foreground=yes goto runDaemon Modified: cassandra/trunk/bin/cassandra.in.sh URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/cassandra.in.sh?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/bin/cassandra.in.sh (original) +++ cassandra/trunk/bin/cassandra.in.sh Tue Mar 1 01:32:16 2011 @@ -27,6 +27,7 @@ fi # compiled classes. NOTE: This isn't needed by the startup script, # it's just used here in constructing the classpath. cassandra_bin=$CASSANDRA_HOME/build/classes/main +cassandra_bin=$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift #cassandra_bin=$cassandra_home/build/cassandra.jar # JAVA_HOME can optionally be set here Modified: cassandra/trunk/bin/clustertool.bat URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/clustertool.bat?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/bin/clustertool.bat (original) +++ cassandra/trunk/bin/clustertool.bat Tue Mar 1 01:32:16 2011 @@ -41,7 +41,7 @@ goto :eof :okClasspath REM Include the build\classes\main directory so it works in development -set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF% +set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF%;%CASSANDRA_HOME%\build\classes\thrift set CASSANDRA_PARAMS= set TOOLS_PARAMS= Modified: cassandra/trunk/bin/json2sstable.bat URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/json2sstable.bat?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/bin/json2sstable.bat (original) +++ cassandra/trunk/bin/json2sstable.bat Tue Mar 1 01:32:16 2011 @@ -41,7 +41,7 @@ goto :eof :okClasspath REM Include the build\classes\main directory so it works in development -set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF% +set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF%;%CASSANDRA_HOME%\build\classes\thrift set CASSANDRA_PARAMS= set TOOLS_PARAMS= Modified: cassandra/trunk/bin/nodetool.bat URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/nodetool.bat?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/bin/nodetool.bat (original) +++ cassandra/trunk/bin/nodetool.bat Tue Mar 1 01:32:16 2011 @@ -34,7 +34,7 @@ goto :eof :okClasspath REM Include the build\classes\main directory so it works in development -set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main +set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_HOME%\build\classes\thrift goto runNodeTool :runNodeTool @@ -48,4 +48,4 @@ pause :finally -ENDLOCAL \ No newline at end of file +ENDLOCAL Modified: cassandra/trunk/bin/schematool.bat URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/schematool.bat?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/bin/schematool.bat (original) +++ cassandra/trunk/bin/schematool.bat Tue Mar 1 01:32:16 2011 @@ -41,7 +41,7 @@ goto :eof :okClasspath REM Include the build\classes\main directory so it works in development -set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF% +set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF%;%CASSANDRA_HOME%\build\classes\thrift set CASSANDRA_PARAMS= set TOOLS_PARAMS= Modified: cassandra/trunk/bin/sstable2json.bat URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/sstable2json.bat?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/bin/sstable2json.bat (original) +++ cassandra/trunk/bin/sstable2json.bat Tue Mar 1 01:32:16 2011 @@ -41,7 +41,7 @@ goto :eof :okClasspath REM Include the build\classes\main directory so it works in development -set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF% +set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF%;%CASSANDRA_HOME%\build\classes\thrift set CASSANDRA_PARAMS= set TOOLS_PARAMS= Modified: cassandra/trunk/bin/sstablekeys.bat URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/sstablekeys.bat?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/bin/sstablekeys.bat (original) +++ cassandra/trunk/bin/sstablekeys.bat Tue Mar 1 01:32:16 2011 @@ -41,7 +41,7 @@ goto :eof :okClasspath REM Include the build\classes\main directory so it works in development -set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF% +set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF%;%CASSANDRA_HOME%\build\classes\thrift set CASSANDRA_PARAMS= set TOOLS_PARAMS= Modified: cassandra/trunk/build.xml URL: http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/build.xml (original) +++ cassandra/trunk/build.xml Tue Mar 1 01:32:16 2011 @@ -35,6 +35,7 @@ <property name="build.test.dir" value="${build.dir}/test"/> <property name="build.classes" value="${build.dir}/classes"/> <property name="build.classes.main" value="${build.classes}/main" /> + <property name="build.classes.thrift" value="${build.classes}/thrift" /> <property name="javadoc.dir" value="${build.dir}/javadoc"/> <property name="interface.dir" value="${basedir}/interface"/> <property name="interface.thrift.dir" value="${interface.dir}/thrift"/> @@ -88,6 +89,7 @@ <path id="cassandra.classpath"> <pathelement location="${cobertura.classes.dir}"/> <pathelement location="${build.classes.main}" /> + <pathelement location="${build.classes.thrift}" /> <fileset dir="${build.lib}"> <include name="**/*.jar" /> </fileset> @@ -103,6 +105,7 @@ <fail unless="is.source.artifact" message="Not a source artifact, stopping here." /> <mkdir dir="${build.classes.main}"/> + <mkdir dir="${build.classes.thrift}"/> <mkdir dir="${test.lib}"/> <mkdir dir="${test.classes}"/> <mkdir dir="${build.src.gen-java}"/> @@ -348,11 +351,16 @@ <target depends="init,avro-generate,gen-cli-grammar,gen-cql-grammar" name="build-project"> <echo message="${ant.project.name}: ${ant.file}"/> + <!-- Order matters! --> + <javac debug="true" debuglevel="${debuglevel}" + destdir="${build.classes.thrift}" includeantruntime="false"> + <src path="${interface.thrift.dir}/gen-java"/> + <classpath refid="cassandra.classpath"/> + </javac> <javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes.main}" includeantruntime="false"> <src path="${build.src.java}"/> <src path="${build.src.gen-java}"/> - <src path="${interface.thrift.dir}/gen-java"/> <src path="${build.src.driver}" /> <classpath refid="cassandra.classpath"/> </javac> @@ -370,10 +378,27 @@ --> <target name="jar" depends="build" description="Assemble Cassandra JAR files"> <mkdir dir="${build.classes.main}/META-INF" /> + <mkdir dir="${build.classes.thrift}/META-INF" /> <copy file="LICENSE.txt" tofile="${build.classes.main}/META-INF/LICENSE.txt"/> + <copy file="LICENSE.txt" + tofile="${build.classes.thrift}/META-INF/LICENSE.txt"/> <copy file="NOTICE.txt" tofile="${build.classes.main}/META-INF/NOTICE.txt"/> + <copy file="NOTICE.txt" + tofile="${build.classes.thrift}/META-INF/NOTICE.txt"/> + + <!-- Thrift Jar --> + <jar jarfile="${build.dir}/${ant.project.name}-thrift-${version}.jar" + basedir="${build.classes.thrift}"> + <manifest> + <attribute name="Implementation-Title" value="Cassandra"/> + <attribute name="Implementation-Version" value="${version}"/> + <attribute name="Implementation-Vendor" value="Apache"/> + </manifest> + </jar> + + <!-- Main Jar --> <jar jarfile="${build.dir}/${final.name}.jar" basedir="${build.classes.main}"> <manifest> @@ -381,7 +406,10 @@ <attribute name="Implementation-Title" value="Cassandra"/> <attribute name="Implementation-Version" value="${version}"/> <attribute name="Implementation-Vendor" value="Apache"/> - <attribute name="Premain-Class" value="org.apache.cassandra.infrastructure.continuations.CAgent"/> + <attribute name="Premain-Class" + value="org.apache.cassandra.infrastructure.continuations.CAgent"/> + <attribute name="Class-Path" + value="${ant.project.name}-thrift-${version}.jar" /> <!-- </section> --> </manifest> </jar> @@ -751,7 +779,8 @@ <classpathentry kind="src" path="test/unit"/> <classpathentry kind="src" path="test/long"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="${build.classes.main}"/> + <classpathentry kind="output" path="build/classes/main"/> + <classpathentry kind="lib" path="build/classes/thrift"/> <classpathentry kind="lib" path="build/test/classes"/> <classpathentry kind="lib" path="test/conf"/> ]]> Modified: cassandra/trunk/contrib/circuit/bin/circuit URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/circuit/bin/circuit?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/contrib/circuit/bin/circuit (original) +++ cassandra/trunk/contrib/circuit/bin/circuit Tue Mar 1 01:32:16 2011 @@ -26,12 +26,15 @@ if [ "x$CLASSPATH" = "x" ]; then fi # Circuit class files. - if [ ! -d `dirname $0`/../build/classes/main ]; then + if [ ! -d `dirname $0`/../build/classes ]; then echo "Unable to locate circuit class files" >&2 exit 1 fi - CLASSPATH=`dirname $0`/../../../build/classes/main:`dirname $0`/../build/classes/main + CLASSPATH=`dirname $0`/../../../build/classes/main + CLASSPATH=$CLASSPATH:`dirname $0`/../../../build/classes/thrift + CLASSPATH=$CLASSPATH:`dirname $0`/../build/classes + for jar in `dirname $0`/../../../lib/*.jar; do CLASSPATH=$CLASSPATH:$jar done Modified: cassandra/trunk/contrib/circuit/build.xml URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/circuit/build.xml?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/contrib/circuit/build.xml (original) +++ cassandra/trunk/contrib/circuit/build.xml Tue Mar 1 01:32:16 2011 @@ -20,7 +20,6 @@ <project basedir="." default="build" name="circuit"> <property name="cassandra.dir" value="../.." /> <property name="cassandra.lib" value="${cassandra.dir}/lib" /> - <property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" /> <property name="build.src" value="${basedir}/src" /> <property name="build.out" value="${basedir}/build" /> <property name="build.classes" value="${build.out}/classes" /> @@ -30,15 +29,20 @@ <mkdir dir="${build.classes}" /> </target> + <path id="cassandra.classes"> + <pathelement location="${cassandra.dir}/build/classes/main" /> + <pathelement location="${cassandra.dir}/build/classes/thrift" /> + </path> + <target depends="init" name="build"> <javac destdir="${build.classes}"> <src path="${build.src}" /> <classpath> + <path refid="cassandra.classes" /> <path> <fileset dir="${cassandra.lib}"> <include name="**/*.jar" /> </fileset> - <pathelement location="${cassandra.classes}" /> </path> </classpath> </javac> Modified: cassandra/trunk/contrib/javautils/build.xml URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/javautils/build.xml?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/contrib/javautils/build.xml (original) +++ cassandra/trunk/contrib/javautils/build.xml Tue Mar 1 01:32:16 2011 @@ -21,7 +21,7 @@ <property name="cassandra.dir" value="../.." /> <property name="cassandra.lib" value="${cassandra.dir}/lib" /> <property name="test.lib" value="${cassandra.dir}/build/lib" /> - <property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" /> + <property name="cassandra.classes" value="${cassandra.dir}/build/classes" /> <property name="build.src" value="${basedir}/src/main/java" /> <property name="test.src" value="${basedir}/src/test/java" /> <property name="test.reports" value="${basedir}/reports" /> @@ -34,7 +34,8 @@ <fileset dir="${cassandra.lib}"> <include name="**/*.jar" /> </fileset> - <pathelement location="${cassandra.classes}" /> + <pathelement location="${cassandra.classes}/main" /> + <pathelement location="${cassandra.classes}/thrift" /> </path> </path> <path id="test.classpath"> Modified: cassandra/trunk/contrib/pig/build.xml URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/pig/build.xml?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/contrib/pig/build.xml (original) +++ cassandra/trunk/contrib/pig/build.xml Tue Mar 1 01:32:16 2011 @@ -22,7 +22,12 @@ <property environment="env" /> <property name="cassandra.dir" value="../.." /> <property name="cassandra.lib" value="" /> - <property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" /> + <property name="cassandra.classes" + value="${cassandra.dir}/build/classes" /> + <property name="cassandra.classes.main" + value="${cassandra.classes}/main" /> + <property name="cassandra.classes.thrift" + value="${cassandra.classes}/thrift" /> <property name="build.src" value="${basedir}/src" /> <property name="build.lib" value="${basedir}/lib" /> <property name="build.out" value="${basedir}/build" /> @@ -41,7 +46,8 @@ <path id="classpath"> <path refid="pig.classpath" /> - <pathelement location="${cassandra.classes}" /> + <pathelement location="${cassandra.classes.main}" /> + <pathelement location="${cassandra.classes.thrift}" /> </path> <target name="init"> @@ -63,7 +69,8 @@ <mkdir dir="${build.classes}/META-INF" /> <jar jarfile="${build.out}/${final.name}.jar"> <fileset dir="${build.classes}" /> - <fileset dir="${cassandra.classes}" /> + <fileset dir="${cassandra.classes.main}" /> + <fileset dir="${cassandra.classes.thrift}" /> <fileset file="${basedir}/storage-conf.xml" /> </jar> </target> Modified: cassandra/trunk/contrib/stress/bin/stress URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/stress/bin/stress?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/contrib/stress/bin/stress (original) +++ cassandra/trunk/contrib/stress/bin/stress Tue Mar 1 01:32:16 2011 @@ -24,12 +24,14 @@ if [ "x$CLASSPATH" = "x" ]; then fi # Stress class files. - if [ ! -d `dirname $0`/../build/classes/main ]; then + if [ ! -d `dirname $0`/../build/classes ]; then echo "Unable to locate stress class files" >&2 exit 1 fi - CLASSPATH=`dirname $0`/../../../build/classes/main:`dirname $0`/../build/classes/main + CLASSPATH=`dirname $0`/../../../build/classes/main + CLASSPATH=$CLASSPATH:`dirname $0`/../../../build/classes/thrift + CLASSPATH=$CLASSPATH:`dirname $0`/../build/classes for jar in `dirname $0`/../../../lib/*.jar; do CLASSPATH=$CLASSPATH:$jar done Modified: cassandra/trunk/contrib/stress/build.xml URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/stress/build.xml?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/contrib/stress/build.xml (original) +++ cassandra/trunk/contrib/stress/build.xml Tue Mar 1 01:32:16 2011 @@ -20,12 +20,16 @@ <project basedir="." default="build" name="stress"> <property name="cassandra.dir" value="../.." /> <property name="cassandra.lib" value="${cassandra.dir}/lib" /> - <property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" /> <property name="build.src" value="${basedir}/src" /> <property name="build.out" value="${basedir}/build" /> <property name="build.classes" value="${build.out}/classes" /> <property name="final.name" value="stress" /> + <path id="cassandra.classes"> + <pathelement location="${cassandra.dir}/build/classes/main" /> + <pathelement location="${cassandra.dir}/build/classes/thrift" /> + </path> + <target name="init"> <mkdir dir="${build.classes}" /> </target> @@ -33,12 +37,12 @@ <target depends="init" name="build"> <javac destdir="${build.classes}"> <src path="${build.src}" /> + <path refid="cassandra.classes" /> <classpath> <path> <fileset dir="${cassandra.lib}"> <include name="**/*.jar" /> </fileset> - <pathelement location="${cassandra.classes}" /> </path> </classpath> </javac> Modified: cassandra/trunk/contrib/word_count/bin/word_count URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/word_count/bin/word_count?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/contrib/word_count/bin/word_count (original) +++ cassandra/trunk/contrib/word_count/bin/word_count Tue Mar 1 01:32:16 2011 @@ -32,6 +32,7 @@ fi CLASSPATH=$CLASSPATH:$cwd/../build/word_count.jar CLASSPATH=$CLASSPATH:$cwd/../../../build/classes/main +CLASSPATH=$CLASSPATH:$cwd/../../../build/classes/thrift for jar in $cwd/../build/lib/jars/*.jar; do CLASSPATH=$CLASSPATH:$jar done Modified: cassandra/trunk/contrib/word_count/bin/word_count_setup URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/word_count/bin/word_count_setup?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/contrib/word_count/bin/word_count_setup (original) +++ cassandra/trunk/contrib/word_count/bin/word_count_setup Tue Mar 1 01:32:16 2011 @@ -32,6 +32,7 @@ fi CLASSPATH=$CLASSPATH:$cwd/../build/word_count.jar CLASSPATH=$CLASSPATH:.:$cwd/../../../build/classes/main +CLASSPATH=$CLASSPATH:.:$cwd/../../../build/classes/thrift for jar in $cwd/../build/lib/jars/*.jar; do CLASSPATH=$CLASSPATH:$jar done Modified: cassandra/trunk/contrib/word_count/build.xml URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/word_count/build.xml?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/contrib/word_count/build.xml (original) +++ cassandra/trunk/contrib/word_count/build.xml Tue Mar 1 01:32:16 2011 @@ -20,7 +20,7 @@ <project default="jar" name="word_count" xmlns:ivy="antlib:org.apache.ivy.ant"> <property name="cassandra.dir" value="../.." /> <property name="cassandra.dir.lib" value="${cassandra.dir}/lib" /> - <property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" /> + <property name="cassandra.classes" value="${cassandra.dir}/build/classes" /> <property name="build.src" value="${basedir}/src" /> <property name="build.dir" value="${basedir}/build" /> <property name="ivy.lib.dir" value="${build.dir}/lib" /> @@ -52,7 +52,8 @@ <fileset dir="${cassandra.dir}/build/lib/jars"> <include name="**/*.jar" /> </fileset> - <pathelement location="${cassandra.classes}" /> + <pathelement location="${cassandra.classes}/main" /> + <pathelement location="${cassandra.classes}/thrift" /> </path> <target name="init"> @@ -70,7 +71,8 @@ <mkdir dir="${build.classes}/META-INF" /> <jar jarfile="${build.dir}/${final.name}.jar"> <fileset dir="${build.classes}" /> - <fileset dir="${cassandra.classes}" /> + <fileset dir="${cassandra.classes}/main" /> + <fileset dir="${cassandra.classes}/thrift" /> <fileset dir="${cassandra.dir}"> <include name="lib/**/*.jar" /> </fileset> Modified: cassandra/trunk/test/cassandra.in.sh URL: http://svn.apache.org/viewvc/cassandra/trunk/test/cassandra.in.sh?rev=1075609&r1=1075608&r2=1075609&view=diff ============================================================================== --- cassandra/trunk/test/cassandra.in.sh (original) +++ cassandra/trunk/test/cassandra.in.sh Tue Mar 1 01:32:16 2011 @@ -22,6 +22,7 @@ CASSANDRA_CONF=$cassandra_home/test/conf # compiled classes. NOTE: This isn't needed by the startup script, # it's just used here in constructing the classpath. cassandra_bin=$cassandra_home/build/classes/main +cassandra_bin=$cassandra_bin:$cassandra_home/build/classes/thrift #cassandra_bin=$cassandra_home/build/cassandra.jar # The java classpath (required)