[jbossws-commits] JBossWS SVN: r15012 - in stack/cxf/trunk/modules: resources/src/main/resources/resources and 1 other directory.
Author: alessio.soldano(a)jboss.com
Date: 2011-09-15 11:10:03 -0400 (Thu, 15 Sep 2011)
New Revision: 15012
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Properly configure when to replace ASIL libraries during stack (un)deploy
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-15 14:34:58 UTC
(rev 15011)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-15 15:10:03 UTC
(rev 15012)
@@ -142,7 +142,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>
<!-- ================================================================== -->
@@ -192,7 +192,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/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-15
14:34:58 UTC (rev 15011)
+++
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-15
15:10:03 UTC (rev 15012)
@@ -511,6 +511,7 @@
<macrodef name="macro-undeploy-jbossws-modules">
<attribute name="defaultmodulesconf"/>
<attribute name="targetdir"/>
+ <attribute name="modifyjbossintegration"/>
<sequential>
<loadfile property="jbossws.modules.conf"
srcfile="(a){targetdir}/modules/org/jboss/as/webservices/jbossws-modules.conf"
failonerror="false"/>
@@ -521,9 +522,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">
@@ -594,6 +597,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="remove-native-core-from-client-and-common"
if="removenativecoreprop">
<delete verbose="true">
<fileset dir="${jboss.home}/client">