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

Author: alessio.soldano(a)jboss.com Date: 2010-05-18 10:26:28 -0400 (Tue, 18 May 2010) New Revision: 12258 Added: stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf stack/native/trunk/modules/resources/src/main/resources/resources/server-deploy.conf Removed: stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf Modified: stack/native/trunk/build.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/distro/build.xml Log: [JBWS-3030] Use just 2 deploy.conf files for disinstall from any profile/configuration Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2010-05-18 14:24:41 UTC (rev 12257) +++ stack/native/trunk/build.xml 2010-05-18 14:26:28 UTC (rev 12258) @@ -25,7 +25,8 @@ <import file="${stack.distro.dir}/build-deploy.xml"/> <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> - <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/${jboss.server.instance}-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/deploy.conf"/> + <property name="jbossws.default.server.deploy.conf" value="${stack.resources.dir}/resources/server-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- ================================================================== --> Deleted: stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-18 14:24:41 UTC (rev 12257) +++ stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-18 14:26:28 UTC (rev 12258) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wsc! ommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jbossws-native-factories.jar server/all/deployers/jbossws.deployer/jbossws-native-services.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar! server/all/deployers/jbossws.deployer/wscommons-policy.jar se! rver/all /deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml Deleted: stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-18 14:24:41 UTC (rev 12257) +++ stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-18 14:26:28 UTC (rev 12258) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wsc! ommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jbossws-native-factories.jar server/default/deployers/jbossws.deployer/jbossws-native-services.jar server/default/deployers/jbossws.deployer/jettison.jar server/defa! ult/deployers/jbossws.deployer/netty.jar server/default/deploy! ers/jbos sws.deployer/wscommons-policy.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml Added: stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-18 14:26:28 UTC (rev 12258) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wsc! ommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar 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 2010-05-18 14:24:41 UTC (rev 12257) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-18 14:26:28 UTC (rev 12258) @@ -284,21 +284,25 @@ <macrodef name="macro-undeploy-jbossws"> <attribute name="defaultconf"/> + <attribute name="defaultserverconf"/> <attribute name="targetdir"/> <attribute name="modifyjbossintegration"/> <sequential> <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf&quot; failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + <loadfile property="jbossws.server.deploy.conf" srcfile=&quot;(a){targetdir}/deployers/jbossws.deployer/jbossws-server-deploy.conf&quot; failonerror="false"/> + <loadfile property="jbossws.server.deploy.conf" srcfile="@{defaultserverconf}" failonerror="false"/> <property name="jboss.server.home" value="@{targetdir}"/> <property name="jboss.home" value="${jboss.server.home}/../.."/> <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - <delete includeemptydirs="true"> + <delete includeemptydirs="true" verbose="true"> <fileset dir="${jboss.server.home}"> <include name="**/juddi-service.sar/**"/> <include name="**/jbossws-console.war/**"/> + <include name="**/jbossws.sar/**"/> </fileset> </delete> <antcall target="remove-jboss-integration"> @@ -306,14 +310,17 @@ </antcall> <!-- delete content of last deployment --> - <delete> + <delete verbose="true"> <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> </delete> + <delete verbose="true"> + <fileset dir="${jboss.server.home}" includes="${jbossws.server.deploy.conf}"/> + </delete> </sequential> </macrodef> <target name="remove-jboss-integration" depends="process-jboss-integration" if="fixintegration"> - <delete> + <delete verbose="true"> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> </fileset> Added: stack/native/trunk/modules/resources/src/main/resources/resources/server-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/server-deploy.conf (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2010-05-18 14:26:28 UTC (rev 12258) @@ -0,0 +1 @@ +deployers/jbossws.deployer/FastInfoset.jar deployers/jbossws.deployer/jboss-jaxb-intros.jar deployers/jbossws.deployer/jbossws-common.jar deployers/jbossws.deployer/jbossws-framework.jar deployers/jbossws.deployer/jbossws-native-core.jar deployers/jbossws.deployer/jbossws-native-factories.jar deployers/jbossws.deployer/jbossws-native-services.jar deployers/jbossws.deployer/jettison.jar deployers/jbossws.deployer/netty.jar deployers/jbossws.deployer/wscommons-policy.jar deployers/jbossws.deployer/policy.jar deployers/jbossws.deployer/wsdl4j.jar deployers/jbossws.deployer/xmlsec.jar deployers/jbossws.deployer/META-INF/jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml deployers/jbossws.deployer/META-INF/standard-*-config.xml Deleted: stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-18 14:24:41 UTC (rev 12257) +++ stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-18 14:26:28 UTC (rev 12258) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wsc! ommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jbossws-native-factories.jar server/standard/deployers/jbossws.deployer/jbossws-native-services.jar server/standard/deployers/jbossws.deployer/jettison.jar se! rver/standard/deployers/jbossws.deployer/netty.jar server/stan! dard/dep loyers/jbossws.deployer/wscommons-policy.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2010-05-18 14:24:41 UTC (rev 12257) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2010-05-18 14:26:28 UTC (rev 12258) @@ -38,7 +38,7 @@ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <copy todir="${jboss501.home}" overwrite="true"> + <copy todir="${jboss501.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> @@ -46,7 +46,10 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws targetdir="${jboss501.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/> + <macro-undeploy-jbossws targetdir="${jboss501.server}" + defaultconf="${jbossws.default.deploy.conf}" + defaultserverconf="${jbossws.default.server.deploy.conf}" + modifyjbossintegration="true"/> </target> <!-- ================================================================== --> @@ -76,7 +79,7 @@ <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51" description="Deploy jbossws to jboss510"> <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <copy todir="${jboss510.home}" overwrite="true"> + <copy todir="${jboss510.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss510.home}/bin" perm="+x" includes="*.sh"/> @@ -84,7 +87,10 @@ <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510"> <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <macro-undeploy-jbossws targetdir="${jboss510.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/> + <macro-undeploy-jbossws targetdir="${jboss510.server}" + defaultconf="${jbossws.default.deploy.conf}" + defaultserverconf="${jbossws.default.server.deploy.conf}" + modifyjbossintegration="true"/> </target> <!-- ================================================================== --> @@ -114,7 +120,7 @@ <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600" description="Deploy jbossws to jboss600"> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <copy todir="${jboss600.home}" overwrite="true"> + <copy todir="${jboss600.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/> @@ -122,7 +128,10 @@ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600"> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/><!-- [JBWS-2505] --> + <macro-undeploy-jbossws targetdir="${jboss600.server}" + defaultconf="${jbossws.default.deploy.conf}" + defaultserverconf="${jbossws.default.server.deploy.conf}" + modifyjbossintegration="true"/><!-- [JBWS-2505] --> </target> <!-- ================================================================== --> @@ -152,7 +161,7 @@ <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601" description="Deploy jbossws to jboss601"> <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/> - <copy todir="${jboss601.home}" overwrite="true"> + <copy todir="${jboss601.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"/> </copy> <chmod dir="${jboss601.home}/bin" perm="+x" includes="*.sh"/> @@ -160,31 +169,46 @@ <target name="undeploy-jboss601" depends="target-jboss601,init" description="Remove jbossws from jboss601"> <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/> - <macro-undeploy-jbossws targetdir="${jboss601.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] --> + <macro-undeploy-jbossws targetdir="${jboss601.server}" + defaultconf="${jbossws.default.deploy.conf}" + defaultserverconf="${jbossws.default.server.deploy.conf}" + modifyjbossintegration="false"/><!-- [JBWS-2505] --> </target> <!-- ================================================================== --> - <!-- Create jbossws-deploy.conf --> + <!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf --> <!-- ================================================================== --> - <patternset id="jbossws.deploy.conf.exclude.patternset"> - <exclude name="**/juddi-service.sar/**"/> + <patternset id="jbossws.deploy.conf.patternset"> <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"/> + <exclude name="**/server/**"/> </patternset> + <patternset id="jbossws.server.deploy.conf.patternset"> + <exclude name="**/juddi-service.sar/**"/> + </patternset> + <macrodef name="macro-create-deploy-conf"> <attribute name="deploystructure"/> <sequential> + <property name="jbossws.deployers.dir" value=&quot;(a){deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer&quot;/&gt; + <!-- Create jbossws-deploy.conf --> <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}"> - <patternset refid="jbossws.deploy.conf.exclude.patternset"/> + <patternset refid="jbossws.deploy.conf.patternset"/> </fileset> <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> - <property name="jbossws.deployers.dir" value=&quot;(a){deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer&quot;/&gt; <echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> <replace file="${jbossws.deployers.dir}/jbossws-deploy.conf" token=";" value=" "/> + <!-- Create jbossws-server-deploy.conf --> + <fileset id="jbossws.server.deploy.fileset" dir=&quot;(a){deploystructure}/server/${jboss.server.instance}&quot;&gt; + <patternset refid="jbossws.server.deploy.conf.patternset"/> + </fileset> + <property name="jbossws.server.deploy.fileset" refid="jbossws.server.deploy.fileset"/> + <echo file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" message="${jbossws.server.deploy.fileset}"/> + <replace file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" token=";" value=" "/> </sequential> </macrodef> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2010-05-18 14:24:41 UTC (rev 12257) +++ stack/native/trunk/src/main/distro/build.xml 2010-05-18 14:26:28 UTC (rev 12258) @@ -22,7 +22,8 @@ <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="jbossws.default.deploy.conf" value="${build.dir}/${jboss.server.instance}-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${build.dir}/deploy.conf"/> + <property name="jbossws.default.server.deploy.conf" value="${build.dir}/server-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- Check if ant.properties is available -->