Author: richard.opalka(a)jboss.com Date: 2009-09-14 03:18:54 -0400 (Mon, 14 Sep 2009) New Revision: 10687 Added: stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf Modified: stack/metro/trunk/build.xml stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf stack/metro/trunk/src/main/distro/build.xml stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-2759] touch only user specified server configuration Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2009-09-14 07:18:31 UTC (rev 10686) +++ stack/metro/trunk/build.xml 2009-09-14 07:18:54 UTC (rev 10687) @@ -29,7 +29,7 @@ <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/default-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/${jboss.server.instance}-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- ================================================================== --> Added: stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf (rev 0) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2009-09-14 07:18:54 UTC (rev 10687) @@ -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/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/l! ib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/all/deploy/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml 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/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/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/depl! oyers/jbossws.deployer/META-INF/standard-*-config.xml server/a! ll/deplo y/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml 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/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/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 Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-09-14 07:18:31 UTC (rev 10686) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-09-14 07:18:54 UTC (rev 10687) @@ -1 +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/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/l! ib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml 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/jettison.jar server/default/deployers/jbossws.deployer/netty.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/ME! TA-INF/jbossws-container-jboss-beans.xml server/default/deploy! ers/jbos sws.deployer/META-INF/standard-*-config.xml server/all/deploy/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml 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/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/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 server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-conta! iner-jboss-beans.xml 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/jettison.jar server/standard/deployers/jbossws.deployer/netty.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 server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/FastInfoset.jar ! server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.j! ar serve r/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.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 +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/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/l! ib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml 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/jettison.jar server/default/deployers/jbossws.deployer/netty.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/ME! TA-INF/jbossws-container-jboss-beans.xml server/default/deploy! ers/jbos sws.deployer/META-INF/standard-*-config.xml server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml 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/jettison.jar server/default/deployers/jbossws.deployer/netty.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/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf (rev 0) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2009-09-14 07:18:54 UTC (rev 10687) @@ -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/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/l! ib/jbossws-native-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml 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/jettison.jar server/standard/deployers/jbossws.deployer/netty.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/jboss! ws.deployer/META-INF/jbossws-container-jboss-beans.xml server/! standard /deployers/jbossws.deployer/META-INF/standard-*-config.xml server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml 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/jettison.jar server/standard/deployers/jbossws.deployer/netty.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/metro/trunk/src/main/distro/build.xml =================================================================== --- stack/metro/trunk/src/main/distro/build.xml 2009-09-14 07:18:31 UTC (rev 10686) +++ stack/metro/trunk/src/main/distro/build.xml 2009-09-14 07:18:54 UTC (rev 10687) @@ -22,7 +22,7 @@ <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}/default-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${build.dir}/${jboss.server.instance}-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- Check if ant.properties is available --> Modified: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2009-09-14 07:18:31 UTC (rev 10686) +++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2009-09-14 07:18:54 UTC (rev 10687) @@ -39,7 +39,9 @@ <directory>modules/resources/src/main/resources/resources</directory> <outputDirectory>build</outputDirectory> <includes> + <include>all-deploy.conf</include> <include>default-deploy.conf</include> + <include>standard-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> </includes> </fileSet>