Author: thomas.diesler(a)jboss.com Date: 2007-05-25 04:13:24 -0400 (Fri, 25 May 2007) New Revision: 3246 Modified: trunk/integration/native/ant-import/build-deploy.xml trunk/integration/native/build.xml trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/build-distro.xml trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/build-distro.xml Log: Fix dependency on jboss42 Modified: trunk/integration/native/ant-import/build-deploy.xml =================================================================== --- trunk/integration/native/ant-import/build-deploy.xml 2007-05-24 23:54:05 UTC (rev 3245) +++ trunk/integration/native/ant-import/build-deploy.xml 2007-05-25 08:13:24 UTC (rev 3246) @@ -21,6 +21,7 @@ <!-- Deploy jbossws to jboss50 --> <target name="deploy-jboss50" depends="jars-native50" description="Deploy jbossws to jboss50"> + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-native50 @@ -38,6 +39,7 @@ <!-- Deploy jbossws to jboss42 --> <target name="deploy-jboss42" depends="jars-native42" description="Deploy jbossws to jboss42"> + <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> <macro-deploy-native42 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss42.dir}/output/lib" Modified: trunk/integration/native/build.xml =================================================================== --- trunk/integration/native/build.xml 2007-05-24 23:54:05 UTC (rev 3245) +++ trunk/integration/native/build.xml 2007-05-25 08:13:24 UTC (rev 3246) @@ -41,8 +41,6 @@ <target name="init" depends="prepare,thirdparty"> <ant antfile="${core.dir}/build.xml" target="main" inheritall="false"/> - <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> - <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> </target> <!-- ================================================================== --> Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-24 23:54:05 UTC (rev 3245) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-25 08:13:24 UTC (rev 3246) @@ -21,6 +21,7 @@ <!-- Deploy jbossws/sunri to jboss50 --> <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-sunri50 Modified: trunk/integration/sunri/ant-import/build-distro.xml =================================================================== --- trunk/integration/sunri/ant-import/build-distro.xml 2007-05-24 23:54:05 UTC (rev 3245) +++ trunk/integration/sunri/ant-import/build-distro.xml 2007-05-25 08:13:24 UTC (rev 3246) @@ -19,6 +19,9 @@ <target name="binary-dist" depends="jars" description="Build the binary distribution"> + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> + <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> + <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-24 23:54:05 UTC (rev 3245) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-25 08:13:24 UTC (rev 3246) @@ -21,6 +21,7 @@ <!-- Deploy jbossws/xfire to jboss50 --> <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50"> + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-xfire50 Modified: trunk/integration/xfire/ant-import/build-distro.xml =================================================================== --- trunk/integration/xfire/ant-import/build-distro.xml 2007-05-24 23:54:05 UTC (rev 3245) +++ trunk/integration/xfire/ant-import/build-distro.xml 2007-05-25 08:13:24 UTC (rev 3246) @@ -19,6 +19,9 @@ <target name="binary-dist" depends="jars" description="Build the binary distribution"> + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> + <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> + <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>