[jbossws-commits] JBossWS SVN: r11619 - in stack/cxf/trunk: modules/resources/src/main/resources/resources and 7 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-02-18 12:56:46 -0500 (Thu, 18 Feb 2010) New Revision: 11619 Added: stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml 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/jbossws-deploy-macros.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/distro/build.xml stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-2895] Merging from jaxrpc-cxf branch, adding support for JAXRPC with CXF and Metro stack 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-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-02-18 17:56:46 UTC (rev 11619) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/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 commo! n/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/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/wscommons-policy.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.deploy! er/META-INF/jbossws-container-jboss-beans.xml server/all/deplo! yers/jbo ssws.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/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 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-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-02-18 17:56:46 UTC (rev 11619) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/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 commo! n/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/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-depl! oyer-jboss-beans.xml server/default/deployers/jbossws.deployer! /META-IN F/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/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 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-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-02-18 17:56:46 UTC (rev 11619) @@ -34,6 +34,7 @@ <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> <include name="**/jaxb-xjc.jar"/> + <include name="**/jaxrpc-api.jar"/> <include name="**/jaxws-api.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-cxf-client*.jar"/> @@ -258,6 +259,19 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-jaxrpc-deployers"> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <copy todir="@{targetdir}"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-jaxrpc-(a){jbossid}/jbossws.beans&quot;&gt; + <include name="META-INF/**"/> + </fileset> + </copy> + </sequential> + </macrodef> + <target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration"> <sequential> <copy todir="${targetdir}/META-INF" flatten="true" overwrite="true"> @@ -290,6 +304,18 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-cxf-with-jaxrpc" depends="check-parameters"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-jaxrpc-deployers targetdir="${installserver}/deployers/jbossws-jaxrpc.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> + </target> + <!-- ================================================================== --> <!-- Undeploy JBossWS --> <!-- ================================================================== --> @@ -298,6 +324,8 @@ <attribute name="defaultconf"/> <attribute name="targetdir"/> <attribute name="modifyjbossintegration"/> + <attribute name="removenativecore"/> + <sequential> <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/deploy/jbossws.sar/jbossws-deploy.conf&quot; failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf&quot; failonerror="false"/> @@ -323,6 +351,15 @@ <delete> <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> </delete> + + <!-- [JBWS-2895] jbossws-native-core.jar is not removed by default from JBWS 3.3.0, as it's required for jaxrpc support --> + <condition property="removenativecoreprop"> + <and> + <istrue value="@{removenativecore}"/> + </and> + </condition> + <antcall target="remove-native-core-from-client-and-common"/> + </sequential> </macrodef> @@ -339,6 +376,17 @@ </fileset> </delete> </target> + + <target name="remove-native-core-from-client-and-common" if="removenativecoreprop"> + <delete> + <fileset dir="${jboss.home}/client"> + <include name="**/jbossws-native-core.jar"/> + </fileset> + <fileset dir="${jboss.home}/common"> + <include name="**/jbossws-native-core.jar"/> + </fileset> + </delete> + </target> <target name="process-jboss-integration"> <condition property="fixintegration"> 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-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-02-18 17:56:46 UTC (rev 11619) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/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 commo! n/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/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/wscommons-policy.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-IN! F/jbossws-deployer-jboss-beans.xml server/standard/deployers/j! bossws.d eployer/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/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 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2010-02-18 17:56:46 UTC (rev 11619) @@ -31,10 +31,10 @@ import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.common.integration.WSConstants; 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.Deployment.DeploymentType; import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; @@ -46,7 +46,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 10-May-2007 */ -public class DescriptorDeploymentAspect extends DeploymentAspect +public class DescriptorDeploymentAspect extends AbstractDeploymentAspect { // provide logging private final Logger log = Logger.getLogger(DescriptorDeploymentAspect.class); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ResourceResolverDeploymentAspect.java 2010-02-18 17:56:46 UTC (rev 11619) @@ -21,9 +21,9 @@ */ package org.jboss.wsf.stack.cxf; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; 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.ResourceResolver; @@ -36,7 +36,7 @@ * @author alessio.soldano(a)jboss.com * @since 19-Nov-2009 */ -public class ResourceResolverDeploymentAspect extends DeploymentAspect +public class ResourceResolverDeploymentAspect extends AbstractDeploymentAspect { @Override public void start(Deployment dep) Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-02-18 17:56:46 UTC (rev 11619) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <deployment xmlns="urn:jboss:bean-deployer:2.0"> - + <!-- The registry for web service endpoints --> <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> @@ -35,6 +35,7 @@ </entry> </map> </property> + <property name="forJaxRpc">false</property> </bean> <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect"> @@ -42,16 +43,19 @@ <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> + <property name="forJaxRpc">false</property> </bean> <bean name="ResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.ResourceResolverDeploymentAspect"> <property name="requires">JmsEndpointAddress</property> <property name="provides">ResourceResolver</property> + <property name="forJaxRpc">false</property> </bean> <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">StackEndpointHandler</property> + <property name="forJaxRpc">false</property> </bean> <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> @@ -64,10 +68,12 @@ <inject bean="WSLogRecorder"/> </list> </property> + <property name="forJaxRpc">false</property> </bean> <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect"> <property name="provides">JAXBIntros</property> + <property name="forJaxRpc">false</property> </bean> </deployment> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml (from rev 11608, stack/cxf/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml 2010-02-18 17:56:46 UTC (rev 11619) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- The stack specific deployment aspects --> + <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> + <property name="provides">ContextProperties, StackDescriptor</property> + <property name="contextProperties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>stack.transport.class</key> + <value>org.jboss.wsf.stack.jbws.EndpointServlet</value> + </entry> + </map> + </property> + <property name="forJaxWs">false</property> + </bean> + + <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + <property name="provides">InitializedMetaDataModel</property> + <property name="forJaxWs">false</property> + </bean> + + <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">StackEndpointHandler</property> + <property name="forJaxWs">false</property> + </bean> + + <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel, JAXBIntros</property> + <property name="provides">PublishedContract</property> + <property name="forJaxWs">false</property> + </bean> + + <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + <property name="forJaxWs">false</property> + </bean> + + <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> + <property name="requires">ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property> + <property name="provides">UnifiedMetaDataModel</property> + <property name="forJaxWs">false</property> + </bean> + +</deployment> Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2010-02-18 17:56:46 UTC (rev 11619) @@ -35,6 +35,11 @@ file="${src.dir}/jbossws-cxf-config-as6.xml" tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> + + <copy + file="${src.dir}/jbossws-jaxrpc-config-as6.xml" + tofile="${dest.dir}/jbossws-jaxrpc-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> </target> Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2010-02-18 17:56:46 UTC (rev 11619) @@ -112,6 +112,7 @@ <property name="tests.output.dir" value="${project.build.directory}"/> <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> </tasks> </configuration> </execution> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-02-18 17:56:46 UTC (rev 11619) @@ -368,6 +368,9 @@ <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <!-- Libs below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> + <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> @@ -421,6 +424,9 @@ <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <!-- Libs below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> + <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> @@ -473,6 +479,9 @@ <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <!-- Libs below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> + <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> @@ -525,6 +534,9 @@ <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <!-- Libs below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack --> + <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-02-18 17:56:46 UTC (rev 11619) @@ -45,3 +45,6 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* + +# [JBWS-2895] JAX-RPC available from AS 6.0.0.M2 +org/jboss/test/ws/jaxrpc/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-02-18 17:56:46 UTC (rev 11619) @@ -45,3 +45,6 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* + +# [JBWS-2895] JAX-RPC available from AS 6.0.0.M2 +org/jboss/test/ws/jaxrpc/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-02-18 17:56:46 UTC (rev 11619) @@ -45,3 +45,6 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* + +# [JBWS-2895] JAX-RPC available from AS 6.0.0.M2 +org/jboss/test/ws/jaxrpc/** Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/pom.xml 2010-02-18 17:56:46 UTC (rev 11619) @@ -46,8 +46,8 @@ <jbossws.spi.version>1.3.0-SNAPSHOT</jbossws.spi.version> <jbossws.common.version>1.3.0-SNAPSHOT</jbossws.common.version> <jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version> - <jbossws.jboss501.version>3.2.1.GA</jbossws.jboss501.version> - <jbossws.jboss510.version>3.2.1.GA</jbossws.jboss510.version> + <jbossws.jboss501.version>3.3.0-SNAPSHOT</jbossws.jboss501.version> + <jbossws.jboss510.version>3.3.0-SNAPSHOT</jbossws.jboss510.version> <!-- JBWS-2505 --> <!-- START --> <!-- Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-02-18 17:56:46 UTC (rev 11619) @@ -46,7 +46,7 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws targetdir="${jboss501.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/> + <macro-undeploy-jbossws targetdir="${jboss501.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true" removenativecore="true"/> </target> <!-- ================================================================== --> @@ -84,7 +84,7 @@ <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510"> <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <macro-undeploy-jbossws targetdir="${jboss510.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/> + <macro-undeploy-jbossws targetdir="${jboss510.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true" removenativecore="true"/> </target> <!-- ================================================================== --> @@ -122,7 +122,7 @@ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600"> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] --> + <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false" removenativecore="true" /><!-- [JBWS-2505][JBWS-2895] --> </target> <!-- ================================================================== --> @@ -131,7 +131,7 @@ <target name="deploy-structure-jboss601" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf" inheritall="false"> + <antcall target="deploy-jbossws-cxf-with-jaxrpc" inheritall="false"> <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> @@ -160,7 +160,7 @@ <target name="undeploy-jboss601" depends="target-jboss601,init" description="Remove jbossws from jboss601"> <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/> - <macro-undeploy-jbossws targetdir="${jboss601.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] --> + <macro-undeploy-jbossws targetdir="${jboss601.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false" removenativecore="false"/><!-- [JBWS-2505][JBWS-2895] --> </target> <!-- ================================================================== --> Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/src/main/distro/build.xml 2010-02-18 17:56:46 UTC (rev 11619) @@ -96,6 +96,7 @@ <target name="tests-jars" depends="tests-compile,tests-copy-resources"> <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> + <ant antfile="${tests.dir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> </target> <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2010-02-18 17:55:28 UTC (rev 11618) +++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2010-02-18 17:56:46 UTC (rev 11619) @@ -99,11 +99,13 @@ <includes> <include>ant-import/**</include> <include>java/org/jboss/test/ws/console/**</include> + <include>java/org/jboss/test/ws/jaxrpc/samples/**</include> <include>java/org/jboss/test/ws/jaxws/samples/**</include> <include>java/org/jboss/test/ws/jaxws/smoke/**</include> <include>java/org/jboss/test/ws/management/**</include> <include>java/org/jboss/test/ws/projectGenerator/**</include> <include>resources/console/**</include> + <include>resources/jaxrpc/samples/**</include> <include>resources/jaxws/samples/**</include> <include>resources/jaxws/smoke/**</include> <include>resources/management/**</include>