[jboss-svn-commits] JBL Code SVN: r30565 - in labs/jbosstm/trunk/XTS/interop: WSTX11-interop and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2009-12-09 11:21:54 -0500 (Wed, 09 Dec 2009)
New Revision: 30565

Modified:
   labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
   labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
Log:
removed definitions of classpath as a path and hard-wired into javac task. this was causing ant clean to fail when run twice ebcause the lib directory defined in the classpath did not exist

Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml	2009-12-09 15:15:44 UTC (rev 30564)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml	2009-12-09 16:21:54 UTC (rev 30565)
@@ -84,16 +84,6 @@
 
 	<property name="compile.debug" value="true"/>
 	
-	<path id="classpath">
-		<fileset dir="${lib.dir}" includes="${dist.compile.libs}"/>
-		<fileset dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
-		<fileset dir="${xts.ext.lib.dir}" includes="${dist.xts.ext.libs}"/>
-		<fileset dir="${jboss.client.lib.dir}" includes="${jboss.compile.client.libs}"/>
-		<fileset dir="${jboss.lib.dir}" includes="${jboss.compile.lib.jars}"/>
-		<fileset dir="${jboss.common.lib.dir}" includes="${jboss.compile.common.lib.jars}"/>
-	</path>
-	<property name="classpath" refid="classpath"/>
-	
 	<target name="init">
 		<mkdir dir="${build.dir}"/>
 		<mkdir dir="${build.classes.dir}"/>
@@ -101,7 +91,16 @@
 	</target>
 	
 	<target name="compile" depends="init">
-		<javac classpathref="classpath" destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}"/>
+		<javac destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}">
+            <classpath>
+                <fileset dir="${lib.dir}" includes="${dist.compile.libs}"/>
+                <fileset dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
+                <fileset dir="${xts.ext.lib.dir}" includes="${dist.xts.ext.libs}"/>
+                <fileset dir="${jboss.client.lib.dir}" includes="${jboss.compile.client.libs}"/>
+                <fileset dir="${jboss.lib.dir}" includes="${jboss.compile.lib.jars}"/>
+                <fileset dir="${jboss.common.lib.dir}" includes="${jboss.compile.common.lib.jars}"/>
+            </classpath>
+        </javac>
 	</target>
 	
     <target name="war" depends="compile">

Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml	2009-12-09 15:15:44 UTC (rev 30564)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml	2009-12-09 16:21:54 UTC (rev 30565)
@@ -84,16 +84,6 @@
 
 	<property name="compile.debug" value="true"/>
 	
-	<path id="classpath">
-		<fileset dir="${lib.dir}" includes="${dist.compile.libs}"/>
-		<fileset dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
-		<fileset dir="${xts.ext.lib.dir}" includes="${dist.xts.ext.libs}"/>
-		<fileset dir="${jboss.client.lib.dir}" includes="${jboss.compile.client.libs}"/>
-		<fileset dir="${jboss.lib.dir}" includes="${jboss.compile.lib.jars}"/>
-		<fileset dir="${jboss.common.lib.dir}" includes="${jboss.compile.common.libs}"/>
-	</path>
-	<property name="classpath" refid="classpath"/>
-	
 	<target name="init">
 		<mkdir dir="${build.dir}"/>
 		<mkdir dir="${build.classes.dir}"/>
@@ -101,7 +91,16 @@
 	</target>
 	
 	<target name="compile" depends="init">
-		<javac classpathref="classpath" destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}"/>
+		<javac destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}">
+            <classpath>
+                <fileset dir="${lib.dir}" includes="${dist.compile.libs}"/>
+                <fileset dir="${xts.lib.dir}" includes="${dist.xts.libs}"/>
+                <fileset dir="${xts.ext.lib.dir}" includes="${dist.xts.ext.libs}"/>
+                <fileset dir="${jboss.client.lib.dir}" includes="${jboss.compile.client.libs}"/>
+                <fileset dir="${jboss.lib.dir}" includes="${jboss.compile.lib.jars}"/>
+                <fileset dir="${jboss.common.lib.dir}" includes="${jboss.compile.common.libs}"/>
+            </classpath>
+        </javac>
 	</target>
 	
     <target name="war" depends="compile">