Author: alessio.soldano(a)jboss.com Date: 2009-10-05 13:44:56 -0400 (Mon, 05 Oct 2009) New Revision: 10835 Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JAXBIntroDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSBeanConfigurer.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/binding/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/binding/JAXBBindingCustomization.java Modified: stack/cxf/trunk/modules/client/pom.xml 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/jbossws-deploy-macros.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2714] Adding dependency on jboss-jaxb-intros, JAXBIntroDeploymentAspect and a new configurer for setting customizations on CXF beans during model build up (WIP) Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2009-10-05 17:42:17 UTC (rev 10834) +++ stack/cxf/trunk/modules/client/pom.xml 2009-10-05 17:44:56 UTC (rev 10835) @@ -172,6 +172,10 @@ <artifactId>jboss-common-core</artifactId> </dependency> <dependency> + <groupId>jboss.jaxbintros</groupId> + <artifactId>jboss-jaxb-intros</artifactId> + </dependency> + <dependency> <groupId>apache-log4j</groupId> <artifactId>log4j</artifactId> </dependency> 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 2009-10-05 17:42:17 UTC (rev 10834) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2009-10-05 17:44:56 UTC (rev 10835) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar commo! n/lib/jbossws-native-jaxws-ext.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/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/all/deploy/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml se! rver/all/deployers/jbossws.deployer/META-INF/jbossws-container! -jboss-b eans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml server/all/deploy/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar commo! n/lib/jbossws-native-jaxws-ext.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/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/all/deploy/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/j! bossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml serv! er/all/d eployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml server/all/deploy/jbossws.sar server/all/deploy/juddi-service.sar server/all/deploy/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml 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 2009-10-05 17:42:17 UTC (rev 10834) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-10-05 17:44:56 UTC (rev 10835) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar commo! n/lib/jbossws-native-jaxws-ext.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/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.d! eployer/META-INF/jbossws-deployer-jboss-beans.xml server/defau! lt/deplo yers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossw! s.deployer/META-INF/standard-*-config.xml +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar commo! n/lib/jbossws-native-jaxws-ext.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/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.depl! oyer/META-INF/jboss-beans.xml server/default/deployers/jbossws! .deploye r/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 server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/j! bossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml 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 2009-10-05 17:42:17 UTC (rev 10834) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-10-05 17:44:56 UTC (rev 10835) @@ -79,6 +79,7 @@ <include name="**/geronimo-ws-metadata*.jar"/> <include name="**/jaxrpc-api.jar"/> <include name="**/jaxws-api.jar"/> + <include name="**/jboss-jaxb-intros.jar"/> <include name="**/jbossws-cxf-client*.jar"/> <include name="**/jbossws-cxf-server*.jar"/> <include name="**/jdom.jar"/> 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 2009-10-05 17:42:17 UTC (rev 10834) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2009-10-05 17:44:56 UTC (rev 10835) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar commo! n/lib/jbossws-native-jaxws-ext.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/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deploy! ers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml! server/ standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml se! rver/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar commo! n/lib/jbossws-native-jaxws-ext.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/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers! /jbossws.deployer/META-INF/jboss-beans.xml server/standard/dep! loyers/j bossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml server/standard/deploy/jbossws.sar server/standard/deploy/juddi-service.sar server/standard/deploy/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deploye! rs/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2009-10-05 17:42:17 UTC (rev 10834) +++ stack/cxf/trunk/modules/server/pom.xml 2009-10-05 17:44:56 UTC (rev 10835) @@ -171,6 +171,10 @@ <artifactId>jaxb-api</artifactId> </dependency> <dependency> + <groupId>jboss.jaxbintros</groupId> + <artifactId>jboss-jaxb-intros</artifactId> + </dependency> + <dependency> <groupId>org.jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> <type>sar</type> 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 2009-10-05 17:42:17 UTC (rev 10834) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-10-05 17:44:56 UTC (rev 10835) @@ -36,6 +36,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.binding.soap.SoapTransportFactory; +import org.apache.cxf.configuration.Configurer; import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.cxf.transport.servlet.CXFServlet; import org.apache.cxf.transport.servlet.ServletController; @@ -75,16 +76,6 @@ public void init(ServletConfig servletConfig) throws ServletException { super.init(servletConfig); - - // Init the Endpoint - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - - ServletContext context = servletConfig.getServletContext(); - String contextPath = context.getContextPath(); - endpoint = initServiceEndpoint(contextPath); - - context.setAttribute(ServletController.class.getName(), getController()); } @Override @@ -109,12 +100,33 @@ factory.setBus(bus); dfm.registerDestinationFactory(Constants.NS_SOAP11, factory); dfm.registerDestinationFactory(Constants.NS_SOAP12, factory); - + + //Init the Endpoint + initEndpoint(servletConfig); + + //Load additional configurations loadAdditionalConfigExt(appCtx, servletConfig); } + + private void initEndpoint(ServletConfig servletConfig) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); + ServletContext context = servletConfig.getServletContext(); + String contextPath = context.getContextPath(); + endpoint = initServiceEndpoint(contextPath); + + context.setAttribute(ServletController.class.getName(), getController()); + } + private void loadAdditionalConfigExt(ApplicationContext ctx, ServletConfig servletConfig) throws ServletException { + //Add extension to configure server beans according to JBossWS customizations + Configurer configurer = bus.getExtension(Configurer.class); + bus.setExtension(new JBossWSBeanConfigurer(endpoint, configurer), Configurer.class); + + //Load configuration String location = servletConfig.getServletContext().getInitParameter(PARAM_CXF_BEANS_URL); if (location != null) { Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JAXBIntroDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JAXBIntroDeploymentAspect.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JAXBIntroDeploymentAspect.java 2009-10-05 17:44:56 UTC (rev 10835) @@ -0,0 +1,124 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf; + +import java.io.IOException; +import java.io.InputStream; + +import org.jboss.jaxb.intros.IntroductionsAnnotationReader; +import org.jboss.jaxb.intros.IntroductionsConfigParser; +import org.jboss.jaxb.intros.configmodel.JaxbIntros; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.binding.BindingCustomization; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; + +import com.sun.xml.bind.api.JAXBRIContext; + +/** + * A CXF version of JAXBIntroDeploymentAspect, which installs JAXB Introduction + * metadata into the deployment for later consumption. Despite being the same as the + * Native one, this deployment aspect is not moved to jbossws-framework as it directly + * depends on jaxb impl and we don't really want to enforce the same jaxb impl version + * dependency on different stacks). + * + * @author Heiko.Braun(a)jboss.com + * @author alessio.soldano(a)jboss.com + */ +public class JAXBIntroDeploymentAspect extends DeploymentAspect +{ + private static Logger logger = Logger.getLogger(JAXBIntroDeploymentAspect.class); + private static final String META_INF_JAXB_INTROS_XML = "META-INF/jaxb-intros.xml"; + private static final String WEB_INF_JAXB_INTROS_XML = "WEB-INF/jaxb-intros.xml"; + + public void start(Deployment deployment) + { + // assert ArchiveDeployment + if(! (deployment instanceof ArchiveDeployment) ) + { + if (log.isDebugEnabled()) + log.debug("JAXBIntroDeploymentAspect doesn't work on " + deployment.getClass()); + return; + } + + ArchiveDeployment archive = (ArchiveDeployment)deployment; + InputStream introsConfigStream = null; + + try + { + // META-INF first + UnifiedVirtualFile vfs = archive.getRootFile().findChild(META_INF_JAXB_INTROS_XML); + introsConfigStream = vfs.toURL().openStream(); + } catch (Exception e) {} + + if(null == introsConfigStream) + { + try + { + // WEB-INF second + UnifiedVirtualFile vfs = archive.getRootFile().findChild(WEB_INF_JAXB_INTROS_XML); + introsConfigStream = vfs.toURL().openStream(); + } catch (Exception e) { + return; + } + } + + try + { + + if(introsConfigStream != null) + { + JaxbIntros jaxbIntros = IntroductionsConfigParser.parseConfig(introsConfigStream); + IntroductionsAnnotationReader annotationReader = new IntroductionsAnnotationReader(jaxbIntros); + String defaultNamespace = jaxbIntros.getDefaultNamespace(); + BindingCustomization jaxbCustomizations = new org.jboss.wsf.stack.cxf.binding.JAXBBindingCustomization(); + + jaxbCustomizations.put(JAXBRIContext.ANNOTATION_READER, annotationReader); + if(defaultNamespace != null) { + jaxbCustomizations.put(JAXBRIContext.DEFAULT_NAMESPACE_REMAP, defaultNamespace); + } + + // JBossWSBeanConfigurer#configureService becomes the consumer later on + for(Endpoint endpoint : deployment.getService().getEndpoints()) + { + endpoint.addAttachment(BindingCustomization.class, jaxbCustomizations); + } + + } + + } + finally + { + if(introsConfigStream != null) + { + try { + introsConfigStream.close(); + } catch (IOException e) { + logger.error("[" + deployment.getService().getContextRoot() + "] Error closing JAXB Introductions Configurations stream ", e); + } + } + } + } +} Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JAXBIntroDeploymentAspect.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSBeanConfigurer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSBeanConfigurer.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSBeanConfigurer.java 2009-10-05 17:44:56 UTC (rev 10835) @@ -0,0 +1,95 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf; + +import org.apache.cxf.configuration.Configurer; +import org.apache.cxf.databinding.DataBinding; +import org.apache.cxf.jaxb.JAXBDataBinding; +import org.apache.cxf.service.Service; +import org.jboss.wsf.spi.binding.BindingCustomization; +import org.jboss.wsf.spi.binding.JAXBBindingCustomization; +import org.jboss.wsf.spi.deployment.Endpoint; + +/** + * A CXF configurer that sets JBossWS stuff / customizations / properties etc. in CXF configurable beans + * + * @author alessio.soldano(a)jboss.com + * @since 05-Oct-2009 + */ +public class JBossWSBeanConfigurer implements Configurer +{ + private Endpoint endpoint; + private Configurer delegate; + + public JBossWSBeanConfigurer(Endpoint endpoint, Configurer delegate) + { + this.endpoint = endpoint; + this.delegate = delegate; + } + + public void configureBean(Object beanInstance) + { + if (beanInstance instanceof Service) + { + configureService((Service)beanInstance); + } + if (delegate != null) + { + delegate.configureBean(beanInstance); + } + } + + public void configureBean(String name, Object beanInstance) + { + if (beanInstance instanceof Service) + { + configureService((Service)beanInstance); + } + if (delegate != null) + { + delegate.configureBean(name, beanInstance); + } + } + + private synchronized void configureService(Service service) + { + //Configure binding customization + BindingCustomization customization = endpoint.getAttachment(BindingCustomization.class); + if (customization != null) + { + DataBinding db = service.getDataBinding(); + //JAXB + if (customization instanceof JAXBBindingCustomization) + { + if (db != null && db instanceof JAXBDataBinding) + { + ((JAXBDataBinding)db).setContextProperties(customization); + } + } + //add other binding customization here below + + } + //add other configurations here below + + } + +} Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSBeanConfigurer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/binding/JAXBBindingCustomization.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/binding/JAXBBindingCustomization.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/binding/JAXBBindingCustomization.java 2009-10-05 17:44:56 UTC (rev 10835) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.binding; + +import com.sun.xml.bind.api.JAXBRIContext; + +public class JAXBBindingCustomization extends org.jboss.wsf.spi.binding.JAXBBindingCustomization +{ + private static final long serialVersionUID = -3099372764620602230L; + + // Use an alternative RuntimeAnnotationReader implementation + public final static String ANNOTATION_READER = JAXBRIContext.ANNOTATION_READER; + + // Reassign the default namespace URI to something else at the runtime + public final static String DEFAULT_NAMESPACE_REMAP = JAXBRIContext.DEFAULT_NAMESPACE_REMAP; + + // Enable the c14n marshalling support in the JAXBContext. + public final static String CANONICALIZATION_SUPPORT = JAXBRIContext.CANONICALIZATION_SUPPORT; +} Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/binding/JAXBBindingCustomization.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-10-05 17:42:17 UTC (rev 10834) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-10-05 17:44:56 UTC (rev 10835) @@ -39,7 +39,7 @@ </bean> <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect"> - <property name="requires">EndpointAddress</property> + <property name="requires">EndpointAddress,JAXBIntros</property> <property name="provides">StackDescriptor</property> <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property> <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property> @@ -64,5 +64,10 @@ </list> </property> </bean> + + <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.cxf.JAXBIntroDeploymentAspect"> + <property name="provides">JAXBIntros</property> + <property name="relativeOrder">20</property> <!-- [JBDEPLOY-201] workaround --> + </bean> </deployment> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2009-10-05 17:42:17 UTC (rev 10834) +++ stack/cxf/trunk/pom.xml 2009-10-05 17:44:56 UTC (rev 10835) @@ -62,6 +62,7 @@ <cxf.asm.version>2.2.3</cxf.asm.version> <fastinfoset.api.version>1.2.7</fastinfoset.api.version> <jboss.common.core.version>2.2.14.GA</jboss.common.core.version> + <jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.12</jaxb.impl.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> @@ -368,7 +369,7 @@ <scope>provided</scope> </dependency> - <!-- transitve dependencies --> + <!-- transitive dependencies --> <dependency> <groupId>apache-log4j</groupId> <artifactId>log4j</artifactId> @@ -390,6 +391,11 @@ <version>${jaxb.impl.version}</version> </dependency> <dependency> + <groupId>jboss.jaxbintros</groupId> + <artifactId>jboss-jaxb-intros</artifactId> + <version>${jboss.jaxbintros.version}</version> + </dependency> + <dependency> <groupId>org.jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> <version>${jboss.jaxr.version}</version> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-10-05 17:42:17 UTC (rev 10834) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-10-05 17:44:56 UTC (rev 10835) @@ -49,6 +49,7 @@ <include>apache-velocity:velocity:jar</include> <include>commons-collections:commons-collections:jar</include> <include>commons-lang:commons-lang:jar</include> + <include>jboss.jaxbintros:jboss-jaxb-intros</include> </includes> </dependencySet> <dependencySet>