JBossWS SVN: r11963 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-08 06:29:20 -0400 (Thu, 08 Apr 2010)
New Revision: 11963
Modified:
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
Log:
[JBWS-2923] Updating *-default.conf files for undeploying libs from common/lib
Modified: 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-04-08 10:28:28 UTC (rev 11962)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-04-08 10:29:20 UTC (rev 11963)
@@ -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/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/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/jbossw!
s-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/deployers/jbossws.deployer/wscommons-policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/j!
bossws.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
+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/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/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.ja!
r server/all/deployers/jbossws.deployer/wscommons-policy.jar s!
erver/al
l/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-04-08 10:28:28 UTC (rev 11962)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-04-08 10:29:20 UTC (rev 11963)
@@ -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/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/jbossw!
s-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/jbossws.deployer/wscommons-policy.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/depl!
oyers/jbossws.deployer/xmlsec.jar server/default/deployers/jbo!
ssws.dep
loyer/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
+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/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/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/jbossws.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
Modified: 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-04-08 10:28:28 UTC (rev 11962)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-04-08 10:29:20 UTC (rev 11963)
@@ -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/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/jbossw!
s-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/deployers/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/standar!
d/deploy
ers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/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/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/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.j!
ar server/standard/deployers/jbossws.deployer/policy.jar serve!
r/standa
rd/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
14 years, 8 months
JBossWS SVN: r11962 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-08 06:28:28 -0400 (Thu, 08 Apr 2010)
New Revision: 11962
Modified:
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
Log:
[JBWS-2923] Updating *-default.conf files for undeploying libs from common/lib
Modified: 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-04-08 09:21:59 UTC (rev 11961)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-04-08 10:28:28 UTC (rev 11962)
@@ -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/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/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/jbossw!
s-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/deployers/jbossws.deployer/wscommons-policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/j!
bossws.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
+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/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/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.ja!
r server/all/deployers/jbossws.deployer/wscommons-policy.jar s!
erver/al
l/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-04-08 09:21:59 UTC (rev 11961)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-04-08 10:28:28 UTC (rev 11962)
@@ -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/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/jbossw!
s-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/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wscommons-policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/depl!
oyers/jbossws.deployer/xmlsec.jar server/default/deployers/jbo!
ssws.dep
loyer/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
+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/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/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/jbossws.deployer/policy.jar server/default/d!
eployers
/jbossws.deployer/wscommons-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
Modified: 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-04-08 09:21:59 UTC (rev 11961)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-04-08 10:28:28 UTC (rev 11962)
@@ -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/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/jbossw!
s-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/deployers/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/standar!
d/deploy
ers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/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/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/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.j!
ar server/standard/deployers/jbossws.deployer/policy.jar serve!
r/standa
rd/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
14 years, 8 months
JBossWS SVN: r11961 - 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-04-08 05:21:59 -0400 (Thu, 08 Apr 2010)
New Revision: 11961
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2923] Updating deploy macro for moving libs to common/lib, removing deployment of xml-resolver.jar which is the same as resolver.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-04-08 09:20:09 UTC (rev 11960)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-04-08 09:21:59 UTC (rev 11961)
@@ -116,7 +116,7 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-javaee.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/velocity.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/XmlSchema.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/xml-resolver.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/resolver.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/wsdl4j.jar"
# For Cygwin, switch paths to Windows format before running java
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-04-08 09:20:09 UTC (rev 11960)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-04-08 09:21:59 UTC (rev 11961)
@@ -125,7 +125,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/velocity.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/XmlSchema.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/xml-resolver.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/resolver.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wstx.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-04-08 09:20:09 UTC (rev 11960)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-04-08 09:21:59 UTC (rev 11961)
@@ -124,7 +124,7 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/velocity.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/XmlSchema.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/xml-resolver.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/resolver.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.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-04-08 09:20:09 UTC (rev 11960)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-04-08 09:21:59 UTC (rev 11961)
@@ -55,7 +55,6 @@
<include name="**/wsdl4j.jar"/>
<include name="**/wss4j.jar"/>
<include name="**/wstx.jar"/>
- <include name="**/xml-resolver.jar"/>
<include name="**/XmlSchema.jar"/>
<include name="**/FastInfoset.jar"/>
</patternset>
@@ -67,27 +66,24 @@
<patternset id="jbossws.lib.endorsed.patternset">
<include name="**/jaxb-api.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/stax-api.jar"/>
</patternset>
<patternset id="jbossws.server.lib.patternset">
+ <include name="**/asm.jar"/>
<include name="**/commons-beanutils.jar"/>
- <include name="**/jaxws-api.jar"/>
- <include name="**/geronimo-ws-metadata*.jar"/>
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-spi.jar"/>
- <include name="**/saaj-api.jar"/>
- </patternset>
-
- <patternset id="jbossws.service.lib.patternset">
<include name="**/cxf-*.jar"/>
+ <include name="**/FastInfoset.jar"/>
<include name="**/geronimo-javamail*.jar"/>
<include name="**/geronimo-ws-metadata*.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
+ <include name="**/geronimo-ws-metadata*.jar"/>
<include name="**/jboss-jaxb-intros.jar"/>
- <include name="**/jbossws-cxf-client*.jar"/>
- <include name="**/jbossws-cxf-server*.jar"/>
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-spi.jar"/>
<include name="**/jdom.jar"/>
<include name="**/neethi.jar"/>
<include name="**/saaj-api.jar"/>
@@ -97,15 +93,17 @@
<include name="**/spring-core.jar"/>
<include name="**/spring-jms.jar"/>
<include name="**/spring-tx.jar"/>
+ <include name="**/XmlSchema.jar"/>
+ <include name="**/xmlsec.jar"/>
<include name="**/wsdl4j.jar"/>
<include name="**/wss4j.jar"/>
- <include name="**/xml-resolver.jar"/>
- <include name="**/xmlsec.jar"/>
- <include name="**/asm.jar"/>
- <include name="**/XmlSchema.jar"/>
- <include name="**/FastInfoset.jar"/>
</patternset>
+ <patternset id="jbossws.service.lib.patternset">
+ <include name="**/jbossws-cxf-client*.jar"/>
+ <include name="**/jbossws-cxf-server*.jar"/>
+ </patternset>
+
<!-- ================================================================== -->
<!-- Deploy Bin -->
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-08 09:20:09 UTC (rev 11960)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-08 09:21:59 UTC (rev 11961)
@@ -42,7 +42,6 @@
<include>org.springframework:spring-jms:jar</include>
<include>org.springframework:spring-tx:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
- <include>xml-resolver:xml-resolver:jar</include>
<include>org.apache.ws.commons.schema:XmlSchema:jar</include>
<include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
<include>org.apache.ws.security:wss4j:jar</include>
14 years, 8 months
JBossWS SVN: r11960 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-08 05:20:09 -0400 (Thu, 08 Apr 2010)
New Revision: 11960
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2923] Updating deploy macro for moving libs to common/lib
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-04-08 09:19:47 UTC (rev 11959)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-04-08 09:20:09 UTC (rev 11960)
@@ -58,49 +58,43 @@
<patternset id="jbossws.lib.endorsed.patternset">
<include name="**/jaxb-api.jar"/>
- </patternset>
-
- <patternset id="jbossws.server.lib.patternset">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-spi.jar"/>
- <include name="**/jaxws-api.jar"/>
- <include name="**/jsr181-api.jar"/>
- <include name="**/saaj-api.jar"/>
<include name="**/stax-api.jar"/>
</patternset>
- <patternset id="jbossws.service.lib.patternset">
+ <patternset id="jbossws.server.lib.patternset">
<include name="**/FastInfoset.jar"/>
<include name="**/http.jar"/>
- <include name="**/jaxb-api.jar"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/jaxb-xjc.jar"/>
- <include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-local-transport.jar"/>
<include name="**/jaxws-rt.jar"/>
<include name="**/jaxws-tools.jar"/>
- <include name="**/jbossws-metro-client.jar"/>
- <include name="**/jbossws-metro-server.jar"/>
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
<include name="**/jbossws-metro-wsit-rt.jar"/>
<include name="**/jbossws-metro-wsit-tools.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jaxrpc-api.jar"/>
+ <include name="**/jaxws-api.jar"/>
<include name="**/jsr181-api.jar"/>
<include name="**/jsr250-api.jar"/>
<include name="**/mimepull.jar"/>
<include name="**/policy.jar"/>
- <include name="**/resolver.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/saaj-impl.jar"/>
<include name="**/stax-ex.jar"/>
- <include name="**/stax-utils.jar"/>
<include name="**/streambuffer.jar"/>
<include name="**/txnannprocessor.jar"/>
- <include name="**/wsdl4j.jar"/>
- <include name="**/wstx.jar"/>
<include name="**/xmlsec.jar"/>
<include name="**/xws-security.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/wstx.jar"/>
</patternset>
+ <patternset id="jbossws.service.lib.patternset">
+ <include name="**/jbossws-metro-client.jar"/>
+ <include name="**/jbossws-metro-server.jar"/>
+ <include name="**/resolver.jar"/>
+ </patternset>
+
<!-- ================================================================== -->
<!-- Deploy Bin -->
<!-- ================================================================== -->
14 years, 8 months
JBossWS SVN: r11959 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-08 05:19:47 -0400 (Thu, 08 Apr 2010)
New Revision: 11959
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2923] Updating deploy macro for moving libs to common/lib
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-04-07 14:56:44 UTC (rev 11958)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-04-08 09:19:47 UTC (rev 11959)
@@ -63,12 +63,15 @@
<include name="**/jbossws-native-factories.jar"/>
<include name="**/jaxb-api.jar"/>
<include name="**/jaxws-api.jar"/>
+ <include name="**/stax-api.jar"/>
</patternset>
<patternset id="jbossws.server.lib.patternset">
<include name="**/commons-beanutils.jar"/>
+ <include name="**/FastInfoset.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/jsr181-api.jar"/>
+ <include name="**/jboss-jaxb-intros.jar"/>
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
<include name="**/jbossws-native-core.jar"/>
@@ -76,19 +79,16 @@
<include name="**/netty.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/jbossws-spi.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/jettison.jar"/>
+ <include name="**/netty.jar"/>
+ <include name="**/wscommons-policy.jar"/>
+ <include name="**/xmlsec.jar"/>
</patternset>
<patternset id="jbossws.service.lib.patternset">
- <include name="**/FastInfoset.jar"/>
- <include name="**/jboss-jaxb-intros.jar"/>
- <include name="**/jbossws-native-core.jar"/>
<include name="**/jbossws-native-factories.jar"/>
<include name="**/jbossws-native-services.jar"/>
- <include name="**/jettison.jar"/>
- <include name="**/netty.jar"/>
- <include name="**/wscommons-policy.jar"/>
- <include name="**/wsdl4j.jar"/>
- <include name="**/xmlsec.jar"/>
</patternset>
<!-- ================================================================== -->
14 years, 8 months
JBossWS SVN: r11958 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2010-04-07 10:56:44 -0400 (Wed, 07 Apr 2010)
New Revision: 11958
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
Log:
Fix Test case failures
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2010-04-07 14:49:59 UTC (rev 11957)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2010-04-07 14:56:44 UTC (rev 11958)
@@ -65,7 +65,7 @@
http://jira.codehaus.org/browse/MANTRUN-91
-->
<javac destdir="${tests.output.dir}/test-classes" debug="true" encoding="utf-8" deprecation="true" fork="true"
- executable="${java.jdk15.home}/bin/javac" compiler="javac1.5">
+ source="1.5" target="1.5">
<src path="${tests.output.dir}/wstools/java"/>
<classpath>
<pathelement path="${maven.test.classpath}"/>
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-04-07 14:49:59 UTC (rev 11957)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-04-07 14:56:44 UTC (rev 11958)
@@ -100,6 +100,11 @@
{
try
{
+ //When testUsernameToken() execute before, need to clear reqContext
+ Map<String, Object> reqContext = usernameDispatch.getRequestContext();
+ reqContext.remove(BindingProvider.USERNAME_PROPERTY);
+ reqContext.remove(BindingProvider.PASSWORD_PROPERTY);
+
String payload = "<ns1:getUsernameToken xmlns:ns1='http://org.jboss.ws/samples/wssecurity'/>";
usernameDispatch.invoke(new StreamSource(new StringReader(payload)));
fail("Server should respond with [401] - Unauthorized");
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-04-07 14:49:59 UTC (rev 11957)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-04-07 14:56:44 UTC (rev 11958)
@@ -72,6 +72,11 @@
{
try
{
+ //When testUsernameToken() execute before, need to clear reqContext
+ Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext();
+ reqContext.remove(BindingProvider.USERNAME_PROPERTY);
+ reqContext.remove(BindingProvider.PASSWORD_PROPERTY);
+
port.getUsernameToken();
fail("Server should respond with [401] - Unauthorized");
}
@@ -90,4 +95,4 @@
String retObj = port.getUsernameToken();
assertEquals("kermit", retObj);
}
-}
+}
\ No newline at end of file
14 years, 8 months
JBossWS SVN: r11957 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules: core/src/main/java/org/jboss/ws/extensions/security and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2010-04-07 10:49:59 -0400 (Wed, 07 Apr 2010)
New Revision: 11957
Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java
Log:
[JBPAPP-3943] - Wrong namespace on SOAP operation when a method with header parameter having a new namespace is invoked, "second" after a method that does not have this namespace'd parameter
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2010-04-07 14:00:57 UTC (rev 11956)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2010-04-07 14:49:59 UTC (rev 11957)
@@ -34,11 +34,13 @@
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MimeHeader;
import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
+import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
@@ -47,6 +49,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.SOAPMessageAbstraction;
+import org.jboss.ws.core.soap.SOAPContent.State;
import org.jboss.ws.core.soap.attachment.AttachmentPartImpl;
import org.jboss.ws.core.soap.attachment.CIDGenerator;
import org.jboss.ws.core.soap.attachment.MimeConstants;
@@ -56,6 +59,8 @@
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* The root class for all SOAP messages. As transmitted on the "wire", a SOAP message is an XML document or a
@@ -523,7 +528,7 @@
if (attachment == null)
{
- // autogenerated CID based on part name
+ // auto-generated CID based on part name
attachment = getAttachmentByPartName(ref);
}
@@ -557,4 +562,41 @@
while (attachmentItr.next() != null)
attachmentItr.remove();
}
+
+ public void prepareForDOMAccess() throws SOAPException
+ {
+ prepareForSpecificAccess(State.DOM_VALID);
+ }
+
+ private void prepareForSpecificAccess(State state) throws SOAPException
+ {
+ List<SOAPContentElement> contentElements = new LinkedList<SOAPContentElement>();
+ SOAPBody soapBody = this.getSOAPBody();
+ NodeList nodes = soapBody.getChildNodes();
+ for (int i = 0; i < nodes.getLength(); i++)
+ {
+ Node current = nodes.item(i);
+ if (current instanceof SOAPContentElement)
+ {
+ contentElements.add((SOAPContentElement)current);
+ break;
+ }
+ }
+ SOAPHeader soapHeader = this.getSOAPHeader();
+ nodes = soapHeader.getChildNodes();
+ for (int i = 0; i < nodes.getLength(); i++)
+ {
+ Node current = nodes.item(i);
+ if (current instanceof SOAPContentElement)
+ {
+ contentElements.add((SOAPContentElement)current);
+ break;
+ }
+ }
+ for (SOAPContentElement sce : contentElements)
+ {
+ sce.transitionTo(state);
+ }
+ }
+
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2010-04-07 14:00:57 UTC (rev 11956)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2010-04-07 14:49:59 UTC (rev 11957)
@@ -39,8 +39,8 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
import org.jboss.ws.core.binding.BindingException;
-import org.jboss.ws.core.binding.AbstractDeserializerFactory;
import org.jboss.ws.core.binding.DeserializerSupport;
import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.binding.TypeMappingImpl;
@@ -309,18 +309,28 @@
// Remove all child nodes
container.removeContents();
- // In case of dispatch and provider we use artifical element names
+ // In case of dispatch and provider we use artificial element names
// These need to be replaced (costly!)
if (artificalElement)
{
container.setElementQNameInternal(contentRootName);
}
- Document ownerDoc = container.getOwnerDocument();
+ // Process attributes: we copy from the fragment element to the previous container element, after having cleaned the latter
+ // to prevent useless / redundant namespace declarations with multiple prefixes. We also update the prefix of the container
+ // element to ensure proper namespace is configured for it
+ String oldPrefix = container.getPrefix();
+ if (oldPrefix != null)
+ {
+ container.removeNamespaceDeclaration(oldPrefix);
+ }
DOMUtils.copyAttributes(container, domElement);
+ container.setPrefix(domElement.getPrefix());
SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
+ // Add new child nodes
+ Document ownerDoc = container.getOwnerDocument();
NodeList nlist = domElement.getChildNodes();
for (int i = 0; i < nlist.getLength(); i++)
{
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2010-04-07 14:00:57 UTC (rev 11956)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2010-04-07 14:49:59 UTC (rev 11957)
@@ -214,6 +214,11 @@
SecurityStore securityStore = new SecurityStore(configuration.getKeyStoreURL(), configuration.getKeyStoreType(), configuration.getKeyStorePassword(),
configuration.getKeyPasswords(), configuration.getTrustStoreURL(), configuration.getTrustStoreType(), configuration.getTrustStorePassword());
SecurityEncoder encoder = new SecurityEncoder(operations, securityStore);
+
+ if ((sign != null || encrypt != null) && message instanceof SOAPMessageImpl)
+ {
+ ((SOAPMessageImpl)message).prepareForDOMAccess();
+ }
encoder.encode(message.getSOAPPart());
}
catch (WSSecurityException e)
Modified: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2010-04-07 14:00:57 UTC (rev 11956)
+++ stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2010-04-07 14:49:59 UTC (rev 11957)
@@ -32,10 +32,16 @@
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.Text;
+import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.core.soap.NameImpl;
+import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.ws.core.soap.SOAPElementImpl;
+import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Test the SOAPContentElement
@@ -187,4 +193,53 @@
String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Body><ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'><String_1>world::SOAP header was added</String_1></ns1:hello></env:Body></env:Envelope>";
assertEquals(expEnv, baos.toString());
}
+
+
+ //JBWS-2940: JAXB marshalling of object model can lead to a slightly different yet equivalent XMLFragment
+ //The new fragment can have different namespace prefix declarations, which can cause major issues in unlucky situations like below
+ public void testAttributesHandlingOnModelTransition() throws Exception
+ {
+ String envStr =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ "<env:Body>" +
+ "<ns2:Foo xmlns:ns2='firstNS'/>" +
+ "</env:Body>" +
+ "</env:Envelope>";
+
+ MessageFactoryImpl factory = new MessageFactoryImpl();
+ factory.setStyle(Style.DOCUMENT);
+ SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes()));
+
+ SOAPContentElement sce = getSOAPContentElement(soapMessage);
+
+ //force transition to XML_VALID and set an equivalent XMLFragment (but having a new ns declaration that would overwrite the one in the original fragment)
+ sce.setXMLFragment(new XMLFragment("<Foo xmlns='firstNS' xmlns:ns2='secondNs'/>"));
+
+ SOAPBody soapBody = soapMessage.getSOAPBody();
+ //force transition to DOM_VALID
+ soapBody.getFirstChild().getChildNodes();
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ soapMessage.writeTo(baos);
+
+ soapMessage = factory.createMessage(null, new ByteArrayInputStream(baos.toByteArray()));
+ Node foo = soapMessage.getSOAPBody().getFirstChild();
+ assertEquals("firstNS", foo.getNamespaceURI());
+ }
+
+ private SOAPContentElement getSOAPContentElement(final SOAPMessage soapMessage) throws Exception
+ {
+ SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
+ SOAPElementImpl bodyElement = null;
+ NodeList nodes = soapBody.getChildNodes();
+ for (int i = 0; i < nodes.getLength() && bodyElement == null; i++)
+ {
+ Node current = nodes.item(i);
+ if (current instanceof SOAPElementImpl)
+ {
+ bodyElement = (SOAPElementImpl)current;
+ }
+ }
+ return (SOAPContentElement)bodyElement;
+ }
}
14 years, 8 months
JBossWS SVN: r11956 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: deployment/aspect and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-07 10:00:57 -0400 (Wed, 07 Apr 2010)
New Revision: 11956
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
Log:
[JBWS-2974] Removing support for lazy load of bus
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-04-07 13:59:41 UTC (rev 11955)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-04-07 14:00:57 UTC (rev 11956)
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.lang.reflect.Method;
-import java.net.URL;
import javax.management.ObjectName;
import javax.servlet.ServletConfig;
@@ -38,27 +37,20 @@
import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.management.counters.CounterRepository;
import org.apache.cxf.resource.ResourceManager;
-import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.transport.servlet.CXFServlet;
import org.apache.cxf.transport.servlet.ServletContextResourceResolver;
import org.apache.cxf.transport.servlet.ServletController;
import org.apache.cxf.transport.servlet.ServletTransportFactory;
-import org.jboss.logging.Logger;
-import org.jboss.ws.Constants;
import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl;
-import org.jboss.wsf.stack.cxf.transport.SoapTransportFactoryExt;
-import org.springframework.context.ApplicationContext;
/**
* An extension to the CXF servlet
@@ -68,20 +60,12 @@
*/
public class CXFServletExt extends CXFServlet
{
- private static final Logger log = Logger.getLogger(CXFServletExt.class);
public static final String ENABLE_CXF_MANAGEMENT = "enable.cxf.management";
protected Endpoint endpoint;
protected EndpointRegistry epRegistry;
- protected BusHolder lazyLoadedBusHolder;
@Override
- public void init(ServletConfig servletConfig) throws ServletException
- {
- super.init(servletConfig);
- }
-
- @Override
public ServletController createServletController(ServletConfig servletConfig)
{
ServletTransportFactory stf = (ServletTransportFactory)createServletTransportFactory();
@@ -95,16 +79,8 @@
initEndpoint(servletConfig);
ServletContext svCtx = getServletContext();
- if (isBusLoadRequired(svCtx))
- {
- //reload bus using CXF servlet
- lazyLoadBus(servletConfig);
- }
- else
- {
- //keep the bus created during deployment and update it with the information coming from the servlet config
- updateAvailableBusWithServletInfo(servletConfig);
- }
+ //keep the bus created during deployment and update it with the information coming from the servlet config
+ updateAvailableBusWithServletInfo(servletConfig);
//register the InstrumentManagementImpl
//TODO!! remove reflection use inside this by providing proper hook in CXF and move this configuration to BusHolder
@@ -113,37 +89,6 @@
}
}
- private static boolean isBusLoadRequired(ServletContext svCtx)
- {
- boolean result = Constants.LAZY_LOAD_CXF_BUS;
- result = result || (ApplicationContext)svCtx.getAttribute("interface org.springframework.web.context.WebApplicationContext.ROOT") != null;
- result = result || (ApplicationContext)svCtx.getAttribute("org.springframework.web.context.WebApplicationContext.ROOT") != null;
- return result;
- }
-
- private void lazyLoadBus(ServletConfig servletConfig) throws ServletException
- {
- log.debug("Loading Bus through CXF servlet...");
- super.loadBus(servletConfig);
- //set the controller in the servlet context now that the bus has been configured in the servlet
- servletConfig.getServletContext().setAttribute(ServletController.class.getName(), getController());
- //recreate holder from the new bus
- lazyLoadedBusHolder = BusHolder.create(getBus());
- //configure bus for jbossws use
- String jbossCxfXml = servletConfig.getServletContext().getInitParameter(BusHolder.PARAM_CXF_BEANS_URL);
- try
- {
- ResourceResolver resolver = endpoint.getAttachment(ResourceResolver.class);
- BindingCustomization customizations = endpoint.getAttachment(BindingCustomization.class);
- JBossWSCXFConfigurer configurer = lazyLoadedBusHolder.createConfigurer(customizations, null);
- lazyLoadedBusHolder.configure(new URL(jbossCxfXml), new SoapTransportFactoryExt(), resolver, configurer);
- }
- catch (IOException e)
- {
- throw new ServletException("Error while configuring bus for JBossWS use", e);
- }
- }
-
private void updateAvailableBusWithServletInfo(ServletConfig servletConfig)
{
BusHolder holder = endpoint.getAttachment(BusHolder.class);
@@ -221,16 +166,6 @@
return endpoint;
}
- @Override
- public void destroy()
- {
- if (lazyLoadedBusHolder != null)
- {
- lazyLoadedBusHolder.close();
- }
- super.destroy();
- }
-
private void registerInstrumentManger(Bus bus) throws ServletException
{
InstrumentationManagerExtImpl instrumentationManagerImpl = new InstrumentationManagerExtImpl();
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2010-04-07 13:59:41 UTC (rev 11955)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2010-04-07 14:00:57 UTC (rev 11956)
@@ -31,7 +31,6 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.cxf.transport.servlet.ServletController;
-import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.InvocationContext;
@@ -45,9 +44,6 @@
*/
public class RequestHandlerImpl implements RequestHandler
{
- // provide logging
- private static final Logger log = Logger.getLogger(RequestHandlerImpl.class);
-
RequestHandlerImpl()
{
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-04-07 13:59:41 UTC (rev 11955)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-04-07 14:00:57 UTC (rev 11956)
@@ -26,7 +26,6 @@
import java.util.Map;
import org.apache.cxf.BusFactory;
-import org.jboss.ws.Constants;
import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSConstants;
import org.jboss.wsf.spi.binding.BindingCustomization;
@@ -52,10 +51,6 @@
@Override
public void start(Deployment dep)
{
- if (Constants.LAZY_LOAD_CXF_BUS)
- return;
-
- log.debug("Lazy load of CXF bus disabled, loading bus during deployment...");
BusHolder holder;
ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
try
14 years, 8 months
JBossWS SVN: r11955 - common/trunk/src/main/java/org/jboss/ws.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-07 09:59:41 -0400 (Wed, 07 Apr 2010)
New Revision: 11955
Modified:
common/trunk/src/main/java/org/jboss/ws/Constants.java
Log:
[JBWS-2974] Removing constant for lazy load
Modified: common/trunk/src/main/java/org/jboss/ws/Constants.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/Constants.java 2010-04-07 13:06:16 UTC (rev 11954)
+++ common/trunk/src/main/java/org/jboss/ws/Constants.java 2010-04-07 13:59:41 UTC (rev 11955)
@@ -328,6 +328,4 @@
static final String NETTY_MESSAGE = "org.jboss.ws.http.netty.Message";
static final boolean BC_CONTEXT_MODE = Boolean.parseBoolean(System.getProperty("org.jboss.ws.backward_compatible_context_creator", "false"));
-
- static final boolean LAZY_LOAD_CXF_BUS = Boolean.parseBoolean(System.getProperty("org.jboss.ws.lazyLoadCxfBus", "false"));
}
14 years, 8 months
JBossWS SVN: r11954 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2010-04-07 09:06:16 -0400 (Wed, 07 Apr 2010)
New Revision: 11954
Added:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/
Log:
[JBPAPP-3943] Branch for patch
Copied: stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943 (from rev 11053, stack/native/tags/jbossws-native-3.1.2.SP3-patch-02)
14 years, 8 months