Author: thomas.diesler(a)jboss.com Date: 2007-05-25 04:37:22 -0400 (Fri, 25 May 2007) New Revision: 3247 Modified: trunk/integration/native/ant-import/build-deploy.xml trunk/integration/native/ant-import/macros-deploy-native.xml trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/macros-deploy-xfire.xml trunk/jbossws-core/ant-import/build-deploy.xml Log: Properly undeploy everything Modified: trunk/integration/native/ant-import/build-deploy.xml =================================================================== --- trunk/integration/native/ant-import/build-deploy.xml 2007-05-25 08:13:24 UTC (rev 3246) +++ trunk/integration/native/ant-import/build-deploy.xml 2007-05-25 08:37:22 UTC (rev 3247) @@ -24,6 +24,7 @@ <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-undeploy-native50/> <macro-deploy-native50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" @@ -40,6 +41,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-undeploy-native42/> <macro-deploy-native42 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss42.dir}/output/lib" Modified: trunk/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-25 08:13:24 UTC (rev 3246) +++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-25 08:37:22 UTC (rev 3247) @@ -76,6 +76,35 @@ </sequential> </macrodef> + <macrodef name="macro-undeploy-native50"> + <sequential> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> + <!-- Undeploy juddi-service.sar --> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + <macrodef name="macro-deploy-native42"> <attribute name="spilibs"/> <attribute name="jbosslibs"/> @@ -128,36 +157,13 @@ </sequential> </macrodef> - <macrodef name="macro-undeploy-native50"> - <sequential> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <delete> - <fileset dir="${jboss50.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> - <!-- Undeploy juddi-service.sar --> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - <macrodef name="macro-undeploy-native42"> <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> <delete> <fileset dir="${jboss42.home}/client"> + <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss42.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> @@ -168,6 +174,8 @@ <include name="jbossws-integration.jar"/> <!-- The old integration jar--> </fileset> <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss42.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-25 08:13:24 UTC (rev 3246) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-25 08:37:22 UTC (rev 3247) @@ -24,6 +24,7 @@ <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-undeploy-sunri50/> <macro-deploy-sunri50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-25 08:13:24 UTC (rev 3246) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-25 08:37:22 UTC (rev 3247) @@ -62,6 +62,16 @@ <!-- Remove jbossws/sunri from jboss50 --> <macrodef name="macro-undeploy-sunri50"> <sequential> + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> + </fileset> + </delete> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> </sequential> </macrodef> Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-25 08:13:24 UTC (rev 3246) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-25 08:37:22 UTC (rev 3247) @@ -24,6 +24,7 @@ <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-undeploy-xfire50/> <macro-deploy-xfire50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-05-25 08:13:24 UTC (rev 3246) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-05-25 08:37:22 UTC (rev 3247) @@ -62,6 +62,16 @@ <!-- Remove jbossws/xfire from jboss50 --> <macrodef name="macro-undeploy-xfire50"> <sequential> + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss50.jar"/> + </fileset> + </delete> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> </sequential> </macrodef> Modified: trunk/jbossws-core/ant-import/build-deploy.xml =================================================================== --- trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-25 08:13:24 UTC (rev 3246) +++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-25 08:37:22 UTC (rev 3247) @@ -18,9 +18,19 @@ <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> </target> + <!-- Undeploy jbossws to jboss50 --> + <target name="undeploy-jboss50" depends="prepare" description="Undeploy jbossws"> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + </target> + <!-- Deploy jbossws to jboss42 --> <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws"> <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss42" inheritall="false"/> </target> + <!-- Undeploy jbossws to jboss42 --> + <target name="undeploy-jboss42" depends="prepare" description="Undeploy jbossws"> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + </target> + </project>