JBossWS SVN: r12263 - stack/native/branches/jbossws-native-3.1.2/modules/management/src/main/webapp/WEB-INF.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-05-19 01:42:58 -0400 (Wed, 19 May 2010)
New Revision: 12263
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/management/src/main/webapp/WEB-INF/web.xml
Log:
[JBPAPP-4313]:Remove the blocks for GET and POST and activate authentication for all HTTP verbs
Modified: stack/native/branches/jbossws-native-3.1.2/modules/management/src/main/webapp/WEB-INF/web.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/management/src/main/webapp/WEB-INF/web.xml 2010-05-18 16:42:19 UTC (rev 12262)
+++ stack/native/branches/jbossws-native-3.1.2/modules/management/src/main/webapp/WEB-INF/web.xml 2010-05-19 05:42:58 UTC (rev 12263)
@@ -40,8 +40,6 @@
role 'friend' to access the JBossWS console web application
</description>
<url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
</web-resource-collection>
<auth-constraint>
<role-name>friend</role-name>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12262 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-18 12:42:19 -0400 (Tue, 18 May 2010)
New Revision: 12262
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf
stack/metro/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
Log:
[JBWS-3030] Adding cxf libs to default undeploy conf files
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-18 16:40:35 UTC (rev 12261)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-18 16:42:19 UTC (rev 12262)
@@ -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/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.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-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.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/wscommons-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
+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/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar 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/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wscommons-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/metro/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2010-05-18 16:40:35 UTC (rev 12261)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2010-05-18 16:42:19 UTC (rev 12262)
@@ -1 +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/policy.jar deployers/jbossws.deployer/wscommons-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
+deployers/jbossws.deployer/jbossws-cxf-*.jar 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 deployers/jbossws-jaxrpc.deployer/META-INF/stack-specific-jboss-beans.xml
14 years, 7 months
- 1
- 0
JBossWS SVN: r12261 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-18 12:40:35 -0400 (Tue, 18 May 2010)
New Revision: 12261
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
Log:
[JBWS-3030] Adding cxf libs to default undeploy conf files
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-18 16:26:36 UTC (rev 12260)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-18 16:40:35 UTC (rev 12261)
@@ -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/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.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-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.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/wscommons-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
+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/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar 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/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wscommons-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/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2010-05-18 16:26:36 UTC (rev 12260)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2010-05-18 16:40:35 UTC (rev 12261)
@@ -1 +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
+deployers/jbossws.deployer/jbossws-cxf-*.jar 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 deployers/jbossws-jaxrpc.deployer/META-INF/stack-specific-jboss-beans.xml
14 years, 7 months
- 1
- 0
JBossWS SVN: r12260 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-18 12:26:36 -0400 (Tue, 18 May 2010)
New Revision: 12260
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf
stack/native/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
Log:
[JBWS-3030] Adding cxf libs to default undeploy conf files
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-18 14:45:17 UTC (rev 12259)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-18 16:26:36 UTC (rev 12260)
@@ -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/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
+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/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar 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/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wscommons-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/server-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2010-05-18 14:45:17 UTC (rev 12259)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2010-05-18 16:26:36 UTC (rev 12260)
@@ -1 +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
+deployers/jbossws.deployer/jbossws-cxf-*.jar 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 deployers/jbossws-jaxrpc.deployer/META-INF/stack-specific-jboss-beans.xml
14 years, 7 months
- 1
- 0
JBossWS SVN: r12259 - in stack/metro/trunk: modules/resources/src/main/resources/resources and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-18 10:45:17 -0400 (Tue, 18 May 2010)
New Revision: 12259
Added:
stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf
stack/metro/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
Removed:
stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
stack/metro/trunk/modules/resources/src/main/resources/resources/default-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/jbossws-deploy-macros.xml
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build.xml
Log:
[JBWS-3030] Use just 2 deploy.conf files for disinstall from any profile/configuration
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2010-05-18 14:26:28 UTC (rev 12258)
+++ stack/metro/trunk/build.xml 2010-05-18 14:45:17 UTC (rev 12259)
@@ -29,7 +29,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/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-18 14:26:28 UTC (rev 12258)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-18 14:45:17 UTC (rev 12259)
@@ -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/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jbossws-native-services.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-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.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/wscommons-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/policy.jar server/all/deployer!
s/jbossws.deployer/wscommons-policy.jar server/all/deployers/j!
bossws.d
eployer/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/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-18 14:26:28 UTC (rev 12258)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-18 14:45:17 UTC (rev 12259)
@@ -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/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-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.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/wscommons-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/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbo!
ssws.deployer/policy.jar server/default/deployers/jbossws.depl!
oyer/wsc
ommons-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/deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf (rev 0)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-18 14:45:17 UTC (rev 12259)
@@ -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/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-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.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/wscommons-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/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-18 14:26:28 UTC (rev 12258)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-18 14:45:17 UTC (rev 12259)
@@ -329,6 +329,7 @@
<macrodef name="macro-undeploy-jbossws">
<attribute name="defaultconf"/>
+ <attribute name="defaultserverconf"/>
<attribute name="targetdir"/>
<attribute name="modifyjbossintegration"/>
<attribute name="removenativecore"/>
@@ -336,16 +337,19 @@
<sequential>
<loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+ <loadfile property="jbossws.server.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-server-deploy.conf" 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">
@@ -353,9 +357,12 @@
</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>
<!-- [JBWS-2895] jbossws-native-core.jar is not removed by default from JBWS 3.3.0, as it's required for jaxrpc support -->
<condition property="removenativecoreprop">
@@ -369,7 +376,7 @@
</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>
@@ -383,7 +390,7 @@
</target>
<target name="remove-native-core-from-client-and-common" if="removenativecoreprop">
- <delete>
+ <delete verbose="true">
<fileset dir="${jboss.home}/client">
<include name="**/jbossws-native-core.jar"/>
</fileset>
Added: stack/metro/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/server-deploy.conf (rev 0)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2010-05-18 14:45:17 UTC (rev 12259)
@@ -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/policy.jar deployers/jbossws.deployer/wscommons-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/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-18 14:26:28 UTC (rev 12258)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-18 14:45:17 UTC (rev 12259)
@@ -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/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-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.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/wscommons-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 server/standard/deployers/jbossws.deployer/netty.jar server/standard/de!
ployers/jbossws.deployer/policy.jar server/standard/deployers/!
jbossws.
deployer/wscommons-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-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2010-05-18 14:26:28 UTC (rev 12258)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2010-05-18 14:45:17 UTC (rev 12259)
@@ -40,7 +40,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"/>
@@ -48,7 +48,11 @@
<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" removenativecore="true"/>
+ <macro-undeploy-jbossws targetdir="${jboss501.server}"
+ defaultconf="${jbossws.default.deploy.conf}"
+ defaultserverconf="${jbossws.default.server.deploy.conf}"
+ modifyjbossintegration="true"
+ removenativecore="true"/>
</target>
<!-- ================================================================== -->
@@ -80,7 +84,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"/>
@@ -88,7 +92,11 @@
<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" removenativecore="true"/>
+ <macro-undeploy-jbossws targetdir="${jboss510.server}"
+ defaultconf="${jbossws.default.deploy.conf}"
+ defaultserverconf="${jbossws.default.server.deploy.conf}"
+ modifyjbossintegration="true"
+ removenativecore="true"/>
</target>
<!-- ================================================================== -->
@@ -120,7 +128,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"/>
@@ -128,7 +136,11 @@
<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" removenativecore="false"/><!-- [JBWS-2505] -->
+ <macro-undeploy-jbossws targetdir="${jboss600.server}"
+ defaultconf="${jbossws.default.deploy.conf}"
+ defaultserverconf="${jbossws.default.server.deploy.conf}"
+ modifyjbossintegration="true"
+ removenativecore="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
@@ -160,7 +172,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"/>
@@ -168,21 +180,31 @@
<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" removenativecore="false"/><!-- [JBWS-2505] -->
+ <macro-undeploy-jbossws targetdir="${jboss601.server}"
+ defaultconf="${jbossws.default.deploy.conf}"
+ defaultserverconf="${jbossws.default.server.deploy.conf}"
+ modifyjbossintegration="false"
+ removenativecore="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
- <!-- Create jbossws-deploy.conf -->
+ <!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf -->
<!-- ================================================================== -->
<macrodef name="macro-create-deploy-conf">
<attribute name="deploystructure"/>
<sequential>
- <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/juddi-service.sar/**"/>
+ <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <!-- Create jbossws-deploy.conf -->
+ <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/server/**"/>
<property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
- <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
<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="@{deploystructure}/server/${jboss.server.instance}" excludes="**/juddi-service.sar/**"/>
+ <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/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2010-05-18 14:26:28 UTC (rev 12258)
+++ stack/metro/trunk/src/main/distro/build.xml 2010-05-18 14:45:17 UTC (rev 12259)
@@ -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 -->
14 years, 7 months
- 1
- 0
JBossWS SVN: r12258 - in stack/native/trunk: modules/resources/src/main/resources/resources and 1 other directories.
by jbossws-commits＠lists.jboss.org
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="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+ <loadfile property="jbossws.server.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-server-deploy.conf" 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="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <!-- 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="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
<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="@{deploystructure}/server/${jboss.server.instance}">
+ <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 -->
14 years, 7 months
- 1
- 0
JBossWS SVN: r12257 - in stack/cxf/trunk: modules/resources/src/main/resources/resources and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-18 10:24:41 -0400 (Tue, 18 May 2010)
New Revision: 12257
Added:
stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/src/main/distro/build-deploy.xml
stack/cxf/trunk/src/main/distro/build.xml
Log:
[JBWS-3030] Use just 2 deploy.conf files for disinstall from any profile/configuration
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2010-05-18 10:22:14 UTC (rev 12256)
+++ stack/cxf/trunk/build.xml 2010-05-18 14:24:41 UTC (rev 12257)
@@ -29,7 +29,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/cxf/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-18 10:22:14 UTC (rev 12256)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-18 14:24:41 UTC (rev 12257)
@@ -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/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jbossws-native-services.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-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.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/wscommons-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/policy.jar server/all/deployer!
s/jbossws.deployer/wscommons-policy.jar server/all/deployers/j!
bossws.d
eployer/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/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-18 10:22:14 UTC (rev 12256)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-18 14:24:41 UTC (rev 12257)
@@ -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/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-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.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/wscommons-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/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbo!
ssws.deployer/wscommons-policy.jar server/default/deployers/jb!
ossws.de
ployer/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/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-18 14:24:41 UTC (rev 12257)
@@ -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/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-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.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/wscommons-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/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 2010-05-18 10:22:14 UTC (rev 12256)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-18 14:24:41 UTC (rev 12257)
@@ -337,6 +337,7 @@
<macrodef name="macro-undeploy-jbossws">
<attribute name="defaultconf"/>
+ <attribute name="defaultserverconf"/>
<attribute name="targetdir"/>
<attribute name="modifyjbossintegration"/>
<attribute name="removenativecore"/>
@@ -344,16 +345,19 @@
<sequential>
<loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+ <loadfile property="jbossws.server.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-server-deploy.conf" 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">
@@ -361,9 +365,12 @@
</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>
<!-- [JBWS-2895] jbossws-native-core.jar is not removed by default from JBWS 3.3.0, as it's required for jaxrpc support -->
<condition property="removenativecoreprop">
@@ -377,7 +384,7 @@
</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>
@@ -391,7 +398,7 @@
</target>
<target name="remove-native-core-from-client-and-common" if="removenativecoreprop">
- <delete>
+ <delete verbose="true">
<fileset dir="${jboss.home}/client">
<include name="**/jbossws-native-core.jar"/>
</fileset>
Added: stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2010-05-18 14:24:41 UTC (rev 12257)
@@ -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/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-18 10:22:14 UTC (rev 12256)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-18 14:24:41 UTC (rev 12257)
@@ -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/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-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.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/wscommons-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 server/standard/deployers/jbossws.deployer/netty.jar server/standard/de!
ployers/jbossws.deployer/policy.jar server/standard/deployers/!
jbossws.
deployer/wscommons-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/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-05-18 10:22:14 UTC (rev 12256)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-05-18 14:24:41 UTC (rev 12257)
@@ -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,11 @@
<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" removenativecore="true"/>
+ <macro-undeploy-jbossws targetdir="${jboss501.server}"
+ defaultconf="${jbossws.default.deploy.conf}"
+ defaultserverconf="${jbossws.default.server.deploy.conf}"
+ modifyjbossintegration="true"
+ removenativecore="true"/>
</target>
<!-- ================================================================== -->
@@ -76,7 +80,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 +88,11 @@
<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" removenativecore="true"/>
+ <macro-undeploy-jbossws targetdir="${jboss510.server}"
+ defaultconf="${jbossws.default.deploy.conf}"
+ defaultserverconf="${jbossws.default.server.deploy.conf}"
+ modifyjbossintegration="true"
+ removenativecore="true"/>
</target>
<!-- ================================================================== -->
@@ -114,7 +122,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 +130,11 @@
<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" removenativecore="false" /><!-- [JBWS-2505][JBWS-2895] -->
+ <macro-undeploy-jbossws targetdir="${jboss600.server}"
+ defaultconf="${jbossws.default.deploy.conf}"
+ defaultserverconf="${jbossws.default.server.deploy.conf}"
+ modifyjbossintegration="true"
+ removenativecore="false" /><!-- [JBWS-2505][JBWS-2895] -->
</target>
<!-- ================================================================== -->
@@ -152,7 +164,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,21 +172,31 @@
<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" removenativecore="false"/><!-- [JBWS-2505][JBWS-2895] -->
+ <macro-undeploy-jbossws targetdir="${jboss601.server}"
+ defaultconf="${jbossws.default.deploy.conf}"
+ defaultserverconf="${jbossws.default.server.deploy.conf}"
+ modifyjbossintegration="false"
+ removenativecore="false"/><!-- [JBWS-2505][JBWS-2895] -->
</target>
<!-- ================================================================== -->
- <!-- Create jbossws-deploy.conf -->
+ <!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf -->
<!-- ================================================================== -->
<macrodef name="macro-create-deploy-conf">
<attribute name="deploystructure"/>
<sequential>
- <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/juddi-service.sar/**"/>
+ <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <!-- Create jbossws-deploy.conf -->
+ <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/server/**"/>
<property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
- <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
<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="@{deploystructure}/server/${jboss.server.instance}" excludes="**/juddi-service.sar/**"/>
+ <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/cxf/trunk/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build.xml 2010-05-18 10:22:14 UTC (rev 12256)
+++ stack/cxf/trunk/src/main/distro/build.xml 2010-05-18 14:24:41 UTC (rev 12257)
@@ -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 -->
14 years, 7 months
- 1
- 0
JBossWS SVN: r12255 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-18 04:24:46 -0400 (Tue, 18 May 2010)
New Revision: 12255
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2946] Remove references old jbossws.sar
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-18 08:22:28 UTC (rev 12254)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-18 08:24:46 UTC (rev 12255)
@@ -334,7 +334,6 @@
<attribute name="removenativecore"/>
<sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deploy/jbossws.sar/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
@@ -345,7 +344,6 @@
<delete includeemptydirs="true">
<fileset dir="${jboss.server.home}">
- <include name="**/jbossws.sar/**"/>
<include name="**/juddi-service.sar/**"/>
<include name="**/jbossws-console.war/**"/>
</fileset>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12254 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-18 04:22:28 -0400 (Tue, 18 May 2010)
New Revision: 12254
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2946] Remove references old jbossws.sar
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 08:04:58 UTC (rev 12253)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-18 08:22:28 UTC (rev 12254)
@@ -287,7 +287,6 @@
<attribute name="targetdir"/>
<attribute name="modifyjbossintegration"/>
<sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deploy/jbossws.sar/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
@@ -298,7 +297,6 @@
<delete includeemptydirs="true">
<fileset dir="${jboss.server.home}">
- <include name="**/jbossws.sar/**"/>
<include name="**/juddi-service.sar/**"/>
<include name="**/jbossws-console.war/**"/>
</fileset>
14 years, 7 months
- 1
- 0
JBossWS SVN: r12253 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-18 04:04:58 -0400 (Tue, 18 May 2010)
New Revision: 12253
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2946] Remove references old jbossws.sar
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 2010-05-17 16:07:24 UTC (rev 12252)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-18 08:04:58 UTC (rev 12253)
@@ -342,7 +342,6 @@
<attribute name="removenativecore"/>
<sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deploy/jbossws.sar/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
@@ -353,7 +352,6 @@
<delete includeemptydirs="true">
<fileset dir="${jboss.server.home}">
- <include name="**/jbossws.sar/**"/>
<include name="**/juddi-service.sar/**"/>
<include name="**/jbossws-console.war/**"/>
</fileset>
14 years, 7 months
- 1
- 0