cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject svn commit: r1075608 - in /cassandra/trunk: ./ bin/ contrib/circuit/ contrib/circuit/bin/ contrib/client_only/ contrib/client_only/bin/ contrib/javautils/ contrib/pig/ contrib/stress/ contrib/stress/bin/ contrib/word_count/ contrib/word_count/bin/ test/
Date Tue, 01 Mar 2011 01:31:36 GMT
Author: eevans
Date: Tue Mar  1 01:31:35 2011
New Revision: 1075608

URL: http://svn.apache.org/viewvc?rev=1075608&view=rev
Log:
compile bytecode to build/classes/main

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/client_only/bin/client_only
    cassandra/trunk/contrib/client_only/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=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/bin/cassandra-cli.bat (original)
+++ cassandra/trunk/bin/cassandra-cli.bat Tue Mar  1 01:31:35 2011
@@ -33,8 +33,8 @@ 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"
+REM Include the build\classes\main directory so it works in development
+set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main"
 goto runCli
 
 :runCli

Modified: cassandra/trunk/bin/cassandra.bat
URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/cassandra.bat?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/bin/cassandra.bat (original)
+++ cassandra/trunk/bin/cassandra.bat Tue Mar  1 01:31:35 2011
@@ -54,8 +54,8 @@ 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"
+REM Include the build\classes\main directory so it works in development
+set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main"
 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=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/bin/cassandra.in.sh (original)
+++ cassandra/trunk/bin/cassandra.in.sh Tue Mar  1 01:31:35 2011
@@ -26,7 +26,7 @@ fi
 # This can be the path to a jar file, or a directory containing the 
 # 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
+cassandra_bin=$CASSANDRA_HOME/build/classes/main
 #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=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/bin/clustertool.bat (original)
+++ cassandra/trunk/bin/clustertool.bat Tue Mar  1 01:31:35 2011
@@ -40,8 +40,8 @@ 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%
+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_PARAMS=
 set TOOLS_PARAMS=

Modified: cassandra/trunk/bin/json2sstable.bat
URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/json2sstable.bat?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/bin/json2sstable.bat (original)
+++ cassandra/trunk/bin/json2sstable.bat Tue Mar  1 01:31:35 2011
@@ -40,8 +40,8 @@ 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%
+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_PARAMS=
 set TOOLS_PARAMS=

Modified: cassandra/trunk/bin/nodetool.bat
URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/nodetool.bat?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/bin/nodetool.bat (original)
+++ cassandra/trunk/bin/nodetool.bat Tue Mar  1 01:31:35 2011
@@ -33,8 +33,8 @@ 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
+REM Include the build\classes\main directory so it works in development
+set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main
 goto runNodeTool
 
 :runNodeTool

Modified: cassandra/trunk/bin/schematool.bat
URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/schematool.bat?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/bin/schematool.bat (original)
+++ cassandra/trunk/bin/schematool.bat Tue Mar  1 01:31:35 2011
@@ -40,8 +40,8 @@ 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%
+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_PARAMS=
 set TOOLS_PARAMS=

Modified: cassandra/trunk/bin/sstable2json.bat
URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/sstable2json.bat?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/bin/sstable2json.bat (original)
+++ cassandra/trunk/bin/sstable2json.bat Tue Mar  1 01:31:35 2011
@@ -40,8 +40,8 @@ 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%
+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_PARAMS=
 set TOOLS_PARAMS=

Modified: cassandra/trunk/bin/sstablekeys.bat
URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/sstablekeys.bat?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/bin/sstablekeys.bat (original)
+++ cassandra/trunk/bin/sstablekeys.bat Tue Mar  1 01:31:35 2011
@@ -40,8 +40,8 @@ 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%
+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_PARAMS=
 set TOOLS_PARAMS=

Modified: cassandra/trunk/build.xml
URL: http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/build.xml (original)
+++ cassandra/trunk/build.xml Tue Mar  1 01:31:35 2011
@@ -34,6 +34,7 @@
     <property name="build.dir.lib" value="${basedir}/build/lib"/>
     <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="javadoc.dir" value="${build.dir}/javadoc"/>
     <property name="interface.dir" value="${basedir}/interface"/>
     <property name="interface.thrift.dir" value="${interface.dir}/thrift"/>
@@ -55,7 +56,8 @@
       <isset property="release"/>
     </condition>
     <property name="version" value="${base.version}-SNAPSHOT"/>
-    <property name="version.properties.dir" value="${build.classes}/org/apache/cassandra/config/"/>
+    <property name="version.properties.dir"
+              value="${build.classes.main}/org/apache/cassandra/config/" />
     <property name="final.name" value="${ant.project.name}-${version}"/>
     <property name="maven-ant-tasks.version" value="2.1.1" />
     <property name="maven-ant-tasks.url"
@@ -85,7 +87,7 @@
     <path id="maven-ant-tasks.classpath" path="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar"
/>
     <path id="cassandra.classpath">
         <pathelement location="${cobertura.classes.dir}"/>
-        <pathelement location="${build.classes}"/>
+        <pathelement location="${build.classes.main}" />
         <fileset dir="${build.lib}">
           <include name="**/*.jar" />
         </fileset>
@@ -100,7 +102,7 @@
     <target name="init">
         <fail unless="is.source.artifact"
             message="Not a source artifact, stopping here." />
-        <mkdir dir="${build.classes}"/>
+        <mkdir dir="${build.classes.main}"/>
         <mkdir dir="${test.lib}"/>
         <mkdir dir="${test.classes}"/>
         <mkdir dir="${build.src.gen-java}"/>
@@ -346,7 +348,8 @@
     <target depends="init,avro-generate,gen-cli-grammar,gen-cql-grammar"
             name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}" includeantruntime="false">
+        <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"/>
@@ -366,11 +369,13 @@
         The jar target makes cassandra.jar output.
     -->
     <target name="jar" depends="build" description="Assemble Cassandra JAR files">
-      <mkdir dir="${build.classes}/META-INF"/>
-      <copy file="LICENSE.txt" tofile="${build.classes}/META-INF/LICENSE.txt"/>
-      <copy file="NOTICE.txt" tofile="${build.classes}/META-INF/NOTICE.txt"/>
+      <mkdir dir="${build.classes.main}/META-INF" />
+      <copy file="LICENSE.txt"
+            tofile="${build.classes.main}/META-INF/LICENSE.txt"/>
+      <copy file="NOTICE.txt"
+            tofile="${build.classes.main}/META-INF/NOTICE.txt"/>
       <jar jarfile="${build.dir}/${final.name}.jar"
-           basedir="${build.classes}">
+           basedir="${build.classes.main}">
         <manifest>
         <!-- <section name="org/apache/cassandra/infrastructure"> -->
           <attribute name="Implementation-Title" value="Cassandra"/>
@@ -639,7 +644,7 @@
     <cobertura-instrument todir="${cobertura.classes.dir}" datafile="${cobertura.datafile}">
       <ignore regex="org.apache.log4j.*"/>
 
-      <fileset dir="${build.classes}">
+      <fileset dir="${build.classes.main}">
         <include name="**/*.class"/>
         <exclude name="**/*Test.class"/>
         <exclude name="**/*TestCase.class"/>
@@ -746,7 +751,7 @@
   <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"/>
+  <classpathentry kind="output" path="${build.classes.main}"/>
   <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=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/contrib/circuit/bin/circuit (original)
+++ cassandra/trunk/contrib/circuit/bin/circuit Tue Mar  1 01:31:35 2011
@@ -20,18 +20,18 @@ DEFAULT_PORT=7199
 
 if [ "x$CLASSPATH" = "x" ]; then
     # Cassandra class files.
-    if [ ! -d `dirname $0`/../../../build/classes ]; then
+    if [ ! -d `dirname $0`/../../../build/classes/main ]; then
         echo "Unable to locate cassandra class files" >&2
         exit 1
     fi
 
     # Circuit class files.
-    if [ ! -d `dirname $0`/../build/classes ]; then
+    if [ ! -d `dirname $0`/../build/classes/main ]; then
         echo "Unable to locate circuit class files" >&2
         exit 1
     fi
 
-    CLASSPATH=`dirname $0`/../../../build/classes:`dirname $0`/../build/classes
+    CLASSPATH=`dirname $0`/../../../build/classes/main:`dirname $0`/../build/classes/main
     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=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/contrib/circuit/build.xml (original)
+++ cassandra/trunk/contrib/circuit/build.xml Tue Mar  1 01:31:35 2011
@@ -20,7 +20,7 @@
 <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" />
+    <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" />

Modified: cassandra/trunk/contrib/client_only/bin/client_only
URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/client_only/bin/client_only?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/contrib/client_only/bin/client_only (original)
+++ cassandra/trunk/contrib/client_only/bin/client_only Tue Mar  1 01:31:35 2011
@@ -21,7 +21,7 @@ cwd=`dirname $0`
 name=client_only
 
 # Cassandra class files
-if [ ! -d $cwd/../../../build/classes ]; then
+if [ ! -d $cwd/../../../build/classes/main ]; then
     echo "Unable to locate cassandra class files" >&2
     exit 1
 fi
@@ -33,7 +33,7 @@ if [ ! -e $cwd/../build/$name.jar ]; the
 fi
 
 CLASSPATH=$CLASSPATH:$cwd/../build/$name.jar
-CLASSPATH=$CLASSPATH:$cwd/../../../build/classes
+CLASSPATH=$CLASSPATH:$cwd/../../../build/classes/main
 for jar in $cwd/../../../lib/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done

Modified: cassandra/trunk/contrib/client_only/build.xml
URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/client_only/build.xml?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/contrib/client_only/build.xml (original)
+++ cassandra/trunk/contrib/client_only/build.xml Tue Mar  1 01:31:35 2011
@@ -20,7 +20,7 @@
 <project default="jar" name="client_only">
     <property name="cassandra.dir" value="../.." />
     <property name="cassandra.dir.lib" value="${cassandra.dir}/lib" />
-    <property name="cassandra.classes" value="${cassandra.dir}/build/classes" />
+    <property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" />
     <property name="build.src" value="${basedir}/src" />
     <property name="build.dir" value="${basedir}/build" />
     <property name="build.classes" value="${build.dir}/classes" />

Modified: cassandra/trunk/contrib/javautils/build.xml
URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/javautils/build.xml?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/contrib/javautils/build.xml (original)
+++ cassandra/trunk/contrib/javautils/build.xml Tue Mar  1 01:31:35 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" />
+  <property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" />
   <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" />

Modified: cassandra/trunk/contrib/pig/build.xml
URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/pig/build.xml?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/contrib/pig/build.xml (original)
+++ cassandra/trunk/contrib/pig/build.xml Tue Mar  1 01:31:35 2011
@@ -22,7 +22,7 @@
     <property environment="env" />
     <property name="cassandra.dir" value="../.." />
     <property name="cassandra.lib" value="" />
-    <property name="cassandra.classes" value="${cassandra.dir}/build/classes" />
+    <property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" />
     <property name="build.src" value="${basedir}/src" />
     <property name="build.lib" value="${basedir}/lib" />
     <property name="build.out" value="${basedir}/build" />

Modified: cassandra/trunk/contrib/stress/bin/stress
URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/stress/bin/stress?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/contrib/stress/bin/stress (original)
+++ cassandra/trunk/contrib/stress/bin/stress Tue Mar  1 01:31:35 2011
@@ -18,18 +18,18 @@
 
 if [ "x$CLASSPATH" = "x" ]; then
     # Cassandra class files.
-    if [ ! -d `dirname $0`/../../../build/classes ]; then
+    if [ ! -d `dirname $0`/../../../build/classes/main ]; then
         echo "Unable to locate cassandra class files" >&2
         exit 1
     fi
 
     # Stress class files.
-    if [ ! -d `dirname $0`/../build/classes ]; then
+    if [ ! -d `dirname $0`/../build/classes/main ]; then
         echo "Unable to locate stress class files" >&2
         exit 1
     fi
 
-    CLASSPATH=`dirname $0`/../../../build/classes:`dirname $0`/../build/classes
+    CLASSPATH=`dirname $0`/../../../build/classes/main:`dirname $0`/../build/classes/main
     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=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/contrib/stress/build.xml (original)
+++ cassandra/trunk/contrib/stress/build.xml Tue Mar  1 01:31:35 2011
@@ -20,7 +20,7 @@
 <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" />
+    <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" />

Modified: cassandra/trunk/contrib/word_count/bin/word_count
URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/word_count/bin/word_count?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/contrib/word_count/bin/word_count (original)
+++ cassandra/trunk/contrib/word_count/bin/word_count Tue Mar  1 01:31:35 2011
@@ -19,7 +19,7 @@
 cwd=`dirname $0`
 
 # Cassandra class files.
-if [ ! -d $cwd/../../../build/classes ]; then
+if [ ! -d $cwd/../../../build/classes/main ]; then
     echo "Unable to locate cassandra class files" >&2
     exit 1
 fi
@@ -31,7 +31,7 @@ if [ ! -e $cwd/../build/word_count.jar ]
 fi
 
 CLASSPATH=$CLASSPATH:$cwd/../build/word_count.jar
-CLASSPATH=$CLASSPATH:$cwd/../../../build/classes
+CLASSPATH=$CLASSPATH:$cwd/../../../build/classes/main
 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=1075608&r1=1075607&r2=1075608&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:31:35 2011
@@ -19,7 +19,7 @@
 cwd=`dirname $0`
 
 # Cassandra class files.
-if [ ! -d $cwd/../../../build/classes ]; then
+if [ ! -d $cwd/../../../build/classes/main ]; then
     echo "Unable to locate cassandra class files" >&2
     exit 1
 fi
@@ -31,7 +31,7 @@ if [ ! -e $cwd/../build/word_count.jar ]
 fi
 
 CLASSPATH=$CLASSPATH:$cwd/../build/word_count.jar
-CLASSPATH=$CLASSPATH:.:$cwd/../../../build/classes
+CLASSPATH=$CLASSPATH:.:$cwd/../../../build/classes/main
 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=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/contrib/word_count/build.xml (original)
+++ cassandra/trunk/contrib/word_count/build.xml Tue Mar  1 01:31:35 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" />
+    <property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" />
     <property name="build.src" value="${basedir}/src" />
     <property name="build.dir" value="${basedir}/build" />
     <property name="ivy.lib.dir" value="${build.dir}/lib" />

Modified: cassandra/trunk/test/cassandra.in.sh
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/cassandra.in.sh?rev=1075608&r1=1075607&r2=1075608&view=diff
==============================================================================
--- cassandra/trunk/test/cassandra.in.sh (original)
+++ cassandra/trunk/test/cassandra.in.sh Tue Mar  1 01:31:35 2011
@@ -21,7 +21,7 @@ CASSANDRA_CONF=$cassandra_home/test/conf
 # This can be the path to a jar file, or a directory containing the 
 # 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
+cassandra_bin=$cassandra_home/build/classes/main
 #cassandra_bin=$cassandra_home/build/cassandra.jar
 
 # The java classpath (required)



Mime
View raw message