[jbossws-commits] JBossWS SVN: r15270 - in stack/native/trunk/modules: resources/src/main/resources/resources and 1 other directory.

Author: alessio.soldano(a)jboss.com Date: 2011-11-16 10:51:04 -0500 (Wed, 16 Nov 2011) New Revision: 15270 Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: [JBWS-3381] Fixing update of container integration on AS 7.0.x with Native stack Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-11-16 13:38:37 UTC (rev 15269) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-11-16 15:51:04 UTC (rev 15270) @@ -141,7 +141,7 @@ <target name="undeploy-jboss700" depends="target-jboss700,init" description="Remove jbossws from jboss700"> <fail message="Not available: ${jboss700.available.file}" unless="jboss700.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/> + <macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target> <!-- ================================================================== --> @@ -170,7 +170,7 @@ <target name="undeploy-jboss701" depends="target-jboss701,init" description="Remove jbossws from jboss701"> <fail message="Not available: ${jboss701.available.file}" unless="jboss701.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss701.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/> + <macro-undeploy-jbossws-modules targetdir="${jboss701.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target> <!-- ================================================================== --> @@ -199,7 +199,7 @@ <target name="undeploy-jboss702" depends="target-jboss702,init" description="Remove jbossws from jboss702"> <fail message="Not available: ${jboss702.available.file}" unless="jboss702.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss702.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/> + <macro-undeploy-jbossws-modules targetdir="${jboss702.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target> <!-- ================================================================== --> @@ -250,7 +250,7 @@ <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710"> <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/> + <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> </target> <!-- ================================================================== --> Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-11-16 13:38:37 UTC (rev 15269) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-11-16 15:51:04 UTC (rev 15270) @@ -445,6 +445,7 @@ <macrodef name="macro-undeploy-jbossws-modules"> <attribute name="defaultmodulesconf"/> <attribute name="targetdir"/> + <attribute name="modifyjbossintegration"/> <sequential> <loadfile property="jbossws.modules.conf" srcfile=&quot;(a){targetdir}/modules/org/jboss/as/webservices/jbossws-modules.conf&quot; failonerror="false"/> @@ -455,9 +456,11 @@ <delete includeemptydirs="true" verbose="true"> <fileset dir="${jboss.modules}"> <include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/> - <include name="**/org/jboss/as/webservices/main/*7.0.0.Final*"/> </fileset> </delete> + <antcall target="remove-jboss-integration-module"> + <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/> + </antcall> <!-- delete content of last deployment --> <delete includeemptydirs="true" verbose="true"> @@ -517,6 +520,14 @@ </delete> </target> + <target name="remove-jboss-integration-module" depends="process-jboss-integration" if="fixintegration"> + <delete verbose="true"> + <fileset dir="${jboss.modules}"> + <include name="**/org/jboss/as/webservices/main/jboss-as-webservices-server-integration*"/> + </fileset> + </delete> + </target> + <target name="process-jboss-integration"> <condition property="fixintegration"> <and>