[jbossws-commits] JBossWS SVN: r3170 - in trunk: integration/xfire/ant-import and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-05-22 02:56:39 -0400 (Tue, 22 May 2007)
New Revision: 3170

Modified:
   trunk/build/build.xml
   trunk/integration/xfire/ant-import/build-testsuite.xml
Log:
Fix xfire dependency on sunri thirdparty

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2007-05-21 21:25:06 UTC (rev 3169)
+++ trunk/build/build.xml	2007-05-22 06:56:39 UTC (rev 3170)
@@ -41,17 +41,21 @@
     <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/>
     <ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/>
     <ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
+    <ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/>
     <ant antfile="${int.jbws.dir}/build.xml" target="clean" inheritall="false"/>
     <ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/>
+    <ant antfile="${int.xfire.dir}/build.xml" target="clean" inheritall="false"/>
   </target>
   
   <target name="clobber" depends="prepare" description="Cleans up all generated files.">
     <ant antfile="${spi.dir}/build.xml" target="clobber" inheritall="false"/>
     <ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/>
+    <ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/>
     <ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/>
     <ant antfile="${int.jboss42.dir}/build.xml" target="clobber" inheritall="false"/>
     <ant antfile="${int.jbws.dir}/build.xml" target="clobber" inheritall="false"/>
     <ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/>
+    <ant antfile="${int.xfire.dir}/build.xml" target="clobber" inheritall="false"/>
   </target>
   
   <target name="main" description="Executes the default target (most)." depends="jars">
@@ -62,12 +66,9 @@
   </target>
   
   <target name="most" description="Builds almost everything." depends="prepare">
-    <ant antfile="${spi.dir}/build.xml" target="most" inheritall="false"/>
-    <ant antfile="${core.dir}/build.xml" target="most" inheritall="false"/>
-    <ant antfile="${int.jboss50.dir}/build.xml" target="most" inheritall="false"/>
-    <ant antfile="${int.jboss42.dir}/build.xml" target="most" inheritall="false"/>
     <ant antfile="${int.jbws.dir}/build.xml" target="most" inheritall="false"/>
     <ant antfile="${int.sunri.dir}/build.xml" target="most" inheritall="false"/>
+    <ant antfile="${int.xfire.dir}/build.xml" target="most" inheritall="false"/>
   </target>
   
   <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist,build-src-dist">

Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml	2007-05-21 21:25:06 UTC (rev 3169)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml	2007-05-22 06:56:39 UTC (rev 3170)
@@ -33,9 +33,9 @@
       Cannot use XFire client
       [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap
     -->
+    <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/>
 
     <path id="jbossws.classpath">
-      <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
       <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
       <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
       <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
@@ -75,6 +75,7 @@
     <!-- The combined compile classpath -->
     <path id="javac.classpath">
       <path refid="xfire.classpath"/>
+      <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
       <pathelement location="${jboss.client}/activation.jar"/>
       <pathelement location="${jboss.client}/jaxb-api.jar"/>
       <pathelement location="${jboss.client}/jaxb-impl.jar"/>