JBossWS SVN: r11620 - in stack/metro/trunk: modules/resources/src/main/resources/resources and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-02-18 12:57:39 -0500 (Thu, 18 Feb 2010)
New Revision: 11620
Added:
stack/metro/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml
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/jbossws-deploy-macros.xml
stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as6.xml
stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/metro/trunk/pom.xml
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build.xml
stack/metro/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/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-02-18 17:57:39 UTC (rev 11620)
@@ -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/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-02-18 17:57:39 UTC (rev 11620)
@@ -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/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
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-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-02-18 17:57:39 UTC (rev 11620)
@@ -27,6 +27,7 @@
<include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
<include name="**/jaxb-xjc.jar"/>
+ <include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-tools.jar"/>
<include name="**/jaxws-rt.jar"/>
<include name="**/jaxws-api.jar"/>
@@ -253,6 +254,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="@{artifactsdir}/resources/jbossws-jaxrpc-(a){jbossid}/jbossws.beans">
+ <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">
@@ -285,7 +299,19 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
+ <target name="deploy-jbossws-metro-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 -->
<!-- ================================================================== -->
@@ -294,6 +320,8 @@
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
<attribute name="modifyjbossintegration"/>
+ <attribute name="removenativecore"/>
+
<sequential>
<loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deploy/jbossws.sar/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/>
@@ -319,6 +347,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>
@@ -336,6 +373,17 @@
</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">
<and>
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-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-02-18 17:57:39 UTC (rev 11620)
@@ -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/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2010-02-18 17:57:39 UTC (rev 11620)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2010, 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.
*
@@ -21,28 +21,28 @@
*/
package org.jboss.wsf.stack.metro;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.ws.BindingType;
+import javax.xml.ws.soap.SOAPBinding;
+
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSConstants;
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.stack.metro.metadata.RuntimeModelDeploymentAspect;
import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoint;
import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoints;
-import org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.soap.SOAPBinding;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* An aspect that generates sun-jaxws.xml
*
* @author Thomas.Diesler(a)jboss.org
* @since 10-May-2007
*/
-public class SunJaxwsDeploymentAspect extends DeploymentAspect
+public class SunJaxwsDeploymentAspect extends AbstractDeploymentAspect
{
@Override
@SuppressWarnings("unchecked")
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2010-02-18 17:57:39 UTC (rev 11620)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2010, 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.
*
@@ -21,22 +21,22 @@
*/
package org.jboss.wsf.stack.metro.metadata;
-import com.sun.xml.ws.api.server.BoundEndpoint;
-import com.sun.xml.ws.api.server.Container;
-import com.sun.xml.ws.api.server.Module;
-import com.sun.xml.ws.api.server.ResourceInjector;
-import com.sun.xml.ws.api.server.ServerPipelineHook;
-import com.sun.xml.ws.transport.http.DeploymentDescriptorParser;
-import com.sun.xml.ws.transport.http.ResourceLoader;
-import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
-import com.sun.xml.ws.transport.http.servlet.ServletAdapterList;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.ServletContext;
+import javax.xml.ws.WebServiceException;
+
import org.jboss.logging.Logger;
import org.jboss.wsf.common.ResourceLoaderAdapter;
+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.UnifiedVirtualFile;
import org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt;
@@ -44,14 +44,15 @@
import org.jboss.wsf.stack.metro.MessageStreamAdapter;
import org.jboss.wsf.stack.metro.log.MessageLogPipelineHook;
-import javax.xml.ws.WebServiceException;
-import javax.servlet.ServletContext;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
+import com.sun.xml.ws.api.server.BoundEndpoint;
+import com.sun.xml.ws.api.server.Container;
+import com.sun.xml.ws.api.server.Module;
+import com.sun.xml.ws.api.server.ResourceInjector;
+import com.sun.xml.ws.api.server.ServerPipelineHook;
+import com.sun.xml.ws.transport.http.DeploymentDescriptorParser;
+import com.sun.xml.ws.transport.http.ResourceLoader;
+import com.sun.xml.ws.transport.http.servlet.ServletAdapter;
+import com.sun.xml.ws.transport.http.servlet.ServletAdapterList;
/**
* Creates a Metro runtime model and associates it with the deployment.
@@ -67,7 +68,7 @@
*
* @author Heiko.Braun(a)jboss.com
*/
-public class RuntimeModelDeploymentAspect extends DeploymentAspect
+public class RuntimeModelDeploymentAspect extends AbstractDeploymentAspect
{
private static final org.jboss.logging.Logger log = Logger.getLogger(RuntimeModelDeploymentAspect.class);
protected static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml";
Copied: stack/metro/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml (from rev 11608, stack/metro/branches/jaxrpc-cxf/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml)
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml (rev 0)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml 2010-02-18 17:57:39 UTC (rev 11620)
@@ -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/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as6.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as6.xml 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as6.xml 2010-02-18 17:57:39 UTC (rev 11620)
@@ -36,11 +36,13 @@
</entry>
</map>
</property>
+ <property name="forJaxRpc">false</property>
</bean>
<bean name="WSMetroEndpointHandlerDeploymentAspect" 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="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
@@ -53,16 +55,19 @@
<inject bean="WSLogRecorder"/>
</list>
</property>
+ <property name="forJaxRpc">false</property>
</bean>
<bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">StackDescriptor</property>
+ <property name="forJaxRpc">false</property>
</bean>
<bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
<property name="requires">StackDescriptor</property>
<property name="provides">RuntimeModel</property>
+ <property name="forJaxRpc">false</property>
</bean>
</deployment>
Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2010-02-18 17:57:39 UTC (rev 11620)
@@ -36,6 +36,10 @@
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>
</project>
Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2010-02-18 17:57:39 UTC (rev 11620)
@@ -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/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2010-02-18 17:57:39 UTC (rev 11620)
@@ -378,6 +378,9 @@
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.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>
@@ -440,6 +443,9 @@
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.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>
@@ -502,6 +508,9 @@
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.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>
@@ -564,6 +573,9 @@
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.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/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-02-18 17:57:39 UTC (rev 11620)
@@ -56,3 +56,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/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-02-18 17:57:39 UTC (rev 11620)
@@ -56,3 +56,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/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-02-18 17:57:39 UTC (rev 11620)
@@ -56,3 +56,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/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/pom.xml 2010-02-18 17:57:39 UTC (rev 11620)
@@ -47,8 +47,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/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2010-02-18 17:57:39 UTC (rev 11620)
@@ -48,7 +48,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>
<!-- ================================================================== -->
@@ -88,7 +88,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>
<!-- ================================================================== -->
@@ -128,7 +128,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] -->
</target>
<!-- ================================================================== -->
@@ -137,7 +137,7 @@
<target name="deploy-structure-jboss601" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-metro" inheritall="false">
+ <antcall target="deploy-jbossws-metro-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}"/>
@@ -168,7 +168,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] -->
</target>
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/src/main/distro/build.xml 2010-02-18 17:57:39 UTC (rev 11620)
@@ -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/metro/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2010-02-18 17:56:46 UTC (rev 11619)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2010-02-18 17:57:39 UTC (rev 11620)
@@ -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>
14 years, 3 months
- 1
- 0
JBossWS SVN: r11619 - in stack/cxf/trunk: modules/resources/src/main/resources/resources and 7 other directories.
by jbossws-commits＠lists.jboss.org
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="@{artifactsdir}/resources/jbossws-jaxrpc-(a){jbossid}/jbossws.beans">
+ <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="@{targetdir}/deploy/jbossws.sar/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" 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>
14 years, 3 months
- 1
- 0
JBossWS SVN: r11618 - in stack/native/trunk: modules and 15 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-02-18 12:55:28 -0500 (Thu, 18 Feb 2010)
New Revision: 11618
Added:
stack/native/trunk/modules/core/src/main/resources/META-INF/services/javax.xml.rpc.ServiceFactory
stack/native/trunk/modules/services/
stack/native/trunk/modules/services/pom.xml
stack/native/trunk/modules/services/src/
stack/native/trunk/modules/services/src/main/
stack/native/trunk/modules/services/src/main/resources/
stack/native/trunk/modules/services/src/main/resources/META-INF/
stack/native/trunk/modules/services/src/main/resources/META-INF/services/
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
Removed:
stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory
stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator
stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory
stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory
stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
stack/native/trunk/modules/services/pom.xml
stack/native/trunk/modules/services/src/
stack/native/trunk/modules/services/src/main/
stack/native/trunk/modules/services/src/main/resources/
stack/native/trunk/modules/services/src/main/resources/META-INF/
stack/native/trunk/modules/services/src/main/resources/META-INF/services/
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
Modified:
stack/native/trunk/modules/client/pom.xml
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
stack/native/trunk/modules/testsuite/framework-tests/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/src/main/distro/build-deploy.xml
stack/native/trunk/src/main/distro/build-project-gen.xml
stack/native/trunk/src/main/distro/build.xml
stack/native/trunk/src/main/scripts/assembly-bin-dist.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2895] Merging from jaxrpc-cxf branch, adding support for JAXRPC with CXF and Metro stack
Modified: stack/native/trunk/modules/client/pom.xml
===================================================================
--- stack/native/trunk/modules/client/pom.xml 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/client/pom.xml 2010-02-18 17:55:28 UTC (rev 11618)
@@ -21,6 +21,16 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-factories</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-services</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxrpc-api</artifactId>
</dependency>
@@ -41,7 +51,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jbossxb.jar netty.jar wscommons-policy.jar stax-api.jar wsdl4j.jar</Class-Path>
+ <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-factories.jar jbossws-native-services.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jbossxb.jar netty.jar wscommons-policy.jar stax-api.jar wsdl4j.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2010-02-18 17:55:28 UTC (rev 11618)
@@ -23,9 +23,9 @@
import org.jboss.ws.extensions.wsrm.common.RMHelper;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+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.invocation.InvocationHandler;
@@ -36,7 +36,7 @@
*
* @since Dec 11, 2007
*/
-public final class RMDeploymentAspect extends DeploymentAspect
+public final class RMDeploymentAspect extends AbstractDeploymentAspect
{
@Override
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2010-02-18 17:55:28 UTC (rev 11618)
@@ -22,7 +22,7 @@
package org.jboss.wsf.stack.jbws;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
/**
@@ -31,7 +31,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class EagerInitializeDeploymentAspect extends DeploymentAspect
+public class EagerInitializeDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public void start(Deployment dep)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2010-02-18 17:55:28 UTC (rev 11618)
@@ -27,7 +27,7 @@
import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerFactory;
import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -38,7 +38,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class EventingDeploymentAspect extends DeploymentAspect
+public class EventingDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public void start(Deployment dep)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2010-02-18 17:55:28 UTC (rev 11618)
@@ -24,9 +24,9 @@
import java.io.IOException;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+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.WSFDeploymentException;
/**
@@ -35,7 +35,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class PublishContractDeploymentAspect extends DeploymentAspect
+public class PublishContractDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public void start(Deployment dep)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2010-02-18 17:55:28 UTC (rev 11618)
@@ -23,7 +23,7 @@
import org.jboss.ws.core.server.ServiceEndpointInvoker;
import org.jboss.ws.core.server.ServiceEndpointInvokerEJB21;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
@@ -34,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class ServiceEndpointInvokerDeploymentAspect extends DeploymentAspect
+public class ServiceEndpointInvokerDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public void start(Deployment dep)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2010-02-18 17:55:28 UTC (rev 11618)
@@ -28,9 +28,9 @@
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+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.Deployment.DeploymentType;
@@ -40,7 +40,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class UnifiedMetaDataDeploymentAspect extends DeploymentAspect
+public class UnifiedMetaDataDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public void start(Deployment dep)
Copied: stack/native/trunk/modules/core/src/main/resources/META-INF/services/javax.xml.rpc.ServiceFactory (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/core/src/main/resources/META-INF/services/javax.xml.rpc.ServiceFactory)
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/services/javax.xml.rpc.ServiceFactory (rev 0)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/javax.xml.rpc.ServiceFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -0,0 +1 @@
+org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl
\ No newline at end of file
Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.ws.extensions.addressing.map.NativeMAPBuilderFactory
\ No newline at end of file
Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.wsf.framework.DeploymentAspectManagerLocatorImpl
\ No newline at end of file
Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl
\ No newline at end of file
Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.jbws.WebServiceContextFactoryImpl
\ No newline at end of file
Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.jbws.NativeStackConfigFactory
\ No newline at end of file
Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.ws.core.client.ServiceRefBinderFactoryImpl
\ No newline at end of file
Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2010-02-18 17:55:28 UTC (rev 11618)
@@ -58,6 +58,7 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossxb.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-services.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2010-02-18 17:55:28 UTC (rev 11618)
@@ -82,6 +82,7 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossxb.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-services.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-02-18 17:55:28 UTC (rev 11618)
@@ -56,6 +56,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-services.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wscommons-policy.jar
Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-02-18 17:55:28 UTC (rev 11618)
@@ -80,6 +80,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-services.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/wscommons-policy.jar"
Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-02-18 17:55:28 UTC (rev 11618)
@@ -57,6 +57,7 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-services.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
Modified: stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-02-18 17:55:28 UTC (rev 11618)
@@ -77,6 +77,7 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-common.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-services.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-02-18 17:55:28 UTC (rev 11618)
@@ -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/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api!
.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jbossws-native-factories.jar server/all/deployers/jbossws.deployer/jbossws-native-services.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/wscommons-policy.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jb!
ossws.deployer/xmlsec.jar server/all/deployers/jbossws.deploye!
r/META-I
NF/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/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-02-18 17:55:28 UTC (rev 11618)
@@ -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/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/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/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-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-02-18 17:55:28 UTC (rev 11618)
@@ -40,6 +40,7 @@
<include name="**/jbossws-framework.jar"/>
<include name="**/jbossws-native-client.jar"/>
<include name="**/jbossws-native-core.jar"/>
+ <include name="**/jbossws-native-services.jar"/>
<include name="**/jbossws-spi.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/saaj-api.jar"/>
@@ -68,7 +69,9 @@
<include name="**/jsr181-api.jar"/>
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-native-core.jar"/>
<include name="**/jaxrpc-api.jar"/>
+ <include name="**/netty.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/jbossws-spi.jar"/>
</patternset>
@@ -77,6 +80,8 @@
<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"/>
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-02-18 17:55:28 UTC (rev 11618)
@@ -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/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api!
.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jbossws-native-factories.jar server/standard/deployers/jbossws.deployer/jbossws-native-services.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/wscommons-policy.jar server/standard/deployers/jbossws.deployer/policy.jar server/stand!
ard/deployers/jbossws.deployer/wsdl4j.jar server/standard/depl!
oyers/jb
ossws.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
Copied: stack/native/trunk/modules/services (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services)
Property changes on: stack/native/trunk/modules/services
___________________________________________________________________
Name: svn:ignore
+ target
Deleted: stack/native/trunk/modules/services/pom.xml
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/services/pom.xml 2010-02-17 17:00:39 UTC (rev 11607)
+++ stack/native/trunk/modules/services/pom.xml 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1,16 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Framework services configuration</name>
- <artifactId>jbossws-native-services</artifactId>
- <packaging>jar</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
-</project>
Copied: stack/native/trunk/modules/services/pom.xml (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/pom.xml)
===================================================================
--- stack/native/trunk/modules/services/pom.xml (rev 0)
+++ stack/native/trunk/modules/services/pom.xml 2010-02-18 17:55:28 UTC (rev 11618)
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Framework services configuration</name>
+ <artifactId>jbossws-native-services</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+</project>
Copied: stack/native/trunk/modules/services/src (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/src)
Copied: stack/native/trunk/modules/services/src/main (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/src/main)
Copied: stack/native/trunk/modules/services/src/main/resources (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources)
Copied: stack/native/trunk/modules/services/src/main/resources/META-INF (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF)
Copied: stack/native/trunk/modules/services/src/main/resources/META-INF/services (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services)
Deleted: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory 2010-02-17 17:00:39 UTC (rev 11607)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.ws.extensions.addressing.map.NativeMAPBuilderFactory
\ No newline at end of file
Copied: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory)
===================================================================
--- stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory (rev 0)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.common.addressing.MAPBuilderFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -0,0 +1 @@
+org.jboss.ws.extensions.addressing.map.NativeMAPBuilderFactory
\ No newline at end of file
Deleted: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator 2010-02-17 17:00:39 UTC (rev 11607)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.wsf.framework.DeploymentAspectManagerLocatorImpl
\ No newline at end of file
Copied: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator)
===================================================================
--- stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator (rev 0)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator 2010-02-18 17:55:28 UTC (rev 11618)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.DeploymentAspectManagerLocatorImpl
\ No newline at end of file
Deleted: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2010-02-17 17:00:39 UTC (rev 11607)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl
\ No newline at end of file
Copied: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory)
===================================================================
--- stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (rev 0)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl
\ No newline at end of file
Deleted: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2010-02-17 17:00:39 UTC (rev 11607)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.jbws.WebServiceContextFactoryImpl
\ No newline at end of file
Copied: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory)
===================================================================
--- stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.jbws.WebServiceContextFactoryImpl
\ No newline at end of file
Deleted: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory 2010-02-17 17:00:39 UTC (rev 11607)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.wsf.stack.jbws.NativeStackConfigFactory
\ No newline at end of file
Copied: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory)
===================================================================
--- stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory (rev 0)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.jbws.NativeStackConfigFactory
\ No newline at end of file
Deleted: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
===================================================================
--- stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2010-02-17 17:00:39 UTC (rev 11607)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -1 +0,0 @@
-org.jboss.ws.core.client.ServiceRefBinderFactoryImpl
\ No newline at end of file
Copied: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (from rev 11607, stack/native/branches/jaxrpc-cxf/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory)
===================================================================
--- stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (rev 0)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2010-02-18 17:55:28 UTC (rev 11618)
@@ -0,0 +1 @@
+org.jboss.ws.core.client.ServiceRefBinderFactoryImpl
\ No newline at end of file
Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-02-18 17:55:28 UTC (rev 11618)
@@ -111,6 +111,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/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/pom.xml 2010-02-18 17:55:28 UTC (rev 11618)
@@ -40,6 +40,7 @@
<module>modules/client</module>
<module>modules/management</module>
<module>modules/resources</module>
+ <module>modules/services</module>
</modules>
<!-- Properties -->
@@ -47,8 +48,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/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2010-02-18 17:55:28 UTC (rev 11618)
@@ -167,10 +167,20 @@
<!-- Create jbossws-deploy.conf -->
<!-- ================================================================== -->
+ <patternset id="jbossws.deploy.conf.exclude.patternset">
+ <exclude name="**/juddi-service.sar/**"/>
+ <exclude name="**/client/jbossws-native-core.jar"/>
+ <exclude name="**/client/netty.jar"/>
+ <exclude name="**/common/lib/jbossws-native-core.jar"/>
+ <exclude name="**/common/lib/netty.jar"/>
+ </patternset>
+
<macrodef name="macro-create-deploy-conf">
<attribute name="deploystructure"/>
<sequential>
- <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/juddi-service.sar/**"/>
+ <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}">
+ <patternset refid="jbossws.deploy.conf.exclude.patternset"/>
+ </fileset>
<property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
<property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
<echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/>
Modified: stack/native/trunk/src/main/distro/build-project-gen.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-project-gen.xml 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/src/main/distro/build-project-gen.xml 2010-02-18 17:55:28 UTC (rev 11618)
@@ -115,6 +115,7 @@
<pathelement location="${jboss.client}/saaj-api.jar"/>
<pathelement location="${jboss.client}/jbossws-native-factories.jar"/>
<pathelement location="${jboss.client}/jbossws-native-core.jar"/>
+ <pathelement location="${jboss.client}/jbossws-native-services.jar"/>
<pathelement location="${jboss.client}/jbossws-native-client.jar"/>
<path refid="integration.target.javac.classpath" />
</path>
Modified: stack/native/trunk/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/src/main/distro/build.xml 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/src/main/distro/build.xml 2010-02-18 17:55:28 UTC (rev 11618)
@@ -99,6 +99,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/native/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2010-02-18 17:55:28 UTC (rev 11618)
@@ -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>
@@ -116,4 +118,4 @@
</moduleSet>
</moduleSets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-02-18 17:52:37 UTC (rev 11617)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-02-18 17:55:28 UTC (rev 11618)
@@ -17,6 +17,16 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.ws.native:jbossws-native-factories:jar</include>
+ <include>org.jboss.ws.native:jbossws-native-services:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
</binaries>
</moduleSet>
<moduleSet>
@@ -44,7 +54,6 @@
<include>org.jboss.ws:jbossws-common:jar</include>
<include>org.jboss.ws:jbossws-spi:jar</include>
<include>javax.xml:jaxrpc-api:jar</include>
- <include>org.jboss.ws.native:jbossws-native-factories:jar</include>
<include>javax.xml.soap:saaj-api:jar</include>
<include>org.codehaus.jettison:jettison:jar</include>
<include>com.sun.xml.ws:policy:jar</include>
14 years, 3 months
- 1
- 0
JBossWS SVN: r11616 - in common/trunk/src/main/java/org/jboss: wsf/common/integration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-02-18 12:38:24 -0500 (Thu, 18 Feb 2010)
New Revision: 11616
Added:
common/trunk/src/main/java/org/jboss/ws/core/utils/SecurityActions.java
common/trunk/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java
common/trunk/src/main/java/org/jboss/wsf/common/integration/SecurityActions.java
Modified:
common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
Log:
[JBWS-2895] Merging from jaxrpc-cxf branch, adding support for JAXRPC with CXF and Metro stack
Modified: common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2010-02-18 17:35:11 UTC (rev 11615)
+++ common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2010-02-18 17:38:24 UTC (rev 11616)
@@ -66,7 +66,7 @@
super();
Properties props = null;
- ClassLoader loader = this.getClass().getClassLoader();
+ ClassLoader loader = SecurityActions.getContextClassLoader();
Map<String, Properties> map = propertiesMap.get(loader);
if (map != null && map.containsKey(entitiesResource))
{
@@ -80,7 +80,7 @@
propertiesMap.put(loader, map);
}
// load entities
- props = loadEntitiesMappingFromClasspath(entitiesResource);
+ props = loadEntitiesMappingFromClasspath(entitiesResource, loader);
if (props.size() == 0)
throw new IllegalArgumentException("No entities mapping defined in resource file: " + entitiesResource);
map.put(entitiesResource, props);
@@ -97,13 +97,13 @@
}
}
- private Properties loadEntitiesMappingFromClasspath(final String entitiesResource)
+ private Properties loadEntitiesMappingFromClasspath(final String entitiesResource, final ClassLoader classLoader)
{
return AccessController.doPrivileged(new PrivilegedAction<Properties>()
{
public Properties run()
{
- InputStream is = this.getClass().getClassLoader().getResourceAsStream(entitiesResource);
+ InputStream is = classLoader.getResourceAsStream(entitiesResource);
// get stream
if (is == null)
throw new IllegalArgumentException("Resource " + entitiesResource + " not found");
Copied: common/trunk/src/main/java/org/jboss/ws/core/utils/SecurityActions.java (from rev 11607, common/branches/jaxrpc-cxf/src/main/java/org/jboss/ws/core/utils/SecurityActions.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/core/utils/SecurityActions.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/ws/core/utils/SecurityActions.java 2010-02-18 17:38:24 UTC (rev 11616)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.ws.core.utils;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 17-Feb-2010
+ *
+ */
+class SecurityActions
+{
+ /**
+ * Get context classloader.
+ *
+ * @return the current context classloader
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+
+ /**
+ * Set context classloader.
+ *
+ * @param classLoader the classloader
+ */
+ static void setContextClassLoader(final ClassLoader classLoader)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+ else
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ }
+ }
+
+}
Copied: common/trunk/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java (from rev 11607, common/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java 2010-02-18 17:38:24 UTC (rev 11616)
@@ -0,0 +1,160 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.common.integration;
+
+import java.lang.ref.WeakReference;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+
+/**
+ * Abstract deployment aspect every other one extends
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 21-Jan-2010
+ *
+ */
+public class AbstractDeploymentAspect implements DeploymentAspect
+{
+ // provide logging
+ protected final Logger log = Logger.getLogger(getClass());
+
+ private String provides;
+ private String requires;
+ private int relativeOrder;
+ private boolean isLast;
+ private boolean isForJaxWs = true;
+ private boolean isForJaxRpc = true;
+ private WeakReference<ClassLoader> loader;
+
+ public AbstractDeploymentAspect()
+ {
+ this.loader = new WeakReference<ClassLoader>(SecurityActions.getContextClassLoader());
+ }
+
+ public ClassLoader getLoader()
+ {
+ return loader != null ? loader.get() : null;
+ }
+
+ public void setLast(boolean isLast)
+ {
+ this.isLast = isLast;
+ }
+
+ public boolean isLast()
+ {
+ return this.isLast;
+ }
+
+ public String getProvides()
+ {
+ return provides;
+ }
+
+ public void setProvides(String provides)
+ {
+ this.provides = provides;
+ }
+
+ public String getRequires()
+ {
+ return requires;
+ }
+
+ public void setRequires(String requires)
+ {
+ this.requires = requires;
+ }
+
+ public void setRelativeOrder(int relativeOrder)
+ {
+ this.relativeOrder = relativeOrder;
+ }
+
+ public int getRelativeOrder()
+ {
+ return this.relativeOrder;
+ }
+
+ public void start(Deployment dep)
+ {
+ }
+
+ public void stop(Deployment dep)
+ {
+ }
+
+ public Set<String> getProvidesAsSet()
+ {
+ Set<String> condset = new HashSet<String>();
+ if (provides != null)
+ {
+ StringTokenizer st = new StringTokenizer(provides, ", \r\n\t");
+ while (st.hasMoreTokens())
+ condset.add(st.nextToken());
+ }
+ return condset;
+ }
+
+ public Set<String> getRequiresAsSet()
+ {
+ Set<String> condset = new HashSet<String>();
+ if (requires != null)
+ {
+ StringTokenizer st = new StringTokenizer(requires, ", \r\n\t");
+ while (st.hasMoreTokens())
+ condset.add(st.nextToken());
+ }
+ return condset;
+ }
+
+ public boolean canHandle(Deployment dep)
+ {
+ return (this.isForJaxWs && WSHelper.isJaxwsDeployment(dep) ||
+ this.isForJaxRpc && WSHelper.isJaxrpcDeployment(dep));
+ }
+
+ public boolean isForJaxWs()
+ {
+ return isForJaxWs;
+ }
+
+ public void setForJaxWs(boolean isForJaxWs)
+ {
+ this.isForJaxWs = isForJaxWs;
+ }
+
+ public boolean isForJaxRpc()
+ {
+ return isForJaxRpc;
+ }
+
+ public void setForJaxRpc(boolean isForJaxRpc)
+ {
+ this.isForJaxRpc = isForJaxRpc;
+ }
+}
Copied: common/trunk/src/main/java/org/jboss/wsf/common/integration/SecurityActions.java (from rev 11607, common/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/common/integration/SecurityActions.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/integration/SecurityActions.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/integration/SecurityActions.java 2010-02-18 17:38:24 UTC (rev 11616)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.common.integration;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 17-Feb-2010
+ *
+ */
+class SecurityActions
+{
+ /**
+ * Get context classloader.
+ *
+ * @return the current context classloader
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+
+ /**
+ * Set context classloader.
+ *
+ * @param classLoader the classloader
+ */
+ static void setContextClassLoader(final ClassLoader classLoader)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+ else
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ }
+ }
+
+}
14 years, 3 months
- 1
- 0
JBossWS SVN: r11615 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-02-18 12:35:11 -0500 (Thu, 18 Feb 2010)
New Revision: 11615
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
Log:
[JBWS-2895] Merging from jaxrpc-cxf branch, adding support for JAXRPC with CXF and Metro stack
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2010-02-18 15:53:51 UTC (rev 11614)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2010-02-18 17:35:11 UTC (rev 11615)
@@ -21,12 +21,8 @@
*/
package org.jboss.wsf.spi.deployment;
-import java.util.HashSet;
import java.util.Set;
-import java.util.StringTokenizer;
-import org.jboss.logging.Logger;
-
/**
* A deployment aspect that does nothing.
*
@@ -36,87 +32,43 @@
* @author Thomas.Diesler(a)jboss.com
* @since 20-Apr-2007
*/
-public abstract class DeploymentAspect
+public interface DeploymentAspect
{
- // provide logging
- protected final Logger log = Logger.getLogger(getClass());
-
public static final String LAST_DEPLOYMENT_ASPECT = "LAST_DEPLOYMENT_ASPECT";
- private String provides;
- private String requires;
- private int relativeOrder;
- private boolean isLast;
+ public void setLast(boolean isLast);
- public void setLast(boolean isLast)
- {
- this.isLast = isLast;
- }
+ public boolean isLast();
- public boolean isLast()
- {
- return this.isLast;
- }
-
- public String getProvides()
- {
- return provides;
- }
+ public String getProvides();
- public void setProvides(String provides)
- {
- this.provides = provides;
- }
+ public void setProvides(String provides);
- public String getRequires()
- {
- return requires;
- }
+ public String getRequires();
- public void setRequires(String requires)
- {
- this.requires = requires;
- }
+ public void setRequires(String requires);
- public void setRelativeOrder(int relativeOrder)
- {
- this.relativeOrder = relativeOrder;
- }
+ public void setRelativeOrder(int relativeOrder);
- public int getRelativeOrder()
- {
- return this.relativeOrder;
- }
+ public int getRelativeOrder();
- public void start(Deployment dep)
- {
- }
+ public void start(Deployment dep);
- public void stop(Deployment dep)
- {
- }
+ public void stop(Deployment dep);
- public Set<String> getProvidesAsSet()
- {
- Set<String> condset = new HashSet<String>();
- if (provides != null)
- {
- StringTokenizer st = new StringTokenizer(provides, ", \r\n\t");
- while (st.hasMoreTokens())
- condset.add(st.nextToken());
- }
- return condset;
- }
+ public Set<String> getProvidesAsSet();
- public Set<String> getRequiresAsSet()
- {
- Set<String> condset = new HashSet<String>();
- if (requires != null)
- {
- StringTokenizer st = new StringTokenizer(requires, ", \r\n\t");
- while (st.hasMoreTokens())
- condset.add(st.nextToken());
- }
- return condset;
- }
+ public Set<String> getRequiresAsSet();
+
+ public boolean canHandle(Deployment dep);
+
+ public boolean isForJaxWs();
+
+ public void setForJaxWs(boolean isForJaxWs);
+
+ public boolean isForJaxRpc();
+
+ public void setForJaxRpc(boolean isForJaxRpc);
+
+ public ClassLoader getLoader();
}
14 years, 3 months
- 1
- 0
JBossWS SVN: r11614 - in container/jboss50/branches/jbossws-jboss501: src/main/java/org/jboss/webservices/integration/injection and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-02-18 10:53:51 -0500 (Thu, 18 Feb 2010)
New Revision: 11614
Modified:
container/jboss50/branches/jbossws-jboss501/pom.xml
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
Log:
[JBWS-2895] Updating AS 5.0.1 container integration to new spi
Modified: container/jboss50/branches/jbossws-jboss501/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/pom.xml 2010-02-18 15:34:02 UTC (rev 11613)
+++ container/jboss50/branches/jbossws-jboss501/pom.xml 2010-02-18 15:53:51 UTC (rev 11614)
@@ -6,26 +6,26 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501</artifactId>
- <version>3.2.1.GA</version>
+ <version>3.3.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.3.GA</version>
+ <version>1.0.4.GA</version>
</parent>
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss50/tags/jbo...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss50/tags/jbossw...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/tags/jbossws-j...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss50/branches...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss50/branches/jb...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/branches/jboss...</url>
</scm>
<!-- Properties -->
<properties>
- <jbossws.common.version>1.2.1.GA</jbossws.common.version>
- <jbossws.spi.version>1.2.1.GA</jbossws.spi.version>
+ <jbossws.common.version>1.3.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>1.3.0-SNAPSHOT</jbossws.spi.version>
<!--
JBoss component versions taken from
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2010-02-18 15:34:02 UTC (rev 11613)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2010-02-18 15:53:51 UTC (rev 11614)
@@ -44,9 +44,9 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.wsf.common.injection.resolvers.ResourceReferenceResolver;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSHelper;
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.integration.WebServiceDeclaration;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
@@ -59,7 +59,7 @@
*
* @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
*/
-public final class InjectionMetaDataDeploymentAspect extends DeploymentAspect
+public final class InjectionMetaDataDeploymentAspect extends AbstractDeploymentAspect
{
/** EJB 3 JNDI prefix. */
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2010-02-18 15:34:02 UTC (rev 11613)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2010-02-18 15:53:51 UTC (rev 11614)
@@ -21,9 +21,9 @@
*/
package org.jboss.webservices.integration.metadata;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
@@ -33,7 +33,7 @@
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
-public final class ContainerMetaDataDeploymentAspect extends DeploymentAspect
+public final class ContainerMetaDataDeploymentAspect extends AbstractDeploymentAspect
{
/** JSE meta data builder. */
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2010-02-18 15:34:02 UTC (rev 11613)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2010-02-18 15:53:51 UTC (rev 11614)
@@ -26,9 +26,9 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.web.WebPermissionMapping;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
/**
* Generates JACC permissions. (This is temporary and really hacky solution).
@@ -39,7 +39,7 @@
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
-public final class JACCPermissionsDeploymentAspect extends DeploymentAspect
+public final class JACCPermissionsDeploymentAspect extends AbstractDeploymentAspect
{
/**
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2010-02-18 15:34:02 UTC (rev 11613)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2010-02-18 15:53:51 UTC (rev 11614)
@@ -21,9 +21,9 @@
*/
package org.jboss.webservices.integration.tomcat;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
/**
* A deployment aspect that generates web app meta data for EJB endpoints.
@@ -31,7 +31,7 @@
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
-public final class WebMetaDataCreatingDeploymentAspect extends DeploymentAspect
+public final class WebMetaDataCreatingDeploymentAspect extends AbstractDeploymentAspect
{
/** Web meta data creator. */
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2010-02-18 15:34:02 UTC (rev 11613)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2010-02-18 15:53:51 UTC (rev 11614)
@@ -21,8 +21,8 @@
*/
package org.jboss.webservices.integration.tomcat;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
/**
* Modifies web meta data to configure webservice stack endpoints and properties.
@@ -30,7 +30,7 @@
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
-public final class WebMetaDataModifyingDeploymentAspect extends DeploymentAspect
+public final class WebMetaDataModifyingDeploymentAspect extends AbstractDeploymentAspect
{
/** Web meta data modifier. */
14 years, 3 months
- 1
- 0
JBossWS SVN: r11613 - container/jboss50/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-02-18 10:34:02 -0500 (Thu, 18 Feb 2010)
New Revision: 11613
Added:
container/jboss50/branches/jbossws-jboss501/
Log:
[JBWS-2995] creating container integration branch for AS 5.0.1 from 3.2.1.GA tag
Copied: container/jboss50/branches/jbossws-jboss501 (from rev 11612, container/jboss50/tags/jbossws-jboss501-3.2.1.GA)
14 years, 3 months
- 1
- 0
JBossWS SVN: r11612 - in container/jboss50/branches/jbossws-jboss510: src/main/java/org/jboss/webservices/integration/injection and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-02-18 10:28:16 -0500 (Thu, 18 Feb 2010)
New Revision: 11612
Modified:
container/jboss50/branches/jbossws-jboss510/pom.xml
container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
Log:
[JBWS-2895] Updating AS 5.1.0 container integration to new spi
Modified: container/jboss50/branches/jbossws-jboss510/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss510/pom.xml 2010-02-18 14:48:32 UTC (rev 11611)
+++ container/jboss50/branches/jbossws-jboss510/pom.xml 2010-02-18 15:28:16 UTC (rev 11612)
@@ -6,26 +6,26 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510</artifactId>
- <version>3.2.1.GA</version>
+ <version>3.3.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.3.GA</version>
+ <version>1.0.4.GA</version>
</parent>
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss50/tags/jbo...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss50/tags/jbossw...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/tags/jbossws-j...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jboss50/branches...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/jboss50/branches/jb...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/branches/jboss...</url>
</scm>
<!-- Properties -->
<properties>
- <jbossws.common.version>1.2.1.GA</jbossws.common.version>
- <jbossws.spi.version>1.2.1.GA</jbossws.spi.version>
+ <jbossws.common.version>1.3.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>1.3.0-SNAPSHOT</jbossws.spi.version>
<!--
JBoss component versions taken from
Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2010-02-18 14:48:32 UTC (rev 11611)
+++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2010-02-18 15:28:16 UTC (rev 11612)
@@ -44,9 +44,9 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.wsf.common.injection.resolvers.ResourceReferenceResolver;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSHelper;
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.integration.WebServiceDeclaration;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
@@ -59,7 +59,7 @@
*
* @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
*/
-public final class InjectionMetaDataDeploymentAspect extends DeploymentAspect
+public final class InjectionMetaDataDeploymentAspect extends AbstractDeploymentAspect
{
/** EJB 3 JNDI prefix. */
Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2010-02-18 14:48:32 UTC (rev 11611)
+++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2010-02-18 15:28:16 UTC (rev 11612)
@@ -21,9 +21,9 @@
*/
package org.jboss.webservices.integration.metadata;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
@@ -33,7 +33,7 @@
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
-public final class ContainerMetaDataDeploymentAspect extends DeploymentAspect
+public final class ContainerMetaDataDeploymentAspect extends AbstractDeploymentAspect
{
/** JSE meta data builder. */
Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2010-02-18 14:48:32 UTC (rev 11611)
+++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2010-02-18 15:28:16 UTC (rev 11612)
@@ -26,9 +26,9 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.web.WebPermissionMapping;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
/**
* Generates JACC permissions. (This is temporary and really hacky solution).
@@ -39,7 +39,7 @@
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
-public final class JACCPermissionsDeploymentAspect extends DeploymentAspect
+public final class JACCPermissionsDeploymentAspect extends AbstractDeploymentAspect
{
/**
Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2010-02-18 14:48:32 UTC (rev 11611)
+++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2010-02-18 15:28:16 UTC (rev 11612)
@@ -21,9 +21,9 @@
*/
package org.jboss.webservices.integration.tomcat;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
/**
* A deployment aspect that generates web app meta data for EJB endpoints.
@@ -31,7 +31,7 @@
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
-public final class WebMetaDataCreatingDeploymentAspect extends DeploymentAspect
+public final class WebMetaDataCreatingDeploymentAspect extends AbstractDeploymentAspect
{
/** Web meta data creator. */
Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2010-02-18 14:48:32 UTC (rev 11611)
+++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2010-02-18 15:28:16 UTC (rev 11612)
@@ -21,8 +21,8 @@
*/
package org.jboss.webservices.integration.tomcat;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
/**
* Modifies web meta data to configure webservice stack endpoints and properties.
@@ -30,7 +30,7 @@
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
*/
-public final class WebMetaDataModifyingDeploymentAspect extends DeploymentAspect
+public final class WebMetaDataModifyingDeploymentAspect extends AbstractDeploymentAspect
{
/** Web meta data modifier. */
14 years, 3 months
- 1
- 0
JBossWS SVN: r11611 - container/jboss50/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-02-18 09:48:32 -0500 (Thu, 18 Feb 2010)
New Revision: 11611
Added:
container/jboss50/branches/jbossws-jboss510/
Log:
[JBWS-2895] Branching container integration for AS 510 (from 3.2.1.GA tag) [required for merging prototype]
Copied: container/jboss50/branches/jbossws-jboss510 (from rev 11610, container/jboss50/tags/jbossws-jboss510-3.2.1.GA)
14 years, 3 months
- 1
- 0
JBossWS SVN: r11610 - in common/trunk/src/main/java/org/jboss/wsf: test and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-02-18 09:04:50 -0500 (Thu, 18 Feb 2010)
New Revision: 11610
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
Log:
refactoring helper methods from JBossWSTest to DOMUtils
Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-02-18 13:43:49 UTC (rev 11609)
+++ common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-02-18 14:04:50 UTC (rev 11610)
@@ -25,7 +25,9 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.PrintWriter;
import java.io.Reader;
+import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -820,4 +822,46 @@
return retElement;
}
+
+ /**
+ * Converts XML node in pretty mode using UTF-8 encoding to string.
+ *
+ * @param node XML document or element
+ * @return XML string
+ * @throws Exception if some error occurs
+ */
+ public static String node2String(final Node node) throws UnsupportedEncodingException
+ {
+ return node2String(node, true, Constants.DEFAULT_XML_CHARSET);
+ }
+
+ /**
+ * Converts XML node in specified pretty mode using UTF-8 encoding to string.
+ *
+ * @param node XML document or element
+ * @param prettyPrint whether XML have to be pretty formated
+ * @return XML string
+ * @throws Exception if some error occurs
+ */
+ public static String node2String(final Node node, boolean prettyPrint) throws UnsupportedEncodingException
+ {
+ return node2String(node, prettyPrint, Constants.DEFAULT_XML_CHARSET);
+ }
+
+ /**
+ * Converts XML node in specified pretty mode and encoding to string.
+ *
+ * @param node XML document or element
+ * @param prettyPrint whether XML have to be pretty formated
+ * @param encoding to use
+ * @return XML string
+ * @throws UnsupportedEncodingException
+ */
+ public static String node2String(final Node node, boolean prettyPrint, String encoding) throws UnsupportedEncodingException
+ {
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ new DOMWriter(new PrintWriter(baos), encoding).setPrettyprint(prettyPrint).print(node);
+ return baos.toString(encoding);
+ }
+
}
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2010-02-18 13:43:49 UTC (rev 11609)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2010-02-18 14:04:50 UTC (rev 11610)
@@ -21,11 +21,9 @@
*/
package org.jboss.wsf.test;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.PrintWriter;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -45,7 +43,6 @@
import junit.framework.TestCase;
import org.jboss.logging.Logger;
-import org.jboss.ws.Constants;
import org.jboss.wsf.common.DOMWriter;
import org.jboss.wsf.common.concurrent.CopyJob;
import org.w3c.dom.Element;
@@ -73,47 +70,6 @@
}
/**
- * Prints XML in pretty mode in UTF-8 encoding.
- *
- * @param node XML document or element
- * @return XML string
- * @throws Exception if some error occurs
- */
- public static String getXML(final Node node) throws Exception
- {
- return getXML(node, true, Constants.DEFAULT_XML_CHARSET);
- }
-
- /**
- * Prints XML in specified pretty mode in UTF-8 encoding.
- *
- * @param node XML document or element
- * @param prettyPrint whether XML have to be pretty formated
- * @return XML string
- * @throws Exception if some error occurs
- */
- public static String getXML(final Node node, boolean prettyPrint) throws Exception
- {
- return getXML(node, prettyPrint, Constants.DEFAULT_XML_CHARSET);
- }
-
- /**
- * Prints XML in specified encoding and pretty mode.
- *
- * @param node XML document or element
- * @param prettyPrint whether XML have to be pretty formated
- * @param encoding to use
- * @return XML string
- * @throws Exception if some error occurs
- */
- public static String getXML(final Node node, boolean prettyPrint, String encoding) throws Exception
- {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- new DOMWriter(new PrintWriter(baos), encoding).setPrettyprint(prettyPrint).print(node);
- return baos.toString(encoding);
- }
-
- /**
* Execute <b>command</b> in separate process.
* @param command command to execute
* @throws IOException if I/O error occurs
14 years, 3 months
- 1
- 0