Author: alessio.soldano(a)jboss.com
Date: 2010-02-11 18:48:56 -0500 (Thu, 11 Feb 2010)
New Revision: 11586
Modified:
stack/native/branches/jaxrpc-cxf/src/main/distro/build-deploy.xml
Log:
[JBWS-2920] Add exclusion patternset when generating jbossws-deploy.conf to prevent
removing jbossws-native-core.jar and netty.jar during uninstall, as they're always
required for jaxrpc
Modified: stack/native/branches/jaxrpc-cxf/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/branches/jaxrpc-cxf/src/main/distro/build-deploy.xml 2010-02-11 23:23:36
UTC (rev 11585)
+++ stack/native/branches/jaxrpc-cxf/src/main/distro/build-deploy.xml 2010-02-11 23:48:56
UTC (rev 11586)
@@ -167,10 +167,20 @@
<!-- Create jbossws-deploy.conf -->
<!-- ================================================================== -->
+ <patternset id="jbossws.deploy.conf.exclude.patternset">
+ <exclude name="**/juddi-service.sar/**"/>
+ <exclude name="**/client/jbossws-native-core.jar"/>
+ <exclude name="**/client/netty.jar"/>
+ <exclude name="**/common/lib/jbossws-native-core.jar"/>
+ <exclude name="**/common/lib/netty.jar"/>
+ </patternset>
+
<macrodef name="macro-create-deploy-conf">
<attribute name="deploystructure"/>
<sequential>
- <fileset id="jbossws.deploy.fileset"
dir="@{deploystructure}" excludes="**/juddi-service.sar/**"/>
+ <fileset id="jbossws.deploy.fileset"
dir="@{deploystructure}">
+ <patternset refid="jbossws.deploy.conf.exclude.patternset"/>
+ </fileset>
<property name="jbossws.deploy.fileset"
refid="jbossws.deploy.fileset"/>
<property name="jbossws.deployers.dir"
value="(a){deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
<echo file="${jbossws.deployers.dir}/jbossws-deploy.conf"
message="${jbossws.deploy.fileset}"/>