You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by as...@apache.org on 2009/08/20 22:55:18 UTC

svn commit: r806354 - in /hadoop/chukwa/trunk: contrib/xtrace/build.xml src/java/org/apache/hadoop/chukwa/datacollection/connector/ChunkCatcherConnector.java src/test/org/apache/hadoop/chukwa/datacollection/connector/ChunkCatcherConnector.java

Author: asrabkin
Date: Thu Aug 20 20:55:18 2009
New Revision: 806354

URL: http://svn.apache.org/viewvc?rev=806354&view=rev
Log:
CHUKWA-377. Fix pesky classpath issues

Added:
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/connector/ChunkCatcherConnector.java
      - copied unchanged from r806343, hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/connector/ChunkCatcherConnector.java
Removed:
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/datacollection/connector/ChunkCatcherConnector.java
Modified:
    hadoop/chukwa/trunk/contrib/xtrace/build.xml

Modified: hadoop/chukwa/trunk/contrib/xtrace/build.xml
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/contrib/xtrace/build.xml?rev=806354&r1=806353&r2=806354&view=diff
==============================================================================
--- hadoop/chukwa/trunk/contrib/xtrace/build.xml (original)
+++ hadoop/chukwa/trunk/contrib/xtrace/build.xml Thu Aug 20 20:55:18 2009
@@ -242,7 +242,7 @@
 			<include name="hadoop*.jar" />
 			<exclude name="**/excluded/" />
 		</fileset>
-		<fileset dir="../../build/ivy/lib/chukwa/common">
+		<fileset dir="../../build/ivy/lib/chukwa/common/">
 			<include name="**/*.jar" />
 			<exclude name="**/excluded/" />
 		</fileset>
@@ -258,17 +258,14 @@
 
 		<javac srcdir="test/src/java" destdir="${test.build.classes}" debug="${javac.debug}">
 			<compilerarg value="-Xlint" />
-			<include name="org/apache/hadoop/chukwa/**" />
-            <classpath>
-                <pathelement location="${build.classes}" />
-            	<pathelement location="${test.build.classes}" />
-                <path refid="xtr-classpath"/>
-            </classpath>
+			<include name="edu/berkeley/chukwa_xtrace/**" />
+			<classpath refid="xtr-classpath" />
+
 		</javac>
 
 	</target>
 	
-	<target name="test" depends="compile-test" description="chukwa-xtrace tests">
+	<target name="test" depends="init,compile-test" description="chukwa-xtrace tests">
         <delete dir="${test.log.dir}"/>
         <mkdir dir="${test.log.dir}"/>
 		 <echo>*** ${test.build.classes} *** ${chukwa.root.build.dir} ***</echo>