April 2010 - jbossws-commits - Jboss List Archives

JBossWS SVN: r12134 - in stack/cxf/trunk: modules/management and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-04-30 10:21:28 -0400 (Fri, 30 Apr 2010) New Revision: 12134 Modified: stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/pom.xml stack/cxf/trunk/profiles.xml.example stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: switching to AS 600 M3 and updating excludes files Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2010-04-30 14:11:10 UTC (rev 12133) +++ stack/cxf/trunk/modules/management/pom.xml 2010-04-30 14:21:28 UTC (rev 12134) @@ -39,14 +39,14 @@ <artifactId>jbossws-jboss510</artifactId> <scope>provided</scope> </dependency> +  +  +  -  -     @@ -133,6 +133,9 @@ <classifier>resources</classifier> <type>zip</type> </dependency> +  +  +  -  -  + <param name="modifyjbossintegration" value="false"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </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="true" removenativecore="true" /> + <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false" removenativecore="false" /> </target>  Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-30 14:11:10 UTC (rev 12133) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-30 14:21:28 UTC (rev 12134) @@ -122,6 +122,9 @@ <include>org.jboss.ws:jbossws-jboss510:jar</include> </includes> </dependencySet> +  +  +  -  - <!-- <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>

14 years

1
0
0 / 0

JBossWS SVN: r12133 - in stack/metro/trunk: modules/management and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-04-30 10:11:10 -0400 (Fri, 30 Apr 2010) New Revision: 12133 Modified: stack/metro/trunk/modules/management/pom.xml stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt stack/metro/trunk/pom.xml stack/metro/trunk/profiles.xml.example stack/metro/trunk/src/main/distro/build-deploy.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: switching to AS 600 M3 plus updating excludes Modified: stack/metro/trunk/modules/management/pom.xml =================================================================== --- stack/metro/trunk/modules/management/pom.xml 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/modules/management/pom.xml 2010-04-30 14:11:10 UTC (rev 12133) @@ -39,14 +39,14 @@ <artifactId>jbossws-jboss510</artifactId> <scope>provided</scope> </dependency> +  +  +  -  -  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> -  +  <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> </additionalClasspathElements> @@ -606,7 +639,7 @@  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> -  +  <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> </additionalClasspathElements> Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 14:11:10 UTC (rev 12133) @@ -53,23 +53,18 @@ # [JBWS-2915] WSDL metadata is missing in EPR org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceTestCase.* -# [JBWS-2917] We're using buggy xalan version causing namespaces issues -org/jboss/test/ws/jaxws/jbws2917/** -org/jboss/test/ws/jaxws/jbws2937/** -org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* - -# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 -org/jboss/test/ws/jaxrpc/** - # [JBWS-2989] Write published wsdl to file on deploy org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.* # These tests require JAX-WS 2.2 API +org/jboss/test/ws/jaxws/jbws2917/** +org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** org/jboss/test/ws/jaxws/jbws2991/** org/jboss/test/ws/jaxws/jbws3008/** +org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* # [JBWS-2998] Complete integration development for JSR109 requirements org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.* Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/pom.xml 2010-04-30 14:11:10 UTC (rev 12133) @@ -50,10 +50,10 @@ <jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version> <jbossws.jboss501.version>3.3.0-SNAPSHOT</jbossws.jboss501.version> <jbossws.jboss510.version>3.3.0-SNAPSHOT</jbossws.jboss510.version> - <jbossws.jboss600M2.version>3.3.0-SNAPSHOT</jbossws.jboss600M2.version>     @@ -129,6 +129,9 @@ <classifier>resources</classifier> <type>zip</type> </dependency> +  +  +  -  -  + <param name="modifyjbossintegration" value="false"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </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="true" removenativecore="true"/> + <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false" removenativecore="false"/> </target>  Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-30 13:46:41 UTC (rev 12132) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-30 14:11:10 UTC (rev 12133) @@ -104,6 +104,9 @@ <include>org.jboss.ws:jbossws-jboss510:jar</include> </includes> </dependencySet> +  +  +  -  - <!-- <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>

14 years

1
0
0 / 0

JBossWS SVN: r12132 - framework/trunk/hudson.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-04-30 09:46:41 -0400 (Fri, 30 Apr 2010) New Revision: 12132 Modified: framework/trunk/hudson/ant.properties.example Log: switching to AS 600 M3 Modified: framework/trunk/hudson/ant.properties.example =================================================================== --- framework/trunk/hudson/ant.properties.example 2010-04-30 13:20:50 UTC (rev 12131) +++ framework/trunk/hudson/ant.properties.example 2010-04-30 13:46:41 UTC (rev 12132) @@ -33,8 +33,8 @@ hudson.jboss510.build=jboss-5.1.0.GA hudson.jboss510.rev=HEAD -hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_6_0_0_20100216-M2 -hudson.jboss600.build=jboss-6.0.0.20100216-M2 +hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/tags/6.0.0.20100429-M3 +hudson.jboss600.build=jboss-6.0.0.M3 hudson.jboss600.rev=HEAD hudson.jboss601.url=http://anonsvn.jboss.org/repos/jbossas/trunk

14 years

1
0
0 / 0

JBossWS SVN: r12131 - in stack/native/trunk: modules/management and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-04-30 09:20:50 -0400 (Fri, 30 Apr 2010) New Revision: 12131 Modified: stack/native/trunk/modules/management/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt stack/native/trunk/pom.xml stack/native/trunk/profiles.xml.example stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: switching to AS M3, syncing excludes files, fixing JMS tests Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2010-04-30 11:12:40 UTC (rev 12130) +++ stack/native/trunk/modules/management/pom.xml 2010-04-30 13:20:50 UTC (rev 12131) @@ -39,14 +39,14 @@ <artifactId>jbossws-jboss510</artifactId> <scope>provided</scope> </dependency> +  +  +  -  -  @@ -440,7 +440,7 @@ <profile> <id>jboss600</id> <properties> - <jboss.version>6.0.0.20100216-M2</jboss.version> + <jboss.version>6.0.0.20100429-M3</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> @@ -451,14 +451,54 @@ </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-aspects</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-connector</artifactId> + <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-security</artifactId> <version>${jboss.version}</version> </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-system</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms-client</artifactId> + <version>${hornetq.version}</version> + </dependency> </dependencies> <build> <plugins> @@ -548,11 +588,6 @@ </dependency> <dependency> <groupId>org.hornetq</groupId> - <artifactId>hornetq-transports</artifactId> - <version>${hornetq.version}</version> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> <artifactId>hornetq-jms-client</artifactId> <version>${hornetq.version}</version> </dependency> Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-30 11:12:40 UTC (rev 12130) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-30 13:20:50 UTC (rev 12131) @@ -8,5 +8,6 @@ org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** org/jboss/test/ws/jaxws/jbws2942/** +org/jboss/test/ws/jaxws/jbws3008/** org/jboss/test/ws/jaxws/endpointReference/** org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-30 11:12:40 UTC (rev 12130) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-30 13:20:50 UTC (rev 12131) @@ -8,5 +8,6 @@ org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** org/jboss/test/ws/jaxws/jbws2942/** +org/jboss/test/ws/jaxws/jbws3008/** org/jboss/test/ws/jaxws/endpointReference/** org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 11:12:40 UTC (rev 12130) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 13:20:50 UTC (rev 12131) @@ -3,10 +3,3 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2917] We're using buggy xalan version causing namespaces issues -org/jboss/test/ws/jaxws/jbws2917/** -org/jboss/test/ws/jaxws/jbws2937/** -org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/endpointReference/** -org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-30 11:12:40 UTC (rev 12130) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-30 13:20:50 UTC (rev 12131) @@ -3,7 +3,3 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBXB-243] -org/jboss/test/ws/jaxrpc/jbws434/** -org/jboss/test/ws/jaxrpc/jbws720/** Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2010-04-30 11:12:40 UTC (rev 12130) +++ stack/native/trunk/pom.xml 2010-04-30 13:20:50 UTC (rev 12131) @@ -51,10 +51,10 @@ <jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version> <jbossws.jboss501.version>3.3.0-SNAPSHOT</jbossws.jboss501.version> <jbossws.jboss510.version>3.3.0-SNAPSHOT</jbossws.jboss510.version> - <jbossws.jboss600M2.version>3.3.0-SNAPSHOT</jbossws.jboss600M2.version>     @@ -132,6 +132,9 @@ <classifier>resources</classifier> <type>zip</type> </dependency> +  +  +  -  -  + <param name="modifyjbossintegration" value="false"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </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="true"/> + <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/> </target>  Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-30 11:12:40 UTC (rev 12130) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-04-30 13:20:50 UTC (rev 12131) @@ -121,6 +121,9 @@ <include>org.jboss.ws:jbossws-jboss510:jar</include> </includes> </dependencySet> +  +  +  -  - <!-- <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>

14 years

1
0
0 / 0

JBossWS SVN: r12130 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-04-30 07:12:40 -0400 (Fri, 30 Apr 2010) New Revision: 12130 Modified: 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/modules/testsuite/test-excludes-jboss601.txt Log: [JBWS-3008] excluding test for CXF Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-30 11:11:29 UTC (rev 12129) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-30 11:12:40 UTC (rev 12130) @@ -58,6 +58,7 @@ org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** org/jboss/test/ws/jaxws/handlerscope/*TestCase.* # [JBWS-2987] Review JMS integration Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-30 11:11:29 UTC (rev 12129) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-30 11:12:40 UTC (rev 12130) @@ -58,6 +58,7 @@ org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** org/jboss/test/ws/jaxws/handlerscope/*TestCase.* # [JBWS-2987] Review JMS integration Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 11:11:29 UTC (rev 12129) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 11:12:40 UTC (rev 12130) @@ -58,6 +58,7 @@ org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** org/jboss/test/ws/jaxws/handlerscope/*TestCase.* # [JBWS-2987] Review JMS integration Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-30 11:11:29 UTC (rev 12129) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-30 11:12:40 UTC (rev 12130) @@ -51,6 +51,7 @@ org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* org/jboss/test/ws/jaxws/handlerscope/*TestCase.*

14 years

1
0
0 / 0

JBossWS SVN: r12129 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-04-30 07:11:29 -0400 (Fri, 30 Apr 2010) New Revision: 12129 Modified: 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/modules/testsuite/test-excludes-jboss601.txt Log: [JBWS-3008] excluding test for metro Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-30 10:52:17 UTC (rev 12128) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-30 11:11:29 UTC (rev 12129) @@ -69,6 +69,7 @@ org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** # [JBWS-2998] Complete integration development for JSR109 requirements org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.* Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-30 10:52:17 UTC (rev 12128) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-30 11:11:29 UTC (rev 12129) @@ -69,6 +69,7 @@ org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** # [JBWS-2998] Complete integration development for JSR109 requirements org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.* Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 10:52:17 UTC (rev 12128) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-30 11:11:29 UTC (rev 12129) @@ -69,6 +69,7 @@ org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** # [JBWS-2998] Complete integration development for JSR109 requirements org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.* Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-30 10:52:17 UTC (rev 12128) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-30 11:11:29 UTC (rev 12129) @@ -63,6 +63,7 @@ org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws2985/** org/jboss/test/ws/jaxws/jbws2991/** +org/jboss/test/ws/jaxws/jbws3008/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* # [JBWS-2998] Complete integration development for JSR109 requirements

14 years

1
0
0 / 0

JBossWS SVN: r12128 - in framework/trunk/testsuite/test: java/org and 12 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-04-30 06:52:17 -0400 (Fri, 30 Apr 2010) New Revision: 12128 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/AddNumbersImpl.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/JBWS3008TestCase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/MyEPR.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/AddNumbers.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/AddNumbersService.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/DoAddNumbers.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/DoAddNumbersResponse.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR1.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR1Response.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR2.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR2Response.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/ObjectFactory.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/package-info.java framework/trunk/testsuite/test/java/org/w3/ framework/trunk/testsuite/test/java/org/w3/_2005/ framework/trunk/testsuite/test/java/org/w3/_2005/_08/ framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedQNameType.java framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedURIType.java framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedUnsignedLongType.java framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/MetadataType.java framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ObjectFactory.java framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ProblemActionType.java framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ReferenceParametersType.java framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/RelatesToType.java framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/package-info.java framework/trunk/testsuite/test/resources/jaxws/jbws3008/ framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/ framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/jboss-web.xml framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/web.xml framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/wsdl/ framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/wsdl/AddNumbersService.wsdl framework/trunk/testsuite/test/resources/jaxws/jbws3008/customfile.xml Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/common/JAXWS_Util.java Log: [JBWS-3008] providing test case Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-04-30 10:27:14 UTC (rev 12127) +++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-04-30 10:52:17 UTC (rev 12128) @@ -924,6 +924,17 @@ </metainf> </jar> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3008.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3008/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3008/AddNumbersImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3008/WEB-INF"> + <include name="wsdl/**" /> + <include name="jboss-web.xml"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/common/JAXWS_Util.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/common/JAXWS_Util.java 2010-04-30 10:27:14 UTC (rev 12127) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/common/JAXWS_Util.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -21,12 +21,23 @@ */ package org.jboss.test.ws.jaxws.common; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; import org.jboss.logging.Logger; import org.jboss.wsf.common.DOMUtils; +import org.w3c.dom.Node; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPMessage; import javax.xml.transform.OutputKeys; import javax.xml.transform.Source; @@ -34,7 +45,9 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; public final class JAXWS_Util { @@ -89,4 +102,86 @@ System.err.print(sb.toString()); } } + + public static Source makeSource(String msg, String type) + { + Reader reader = new StringReader(msg); + if (type.equals("StreamSource")) + return new StreamSource(reader); + else if (type.equals("DOMSource")) + return new DOMSource(createDOMNode(reader)); + else if (type.equals("SAXSource")) + return new SAXSource(new InputSource(reader)); + else + return null; + } + + public static Node createDOMNode(Reader reader) + { + + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + dbf.setNamespaceAware(true); + dbf.setValidating(false); + try + { + DocumentBuilder builder = dbf.newDocumentBuilder(); + try + { + return builder.parse(new InputSource(reader)); + } + catch (SAXException e) + { + e.printStackTrace(); + } + catch (IOException e) + { + e.printStackTrace(); + } + } + catch (ParserConfigurationException pce) + { + IllegalArgumentException iae = new IllegalArgumentException(pce.getMessage()); + iae.initCause(pce); + throw iae; + } + return null; + } + + public static SOAPMessage makeSOAPMessage(String msg) + { + try + { + Source srcMsg = makeSource(msg, "StreamSource"); + MessageFactory factory = MessageFactory.newInstance(); + SOAPMessage message = factory.createMessage(); + message.getSOAPPart().setContent((Source) srcMsg); + message.saveChanges(); + return message; + } + catch (Exception e) + { + return null; + } + } + + public static String getSOAPMessageAsString(SOAPMessage message) + { + return getMsgAsString(message); + } + + public static String getMsgAsString(SOAPMessage message) + { + String msg = null; + try + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + message.writeTo(baos); + msg = baos.toString(); + } + catch (Exception e) + { + e.printStackTrace(); + } + return msg; + } } Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/AddNumbersImpl.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/AddNumbersImpl.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/AddNumbersImpl.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,57 @@ +/* + * 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.test.ws.jaxws.jbws3008; + +import javax.annotation.Resource; +import javax.jws.WebService; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.BindingType; +import javax.xml.ws.soap.Addressing; +import javax.xml.ws.soap.SOAPBinding; +import javax.xml.ws.wsaddressing.W3CEndpointReference; + +@WebService(name = "AddNumbers", portName = "AddNumbersPort", targetNamespace = "http://foobar.org/", serviceName = "AddNumbersService", wsdlLocation="WEB-INF/wsdl/AddNumbersService.wsdl") +@BindingType(value = SOAPBinding.SOAP11HTTP_BINDING) +@Addressing(enabled = true, required = true) +public class AddNumbersImpl +{ + + @Resource + WebServiceContext wsc; + + public W3CEndpointReference getW3CEPR1() + { + System.out.println("wsc=" + wsc); + return (W3CEndpointReference) wsc.getEndpointReference(); + } + + public W3CEndpointReference getW3CEPR2() + { + System.out.println("wsc=" + wsc); + return (W3CEndpointReference) wsc.getEndpointReference(javax.xml.ws.wsaddressing.W3CEndpointReference.class); + } + + public int doAddNumbers(int number1, int number2) + { + return number1 + number2; + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/JBWS3008TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/JBWS3008TestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/JBWS3008TestCase.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,497 @@ +/* + * 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.test.ws.jaxws.jbws3008; + +import java.io.ByteArrayInputStream; +import java.net.URL; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPMessage; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMResult; +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Dispatch; +import javax.xml.ws.EndpointReference; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.soap.AddressingFeature; +import javax.xml.ws.soap.SOAPFaultException; +import javax.xml.ws.wsaddressing.W3CEndpointReference; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxws.common.JAXWS_Util; +import org.jboss.test.ws.jaxws.jbws3008.generated.AddNumbers; +import org.jboss.test.ws.jaxws.jbws3008.generated.AddNumbersService; +import org.jboss.test.ws.jaxws.jbws3008.generated.DoAddNumbers; +import org.jboss.test.ws.jaxws.jbws3008.generated.DoAddNumbersResponse; +import org.jboss.test.ws.jaxws.jbws3008.generated.ObjectFactory; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.w3c.dom.Node; + +/** + * [JBWS-3008] Dispatch doesn't respect @Addressing features + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class JBWS3008TestCase extends JBossWSTest +{ + private String url = null; + + private URL wsdlurl = null; + + private static final String NAMESPACEURI = "http://foobar.org/"; + + private static final String SERVICE_NAME = "AddNumbersService"; + + private static final String PORT_NAME = "AddNumbersPort"; + + private QName SERVICE_QNAME = new QName(NAMESPACEURI, SERVICE_NAME); + + private QName PORT_QNAME = new QName(NAMESPACEURI, PORT_NAME); + + private WebServiceFeature[] wsftrue = + {new AddressingFeature(true, true)}; + + private WebServiceFeature[] wsffalse = + {new AddressingFeature(false, false)}; + + AddNumbers port = null; + + BindingProvider bp = null; + + static AddNumbersService service = null; + + private Dispatch<Object> dispatchJaxb = null; + + private Dispatch<Source> dispatchSrc = null; + + private Dispatch<SOAPMessage> dispatchSM = null; + + // The elementFormDefault is "unqualified" in associated document literal WSDL, thus all the child elements have to be unqualified. + private String doAddNumbersRequest = "<ns3:doAddNumbers xmlns:ns3=\"http://foobar.org/\"><arg0>10</arg0><arg1>10</arg1></ns3:doAddNumbers>"; + + private String doAddNumbersRequestSM = "<?xml version=\"1.0\" ?><S:Envelope xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\"><S:Body><ns3:doAddNumbers xmlns:ns3=\"http://foobar.org/\"><arg0>10</arg0><arg1>10</arg1></ns3:doAddNumbers></S:Body></S:Envelope>"; + + private static final Class<?> JAXB_OBJECT_FACTORY = ObjectFactory.class; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS3008TestCase.class, "jaxws-jbws3008.war"); + } + + boolean initialized = false; + + protected void setUp() throws Exception + { + if (!this.initialized) + { + this.initialized = true; + + url = "http://" + getServerHost() + ":8080/jaxws-jbws3008"; + wsdlurl = new URL(url + "?wsdl"); + service = new AddNumbersService(wsdlurl, SERVICE_QNAME); + port = service.getPort(PORT_QNAME, AddNumbers.class, wsftrue); + bp = (BindingProvider) port; + } + } + + private JAXBContext createJAXBContext() + { + try + { + return JAXBContext.newInstance(JAXB_OBJECT_FACTORY); + } + catch (javax.xml.bind.JAXBException e) + { + throw new WebServiceException(e.getMessage(), e); + } + } + + private Dispatch<Object> createDispatchJAXB(W3CEndpointReference myepr, WebServiceFeature[] wsf) throws Exception + { + if (wsf == null) + return service.createDispatch(myepr, createJAXBContext(), javax.xml.ws.Service.Mode.PAYLOAD); + else + return service.createDispatch(myepr, createJAXBContext(), javax.xml.ws.Service.Mode.PAYLOAD, wsf); + } + + private Dispatch<Source> createDispatchSource(W3CEndpointReference myepr, WebServiceFeature[] wsf) throws Exception + { + if (wsf == null) + return service.createDispatch(myepr, Source.class, javax.xml.ws.Service.Mode.PAYLOAD); + else + return service.createDispatch(myepr, Source.class, javax.xml.ws.Service.Mode.PAYLOAD, wsf); + } + + private Dispatch<SOAPMessage> createDispatchSOAPMessage(W3CEndpointReference myepr, WebServiceFeature[] wsf) + throws Exception + { + if (wsf == null) + return service.createDispatch(myepr, SOAPMessage.class, javax.xml.ws.Service.Mode.MESSAGE); + else + return service.createDispatch(myepr, SOAPMessage.class, javax.xml.ws.Service.Mode.MESSAGE, wsf); + } + + public void testEPRGetEPRViaWSCTest1() throws Exception + { + W3CEndpointReference epr = port.getW3CEPR1(); + String eprString = this.endpointReferenceAsString(epr); + assertTrue("Service URL not found: ", eprString.indexOf(url) > 0); + } + + public void testEPRGetEPRViaWSCTest2() throws Exception + { + W3CEndpointReference epr = port.getW3CEPR2(); + String eprString = this.endpointReferenceAsString(epr); + assertTrue("Service URL not found: ", eprString.indexOf(url) > 0); + } + + public void testEPRGetEPRViaBPTest1() throws Exception + { + W3CEndpointReference epr = (W3CEndpointReference) bp.getEndpointReference(); + String eprString = this.endpointReferenceAsString(epr); + assertTrue("Service URL not found: ", eprString.indexOf(url) > 0); + } + + public void testEPRGetEPRViaBPTest2() throws Exception + { + W3CEndpointReference epr = (W3CEndpointReference) bp.getEndpointReference(W3CEndpointReference.class); + String eprString = this.endpointReferenceAsString(epr); + assertTrue("Service URL not found: ", eprString.indexOf(url) > 0); + } + + public void testEPRGetEPRViaBPWithUnsupportedEPRClassTest() throws Exception + { + try + { + bp.getEndpointReference(MyEPR.class); + fail("Did not throw expected WebServiceException"); + } + catch (WebServiceException e) + { + log.debug("Caught expected WebServiceException: " + e.getMessage()); + } + } + + public void testEPRWriteToAndReadFromTest() throws Exception + { + W3CEndpointReference epr = (W3CEndpointReference) bp.getEndpointReference(); + String eprString = this.endpointReferenceAsString(epr); + ByteArrayInputStream bais = new ByteArrayInputStream(eprString.getBytes()); + epr = (W3CEndpointReference) EndpointReference.readFrom(new StreamSource(bais)); + } + + public void testServiceGetPortViaWSCAndWSFTrueTest() throws Exception + { + W3CEndpointReference epr = port.getW3CEPR1(); + AddNumbers retport = (AddNumbers) service.getPort(epr, AddNumbers.class, wsftrue); + int result = retport.doAddNumbers(10, 10); + assertTrue(result == 20); + } + + public void testServiceGetPortViaWSCAndWSFFalseTest() throws Exception + { + try + { + W3CEndpointReference epr = port.getW3CEPR1(); + AddNumbers retport = (AddNumbers) service.getPort(epr, AddNumbers.class, wsffalse); + retport.doAddNumbers(10, 10); + fail("Did not throw expected SOAPFaultException"); + } + catch (SOAPFaultException e) + { + log.debug("Caught expected SOAPFaultException: " + e.getMessage()); + } + } + + public void testServiceGetPortViaBPAndWSFTrueTest() throws Exception + { + W3CEndpointReference epr = (W3CEndpointReference) bp.getEndpointReference(); + AddNumbers retport = (AddNumbers) service.getPort(epr, AddNumbers.class, wsftrue); + int result = retport.doAddNumbers(10, 10); + assertTrue(result == 20); + } + + public void testServiceGetPortViaBPAndWSFFalseTest() throws Exception + { + try + { + W3CEndpointReference epr = (W3CEndpointReference) bp.getEndpointReference(); + AddNumbers retport = (AddNumbers) service.getPort(epr, AddNumbers.class, wsffalse); + retport.doAddNumbers(10, 10); + fail("Did not throw expected SOAPFaultException"); + } + catch (SOAPFaultException e) + { + log.debug("Caught expected SOAPFaultException: " + e.getMessage()); + } + } + + public void testEPRGetPortViaWSCAndNoWSFTest() throws Exception + { + try + { + W3CEndpointReference epr = port.getW3CEPR1(); + AddNumbers retport = (AddNumbers) epr.getPort(AddNumbers.class); + retport.doAddNumbers(10, 10); + } + catch (SOAPFaultException e) + { + log.debug("Caught expected SOAPFaultException: " + e.getMessage()); + } + } + + public void testEPRGetPortViaWSCAndWSFTrueTest() throws Exception + { + W3CEndpointReference epr = port.getW3CEPR1(); + AddNumbers retport = (AddNumbers) epr.getPort(AddNumbers.class, wsftrue); + int result = retport.doAddNumbers(10, 10); + assertTrue(result == 20); + } + + public void testEPRGetPortViaWSCAndWSFFalseTest() throws Exception + { + try + { + W3CEndpointReference epr = port.getW3CEPR1(); + AddNumbers retport = (AddNumbers) epr.getPort(AddNumbers.class, wsffalse); + retport.doAddNumbers(10, 10); + fail("Did not throw expected SOAPFaultException"); + } + catch (SOAPFaultException e) + { + log.debug("Caught expected SOAPFaultException: " + e.getMessage()); + } + } + + public void testEPRGetPortViaBPAndNoWSFTest() throws Exception + { + try + { + W3CEndpointReference epr = (W3CEndpointReference) bp.getEndpointReference(); + AddNumbers retport = (AddNumbers) epr.getPort(AddNumbers.class); + retport.doAddNumbers(10, 10); + } + catch (SOAPFaultException e) + { + log.debug("Caught expected SOAPFaultException: " + e.getMessage()); + } + } + + public void testEPRGetPortViaBPAndWSFTrueTest() throws Exception + { + W3CEndpointReference epr = (W3CEndpointReference) bp.getEndpointReference(); + AddNumbers retport = (AddNumbers) epr.getPort(AddNumbers.class, wsftrue); + int result = retport.doAddNumbers(10, 10); + assertTrue(result == 20); + } + + public void testEPRGetPortViaBPAndWSFFalseTest() throws Exception + { + try + { + W3CEndpointReference epr = (W3CEndpointReference) bp.getEndpointReference(); + AddNumbers retport = (AddNumbers) epr.getPort(AddNumbers.class, wsffalse); + retport.doAddNumbers(10, 10); + fail("Did not throw expected SOAPFaultException"); + } + catch (SOAPFaultException e) + { + log.debug("Caught expected SOAPFaultException: " + e.getMessage()); + } + } + + public void testEPRViaWSCCreateDispatchWSFTrueAndInvokeTest1() throws Exception + { + W3CEndpointReference myepr = port.getW3CEPR1(); + dispatchSrc = createDispatchSource(myepr, wsftrue); + Source requestMsg = JAXWS_Util.makeSource(doAddNumbersRequest, "StreamSource"); + Source responseMsg = dispatchSrc.invoke(requestMsg); + String responseStr = JAXWS_Util.getDOMResultAsString(JAXWS_Util.getSourceAsDOMResult(responseMsg)); + if (responseStr.indexOf("doAddNumbersResponse") == -1 || responseStr.indexOf("return") == -1 + || responseStr.indexOf("20") == -1) + { + fail("Unexpected response results"); + } + } + + public void testEPRViaWSCCreateDispatchWSFTrueAndInvokeTest2() throws Exception + { + W3CEndpointReference myepr = port.getW3CEPR2(); + dispatchSrc = createDispatchSource(myepr, wsftrue); + Source requestMsg = JAXWS_Util.makeSource(doAddNumbersRequest, "StreamSource"); + Source responseMsg = dispatchSrc.invoke(requestMsg); + String responseStr = JAXWS_Util.getDOMResultAsString(JAXWS_Util.getSourceAsDOMResult(responseMsg)); + if (responseStr.indexOf("doAddNumbersResponse") == -1 || responseStr.indexOf("return") == -1 + || responseStr.indexOf("20") == -1) + { + fail("Unexpected response results"); + } + } + + public void testEPRViaWSCCreateDispatchWSFFalseAndInvokeTest3() throws Exception + { + try + { + W3CEndpointReference myepr = port.getW3CEPR1(); + dispatchSrc = createDispatchSource(myepr, wsffalse); + Source requestMsg = JAXWS_Util.makeSource(doAddNumbersRequest, "StreamSource"); + dispatchSrc.invoke(requestMsg); + fail("Did not throw expected WebServiceException"); + } + catch (WebServiceException e) + { + log.debug("Caught expected WebServiceException: " + e.getMessage()); + } + } + + @SuppressWarnings("unchecked") + public void testEPRViaWSCCreateJAXBDispatchWSFTrueAndInvokeTest1() throws Exception + { + W3CEndpointReference myepr = port.getW3CEPR1(); + ObjectFactory of = new ObjectFactory(); + DoAddNumbers numbers = of.createDoAddNumbers(); + numbers.setArg0(10); + numbers.setArg1(10); + JAXBElement<DoAddNumbers> request = of.createDoAddNumbers(numbers); + dispatchJaxb = createDispatchJAXB(myepr, wsftrue); + JAXBElement<DoAddNumbersResponse> response = (JAXBElement<DoAddNumbersResponse>) dispatchJaxb.invoke(request); + int result = response.getValue().getReturn(); + if (result != 20) + { + fail("Expected result=20, got result=" + result); + } + } + + public void testEPRViaWSCCreateJAXBDispatchWSFFalseAndInvokeTest2() throws Exception + { + try + { + W3CEndpointReference myepr = port.getW3CEPR1(); + ObjectFactory of = new ObjectFactory(); + DoAddNumbers numbers = of.createDoAddNumbers(); + numbers.setArg0(10); + numbers.setArg1(10); + JAXBElement<DoAddNumbers> request = of.createDoAddNumbers(numbers); + dispatchJaxb = createDispatchJAXB(myepr, wsffalse); + dispatchJaxb.invoke(request); + fail("Did not throw expected WebServiceException"); + } + catch (WebServiceException e) + { + log.debug("Caught expected WebServiceException: " + e.getMessage()); + } + } + + public void testEPRViaBPCreateDispatchWSFTrueAndInvokeTest1() throws Exception + { + W3CEndpointReference myepr = (W3CEndpointReference) bp.getEndpointReference(); + dispatchSrc = createDispatchSource(myepr, wsftrue); + Source requestMsg = JAXWS_Util.makeSource(doAddNumbersRequest, "StreamSource"); + Source responseMsg = dispatchSrc.invoke(requestMsg); + String responseStr = JAXWS_Util.getDOMResultAsString(JAXWS_Util.getSourceAsDOMResult(responseMsg)); + if (responseStr.indexOf("doAddNumbersResponse") == -1 || responseStr.indexOf("return") == -1 + || responseStr.indexOf("20") == -1) + { + fail("Unexpected response results"); + } + } + + public void testEPRViaBPCreateDispatchWSFTrueAndInvokeTest2() throws Exception + { + W3CEndpointReference myepr = (W3CEndpointReference) bp.getEndpointReference(W3CEndpointReference.class); + dispatchSM = createDispatchSOAPMessage(myepr, wsftrue); + SOAPMessage requestMsg = JAXWS_Util.makeSOAPMessage(doAddNumbersRequestSM); + SOAPMessage responseMsg = dispatchSM.invoke(requestMsg); + String responseStr = JAXWS_Util.getSOAPMessageAsString(responseMsg); + if (responseStr.indexOf("doAddNumbersResponse") == -1 || responseStr.indexOf("return") == -1 + || responseStr.indexOf("20") == -1) + { + fail("Unexpected response results"); + } + } + + public void testEPRViaBPCreateDispatchWSFFalseAndInvokeTest3() throws Exception + { + try + { + W3CEndpointReference myepr = (W3CEndpointReference) bp.getEndpointReference(W3CEndpointReference.class); + dispatchSM = createDispatchSOAPMessage(myepr, wsffalse); + SOAPMessage requestMsg = JAXWS_Util.makeSOAPMessage(doAddNumbersRequestSM); + dispatchSM.invoke(requestMsg); + fail("Did not throw expected WebServiceException"); + } + catch (WebServiceException e) + { + log.debug("Caught expected WebServiceException: " + e.getMessage()); + } + } + + @SuppressWarnings("unchecked") + public void testEPRViaBPCreateJAXBDispatchWSFTrueAndInvokeTest1() throws Exception + { + W3CEndpointReference myepr = (W3CEndpointReference) bp.getEndpointReference(W3CEndpointReference.class); + ObjectFactory of = new ObjectFactory(); + DoAddNumbers numbers = of.createDoAddNumbers(); + numbers.setArg0(10); + numbers.setArg1(10); + JAXBElement<DoAddNumbers> request = of.createDoAddNumbers(numbers); + dispatchJaxb = createDispatchJAXB(myepr, wsftrue); + JAXBElement<DoAddNumbersResponse> response = (JAXBElement<DoAddNumbersResponse>) dispatchJaxb.invoke(request); + int result = response.getValue().getReturn(); + assertTrue(result == 20); + } + + public void testEPRViaBPCreateJAXBDispatchWSFFalseAndInvokeTest2() throws Exception + { + try + { + W3CEndpointReference myepr = (W3CEndpointReference) bp.getEndpointReference(W3CEndpointReference.class); + ObjectFactory of = new ObjectFactory(); + DoAddNumbers numbers = of.createDoAddNumbers(); + numbers.setArg0(10); + numbers.setArg1(10); + JAXBElement<DoAddNumbers> request = of.createDoAddNumbers(numbers); + dispatchJaxb = createDispatchJAXB(myepr, wsffalse); + dispatchJaxb.invoke(request); + fail("Did not throw expected WebServiceException"); + } + catch (WebServiceException e) + { + log.debug("Caught expected WebServiceException: " + e.getMessage()); + } + } + + private String endpointReferenceAsString(final EndpointReference epr) throws Exception + { + DOMResult dr = new DOMResult(); + epr.writeTo(dr); + Node endpointReferenceElement = dr.getNode(); + return DOMUtils.node2String(endpointReferenceElement); + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/MyEPR.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/MyEPR.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/MyEPR.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,29 @@ +/* + * 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.test.ws.jaxws.jbws3008; + +public class MyEPR extends javax.xml.ws.EndpointReference +{ + public void writeTo(javax.xml.transform.Result result) + { + } +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/AddNumbers.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/AddNumbers.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/AddNumbers.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,91 @@ +/* + * 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.test.ws.jaxws.jbws3008.generated; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.Action; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; +import javax.xml.ws.wsaddressing.W3CEndpointReference; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.2-12/14/2009 02:16 PM(ramkris)- + * Generated source version: 2.2 + * + */ +@WebService(name = "AddNumbers", targetNamespace = "http://foobar.org/") +@XmlSeeAlso({ + org.jboss.test.ws.jaxws.jbws3008.generated.ObjectFactory.class, + org.w3._2005._08.addressing.ObjectFactory.class +}) +public interface AddNumbers { + + + /** + * + * @param arg1 + * @param arg0 + * @return + * returns int + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "doAddNumbers", targetNamespace = "http://foobar.org/", className = "org.jboss.test.ws.jaxws.jbws3008.generated.DoAddNumbers") + @ResponseWrapper(localName = "doAddNumbersResponse", targetNamespace = "http://foobar.org/", className = "org.jboss.test.ws.jaxws.jbws3008.generated.DoAddNumbersResponse") + @Action(input = "http://foobar.org/AddNumbers/doAddNumbersRequest", output = "http://foobar.org/AddNumbers/doAddNumbersResponse") + public int doAddNumbers( + @WebParam(name = "arg0", targetNamespace = "") + int arg0, + @WebParam(name = "arg1", targetNamespace = "") + int arg1); + + /** + * + * @return + * returns javax.xml.ws.wsaddressing.W3CEndpointReference + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "getW3CEPR1", targetNamespace = "http://foobar.org/", className = "org.jboss.test.ws.jaxws.jbws3008.generated.GetW3CEPR1") + @ResponseWrapper(localName = "getW3CEPR1Response", targetNamespace = "http://foobar.org/", className = "org.jboss.test.ws.jaxws.jbws3008.generated.GetW3CEPR1Response") + @Action(input = "http://foobar.org/AddNumbers/getW3CEPR1Request", output = "http://foobar.org/AddNumbers/getW3CEPR1Response") + public W3CEndpointReference getW3CEPR1(); + + /** + * + * @return + * returns javax.xml.ws.wsaddressing.W3CEndpointReference + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "getW3CEPR2", targetNamespace = "http://foobar.org/", className = "org.jboss.test.ws.jaxws.jbws3008.generated.GetW3CEPR2") + @ResponseWrapper(localName = "getW3CEPR2Response", targetNamespace = "http://foobar.org/", className = "org.jboss.test.ws.jaxws.jbws3008.generated.GetW3CEPR2Response") + @Action(input = "http://foobar.org/AddNumbers/getW3CEPR2Request", output = "http://foobar.org/AddNumbers/getW3CEPR2Response") + public W3CEndpointReference getW3CEPR2(); + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/AddNumbersService.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/AddNumbersService.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/AddNumbersService.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,114 @@ +/* + * 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.test.ws.jaxws.jbws3008.generated; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceFeature; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.2-12/14/2009 02:16 PM(ramkris)- + * Generated source version: 2.2 + * + */ +@WebServiceClient(name = "AddNumbersService", targetNamespace = "http://foobar.org/", wsdlLocation = "file:/opt/svn/jbossas/tags/JBoss_6_0_0_20100216-M2/build/target/jboss-6.0.0.20100216-M2/bin/AddNumbersService.wsdl") +public class AddNumbersService + extends Service +{ + + private final static URL ADDNUMBERSSERVICE_WSDL_LOCATION; + private final static WebServiceException ADDNUMBERSSERVICE_EXCEPTION; + private final static QName ADDNUMBERSSERVICE_QNAME = new QName("http://foobar.org/", "AddNumbersService"); + + static { + URL url = null; + WebServiceException e = null; + try { + url = new URL("file:/opt/svn/jbossas/tags/JBoss_6_0_0_20100216-M2/build/target/jboss-6.0.0.20100216-M2/bin/AddNumbersService.wsdl"); + } catch (MalformedURLException ex) { + e = new WebServiceException(ex); + } + ADDNUMBERSSERVICE_WSDL_LOCATION = url; + ADDNUMBERSSERVICE_EXCEPTION = e; + } + + public AddNumbersService() { + super(__getWsdlLocation(), ADDNUMBERSSERVICE_QNAME); + } + + public AddNumbersService(WebServiceFeature... features) { + super(__getWsdlLocation(), ADDNUMBERSSERVICE_QNAME, features); + } + + public AddNumbersService(URL wsdlLocation) { + super(wsdlLocation, ADDNUMBERSSERVICE_QNAME); + } + + public AddNumbersService(URL wsdlLocation, WebServiceFeature... features) { + super(wsdlLocation, ADDNUMBERSSERVICE_QNAME, features); + } + + public AddNumbersService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public AddNumbersService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) { + super(wsdlLocation, serviceName, features); + } + + /** + * + * @return + * returns AddNumbers + */ + @WebEndpoint(name = "AddNumbersPort") + public AddNumbers getAddNumbersPort() { + return super.getPort(new QName("http://foobar.org/", "AddNumbersPort"), AddNumbers.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values. + * @return + * returns AddNumbers + */ + @WebEndpoint(name = "AddNumbersPort") + public AddNumbers getAddNumbersPort(WebServiceFeature... features) { + return super.getPort(new QName("http://foobar.org/", "AddNumbersPort"), AddNumbers.class, features); + } + + private static URL __getWsdlLocation() { + if (ADDNUMBERSSERVICE_EXCEPTION!= null) { + throw ADDNUMBERSSERVICE_EXCEPTION; + } + return ADDNUMBERSSERVICE_WSDL_LOCATION; + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/DoAddNumbers.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/DoAddNumbers.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/DoAddNumbers.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,91 @@ +/* + * 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.test.ws.jaxws.jbws3008.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for doAddNumbers complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="doAddNumbers"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}int"/> + * <element name="arg1" type="{http://www.w3.org/2001/XMLSchema}int"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "doAddNumbers", propOrder = { + "arg0", + "arg1" +}) +public class DoAddNumbers { + + protected int arg0; + protected int arg1; + + /** + * Gets the value of the arg0 property. + * + */ + public int getArg0() { + return arg0; + } + + /** + * Sets the value of the arg0 property. + * + */ + public void setArg0(int value) { + this.arg0 = value; + } + + /** + * Gets the value of the arg1 property. + * + */ + public int getArg1() { + return arg1; + } + + /** + * Sets the value of the arg1 property. + * + */ + public void setArg1(int value) { + this.arg1 = value; + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/DoAddNumbersResponse.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/DoAddNumbersResponse.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/DoAddNumbersResponse.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,74 @@ +/* + * 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.test.ws.jaxws.jbws3008.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for doAddNumbersResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="doAddNumbersResponse"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "doAddNumbersResponse", propOrder = { + "_return" +}) +public class DoAddNumbersResponse { + + @XmlElement(name = "return") + protected int _return; + + /** + * Gets the value of the return property. + * + */ + public int getReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + */ + public void setReturn(int value) { + this._return = value; + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR1.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR1.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR1.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,52 @@ +/* + * 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.test.ws.jaxws.jbws3008.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for getW3CEPR1 complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="getW3CEPR1"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getW3CEPR1") +public class GetW3CEPR1 { + + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR1Response.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR1Response.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR1Response.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,83 @@ +/* + * 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.test.ws.jaxws.jbws3008.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.ws.wsaddressing.W3CEndpointReference; + + +/** + * <p>Java class for getW3CEPR1Response complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="getW3CEPR1Response"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="return" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getW3CEPR1Response", propOrder = { + "_return" +}) +public class GetW3CEPR1Response { + + @XmlElement(name = "return") + protected W3CEndpointReference _return; + + /** + * Gets the value of the return property. + * + * @return + * possible object is + * {@link W3CEndpointReference } + * + */ + public W3CEndpointReference getReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + * @param value + * allowed object is + * {@link W3CEndpointReference } + * + */ + public void setReturn(W3CEndpointReference value) { + this._return = value; + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR2.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR2.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR2.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,52 @@ +/* + * 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.test.ws.jaxws.jbws3008.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for getW3CEPR2 complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="getW3CEPR2"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getW3CEPR2") +public class GetW3CEPR2 { + + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR2Response.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR2Response.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/GetW3CEPR2Response.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,83 @@ +/* + * 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.test.ws.jaxws.jbws3008.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.ws.wsaddressing.W3CEndpointReference; + + +/** + * <p>Java class for getW3CEPR2Response complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="getW3CEPR2Response"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="return" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getW3CEPR2Response", propOrder = { + "_return" +}) +public class GetW3CEPR2Response { + + @XmlElement(name = "return") + protected W3CEndpointReference _return; + + /** + * Gets the value of the return property. + * + * @return + * possible object is + * {@link W3CEndpointReference } + * + */ + public W3CEndpointReference getReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + * @param value + * allowed object is + * {@link W3CEndpointReference } + * + */ + public void setReturn(W3CEndpointReference value) { + this._return = value; + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/ObjectFactory.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/ObjectFactory.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/ObjectFactory.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,163 @@ +/* + * 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.test.ws.jaxws.jbws3008.generated; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.jbws3008.generated package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _DoAddNumbersResponse_QNAME = new QName("http://foobar.org/", "doAddNumbersResponse"); + private final static QName _GetW3CEPR1_QNAME = new QName("http://foobar.org/", "getW3CEPR1"); + private final static QName _DoAddNumbers_QNAME = new QName("http://foobar.org/", "doAddNumbers"); + private final static QName _GetW3CEPR1Response_QNAME = new QName("http://foobar.org/", "getW3CEPR1Response"); + private final static QName _GetW3CEPR2_QNAME = new QName("http://foobar.org/", "getW3CEPR2"); + private final static QName _GetW3CEPR2Response_QNAME = new QName("http://foobar.org/", "getW3CEPR2Response"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jbws3008.generated + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetW3CEPR2Response } + * + */ + public GetW3CEPR2Response createGetW3CEPR2Response() { + return new GetW3CEPR2Response(); + } + + /** + * Create an instance of {@link GetW3CEPR1Response } + * + */ + public GetW3CEPR1Response createGetW3CEPR1Response() { + return new GetW3CEPR1Response(); + } + + /** + * Create an instance of {@link GetW3CEPR2 } + * + */ + public GetW3CEPR2 createGetW3CEPR2() { + return new GetW3CEPR2(); + } + + /** + * Create an instance of {@link GetW3CEPR1 } + * + */ + public GetW3CEPR1 createGetW3CEPR1() { + return new GetW3CEPR1(); + } + + /** + * Create an instance of {@link DoAddNumbersResponse } + * + */ + public DoAddNumbersResponse createDoAddNumbersResponse() { + return new DoAddNumbersResponse(); + } + + /** + * Create an instance of {@link DoAddNumbers } + * + */ + public DoAddNumbers createDoAddNumbers() { + return new DoAddNumbers(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DoAddNumbersResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://foobar.org/", name = "doAddNumbersResponse") + public JAXBElement<DoAddNumbersResponse> createDoAddNumbersResponse(DoAddNumbersResponse value) { + return new JAXBElement<DoAddNumbersResponse>(_DoAddNumbersResponse_QNAME, DoAddNumbersResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetW3CEPR1 }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://foobar.org/", name = "getW3CEPR1") + public JAXBElement<GetW3CEPR1> createGetW3CEPR1(GetW3CEPR1 value) { + return new JAXBElement<GetW3CEPR1>(_GetW3CEPR1_QNAME, GetW3CEPR1 .class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DoAddNumbers }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://foobar.org/", name = "doAddNumbers") + public JAXBElement<DoAddNumbers> createDoAddNumbers(DoAddNumbers value) { + return new JAXBElement<DoAddNumbers>(_DoAddNumbers_QNAME, DoAddNumbers.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetW3CEPR1Response }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://foobar.org/", name = "getW3CEPR1Response") + public JAXBElement<GetW3CEPR1Response> createGetW3CEPR1Response(GetW3CEPR1Response value) { + return new JAXBElement<GetW3CEPR1Response>(_GetW3CEPR1Response_QNAME, GetW3CEPR1Response.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetW3CEPR2 }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://foobar.org/", name = "getW3CEPR2") + public JAXBElement<GetW3CEPR2> createGetW3CEPR2(GetW3CEPR2 value) { + return new JAXBElement<GetW3CEPR2>(_GetW3CEPR2_QNAME, GetW3CEPR2 .class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetW3CEPR2Response }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://foobar.org/", name = "getW3CEPR2Response") + public JAXBElement<GetW3CEPR2Response> createGetW3CEPR2Response(GetW3CEPR2Response value) { + return new JAXBElement<GetW3CEPR2Response>(_GetW3CEPR2Response_QNAME, GetW3CEPR2Response.class, null, value); + } + +} Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/package-info.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/package-info.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3008/generated/package-info.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,23 @@ +/* + * 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. + */ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://foobar.org/") +package org.jboss.test.ws.jaxws.jbws3008.generated; Added: framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedQNameType.java =================================================================== --- framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedQNameType.java (rev 0) +++ framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedQNameType.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,104 @@ +/* + * 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.w3._2005._08.addressing; + +import java.util.HashMap; +import java.util.Map; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyAttribute; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.namespace.QName; + + +/** + * <p>Java class for AttributedQNameType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AttributedQNameType"> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>QName"> + * <anyAttribute processContents='lax' namespace='##other'/> + * </extension> + * </simpleContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "AttributedQNameType", propOrder = { + "value" +}) +public class AttributedQNameType { + + @XmlValue + protected QName value; + @XmlAnyAttribute + private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link QName } + * + */ + public QName getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link QName } + * + */ + public void setValue(QName value) { + this.value = value; + } + + /** + * Gets a map that contains attributes that aren't bound to any typed property on this class. + * + * <p> + * the map is keyed by the name of the attribute and + * the value is the string value of the attribute. + * + * the map returned by this method is live, and you can add new attribute + * by updating the map directly. Because of this design, there's no setter. + * + * + * @return + * always non-null + */ + public Map<QName, String> getOtherAttributes() { + return otherAttributes; + } + +} Added: framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedURIType.java =================================================================== --- framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedURIType.java (rev 0) +++ framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedURIType.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,106 @@ +/* + * 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.w3._2005._08.addressing; + +import java.util.HashMap; +import java.util.Map; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.namespace.QName; + + +/** + * <p>Java class for AttributedURIType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AttributedURIType"> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>anyURI"> + * <anyAttribute processContents='lax' namespace='##other'/> + * </extension> + * </simpleContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "AttributedURIType", propOrder = { + "value" +}) +public class AttributedURIType { + + @XmlValue + @XmlSchemaType(name = "anyURI") + protected String value; + @XmlAnyAttribute + private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets a map that contains attributes that aren't bound to any typed property on this class. + * + * <p> + * the map is keyed by the name of the attribute and + * the value is the string value of the attribute. + * + * the map returned by this method is live, and you can add new attribute + * by updating the map directly. Because of this design, there's no setter. + * + * + * @return + * always non-null + */ + public Map<QName, String> getOtherAttributes() { + return otherAttributes; + } + +} Added: framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedUnsignedLongType.java =================================================================== --- framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedUnsignedLongType.java (rev 0) +++ framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/AttributedUnsignedLongType.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,107 @@ +/* + * 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.w3._2005._08.addressing; + +import java.math.BigInteger; +import java.util.HashMap; +import java.util.Map; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.namespace.QName; + + +/** + * <p>Java class for AttributedUnsignedLongType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AttributedUnsignedLongType"> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>unsignedLong"> + * <anyAttribute processContents='lax' namespace='##other'/> + * </extension> + * </simpleContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "AttributedUnsignedLongType", propOrder = { + "value" +}) +public class AttributedUnsignedLongType { + + @XmlValue + @XmlSchemaType(name = "unsignedLong") + protected BigInteger value; + @XmlAnyAttribute + private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setValue(BigInteger value) { + this.value = value; + } + + /** + * Gets a map that contains attributes that aren't bound to any typed property on this class. + * + * <p> + * the map is keyed by the name of the attribute and + * the value is the string value of the attribute. + * + * the map returned by this method is live, and you can add new attribute + * by updating the map directly. Because of this design, there's no setter. + * + * + * @return + * always non-null + */ + public Map<QName, String> getOtherAttributes() { + return otherAttributes; + } + +} Added: framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/MetadataType.java =================================================================== --- framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/MetadataType.java (rev 0) +++ framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/MetadataType.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,116 @@ +/* + * 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.w3._2005._08.addressing; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyAttribute; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.namespace.QName; +import org.w3c.dom.Element; + + +/** + * <p>Java class for MetadataType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="MetadataType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any processContents='lax' maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <anyAttribute processContents='lax' namespace='##other'/> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "MetadataType", propOrder = { + "any" +}) +public class MetadataType { + + @XmlAnyElement(lax = true) + protected List<Object> any; + @XmlAnyAttribute + private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + + /** + * Gets the value of the any property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the any property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getAny().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Element } + * {@link Object } + * + * + */ + public List<Object> getAny() { + if (any == null) { + any = new ArrayList<Object>(); + } + return this.any; + } + + /** + * Gets a map that contains attributes that aren't bound to any typed property on this class. + * + * <p> + * the map is keyed by the name of the attribute and + * the value is the string value of the attribute. + * + * the map returned by this method is live, and you can add new attribute + * by updating the map directly. Because of this design, there's no setter. + * + * + * @return + * always non-null + */ + public Map<QName, String> getOtherAttributes() { + return otherAttributes; + } + +} Added: framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ObjectFactory.java =================================================================== --- framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ObjectFactory.java (rev 0) +++ framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ObjectFactory.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,242 @@ +/* + * 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.w3._2005._08.addressing; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; +import javax.xml.ws.wsaddressing.W3CEndpointReference; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.w3._2005._08.addressing package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _RetryAfter_QNAME = new QName("http://www.w3.org/2005/08/addressing", "RetryAfter"); + private final static QName _ProblemIRI_QNAME = new QName("http://www.w3.org/2005/08/addressing", "ProblemIRI"); + private final static QName _ProblemHeaderQName_QNAME = new QName("http://www.w3.org/2005/08/addressing", "ProblemHeaderQName"); + private final static QName _To_QNAME = new QName("http://www.w3.org/2005/08/addressing", "To"); + private final static QName _ProblemAction_QNAME = new QName("http://www.w3.org/2005/08/addressing", "ProblemAction"); + private final static QName _RelatesTo_QNAME = new QName("http://www.w3.org/2005/08/addressing", "RelatesTo"); + private final static QName _ReferenceParameters_QNAME = new QName("http://www.w3.org/2005/08/addressing", "ReferenceParameters"); + private final static QName _From_QNAME = new QName("http://www.w3.org/2005/08/addressing", "From"); + private final static QName _ReplyTo_QNAME = new QName("http://www.w3.org/2005/08/addressing", "ReplyTo"); + private final static QName _Metadata_QNAME = new QName("http://www.w3.org/2005/08/addressing", "Metadata"); + private final static QName _Action_QNAME = new QName("http://www.w3.org/2005/08/addressing", "Action"); + private final static QName _MessageID_QNAME = new QName("http://www.w3.org/2005/08/addressing", "MessageID"); + private final static QName _FaultTo_QNAME = new QName("http://www.w3.org/2005/08/addressing", "FaultTo"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2005._08.addressing + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link ReferenceParametersType } + * + */ + public ReferenceParametersType createReferenceParametersType() { + return new ReferenceParametersType(); + } + + /** + * Create an instance of {@link ProblemActionType } + * + */ + public ProblemActionType createProblemActionType() { + return new ProblemActionType(); + } + + /** + * Create an instance of {@link AttributedQNameType } + * + */ + public AttributedQNameType createAttributedQNameType() { + return new AttributedQNameType(); + } + + /** + * Create an instance of {@link AttributedURIType } + * + */ + public AttributedURIType createAttributedURIType() { + return new AttributedURIType(); + } + + /** + * Create an instance of {@link RelatesToType } + * + */ + public RelatesToType createRelatesToType() { + return new RelatesToType(); + } + + /** + * Create an instance of {@link MetadataType } + * + */ + public MetadataType createMetadataType() { + return new MetadataType(); + } + + /** + * Create an instance of {@link AttributedUnsignedLongType } + * + */ + public AttributedUnsignedLongType createAttributedUnsignedLongType() { + return new AttributedUnsignedLongType(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AttributedUnsignedLongType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "RetryAfter") + public JAXBElement<AttributedUnsignedLongType> createRetryAfter(AttributedUnsignedLongType value) { + return new JAXBElement<AttributedUnsignedLongType>(_RetryAfter_QNAME, AttributedUnsignedLongType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AttributedURIType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "ProblemIRI") + public JAXBElement<AttributedURIType> createProblemIRI(AttributedURIType value) { + return new JAXBElement<AttributedURIType>(_ProblemIRI_QNAME, AttributedURIType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AttributedQNameType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "ProblemHeaderQName") + public JAXBElement<AttributedQNameType> createProblemHeaderQName(AttributedQNameType value) { + return new JAXBElement<AttributedQNameType>(_ProblemHeaderQName_QNAME, AttributedQNameType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AttributedURIType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "To") + public JAXBElement<AttributedURIType> createTo(AttributedURIType value) { + return new JAXBElement<AttributedURIType>(_To_QNAME, AttributedURIType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ProblemActionType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "ProblemAction") + public JAXBElement<ProblemActionType> createProblemAction(ProblemActionType value) { + return new JAXBElement<ProblemActionType>(_ProblemAction_QNAME, ProblemActionType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RelatesToType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "RelatesTo") + public JAXBElement<RelatesToType> createRelatesTo(RelatesToType value) { + return new JAXBElement<RelatesToType>(_RelatesTo_QNAME, RelatesToType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceParametersType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "ReferenceParameters") + public JAXBElement<ReferenceParametersType> createReferenceParameters(ReferenceParametersType value) { + return new JAXBElement<ReferenceParametersType>(_ReferenceParameters_QNAME, ReferenceParametersType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link W3CEndpointReference }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "From") + public JAXBElement<W3CEndpointReference> createFrom(W3CEndpointReference value) { + return new JAXBElement<W3CEndpointReference>(_From_QNAME, W3CEndpointReference.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link W3CEndpointReference }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "ReplyTo") + public JAXBElement<W3CEndpointReference> createReplyTo(W3CEndpointReference value) { + return new JAXBElement<W3CEndpointReference>(_ReplyTo_QNAME, W3CEndpointReference.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link MetadataType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "Metadata") + public JAXBElement<MetadataType> createMetadata(MetadataType value) { + return new JAXBElement<MetadataType>(_Metadata_QNAME, MetadataType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AttributedURIType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "Action") + public JAXBElement<AttributedURIType> createAction(AttributedURIType value) { + return new JAXBElement<AttributedURIType>(_Action_QNAME, AttributedURIType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AttributedURIType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "MessageID") + public JAXBElement<AttributedURIType> createMessageID(AttributedURIType value) { + return new JAXBElement<AttributedURIType>(_MessageID_QNAME, AttributedURIType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link W3CEndpointReference }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2005/08/addressing", name = "FaultTo") + public JAXBElement<W3CEndpointReference> createFaultTo(W3CEndpointReference value) { + return new JAXBElement<W3CEndpointReference>(_FaultTo_QNAME, W3CEndpointReference.class, null, value); + } + +} Added: framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ProblemActionType.java =================================================================== --- framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ProblemActionType.java (rev 0) +++ framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ProblemActionType.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,137 @@ +/* + * 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.w3._2005._08.addressing; + +import java.util.HashMap; +import java.util.Map; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.namespace.QName; + + +/** + * <p>Java class for ProblemActionType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ProblemActionType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{http://www.w3.org/2005/08/addressing}Action" minOccurs="0"/> + * <element name="SoapAction" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/> + * </sequence> + * <anyAttribute processContents='lax' namespace='##other'/> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ProblemActionType", propOrder = { + "action", + "soapAction" +}) +public class ProblemActionType { + + @XmlElement(name = "Action") + protected AttributedURIType action; + @XmlElement(name = "SoapAction") + @XmlSchemaType(name = "anyURI") + protected String soapAction; + @XmlAnyAttribute + private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + + /** + * Gets the value of the action property. + * + * @return + * possible object is + * {@link AttributedURIType } + * + */ + public AttributedURIType getAction() { + return action; + } + + /** + * Sets the value of the action property. + * + * @param value + * allowed object is + * {@link AttributedURIType } + * + */ + public void setAction(AttributedURIType value) { + this.action = value; + } + + /** + * Gets the value of the soapAction property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSoapAction() { + return soapAction; + } + + /** + * Sets the value of the soapAction property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSoapAction(String value) { + this.soapAction = value; + } + + /** + * Gets a map that contains attributes that aren't bound to any typed property on this class. + * + * <p> + * the map is keyed by the name of the attribute and + * the value is the string value of the attribute. + * + * the map returned by this method is live, and you can add new attribute + * by updating the map directly. Because of this design, there's no setter. + * + * + * @return + * always non-null + */ + public Map<QName, String> getOtherAttributes() { + return otherAttributes; + } + +} Added: framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ReferenceParametersType.java =================================================================== --- framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ReferenceParametersType.java (rev 0) +++ framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/ReferenceParametersType.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,116 @@ +/* + * 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.w3._2005._08.addressing; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyAttribute; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.namespace.QName; +import org.w3c.dom.Element; + + +/** + * <p>Java class for ReferenceParametersType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ReferenceParametersType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any processContents='lax' maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <anyAttribute processContents='lax' namespace='##other'/> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ReferenceParametersType", propOrder = { + "any" +}) +public class ReferenceParametersType { + + @XmlAnyElement(lax = true) + protected List<Object> any; + @XmlAnyAttribute + private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + + /** + * Gets the value of the any property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the any property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getAny().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Element } + * {@link Object } + * + * + */ + public List<Object> getAny() { + if (any == null) { + any = new ArrayList<Object>(); + } + return this.any; + } + + /** + * Gets a map that contains attributes that aren't bound to any typed property on this class. + * + * <p> + * the map is keyed by the name of the attribute and + * the value is the string value of the attribute. + * + * the map returned by this method is live, and you can add new attribute + * by updating the map directly. Because of this design, there's no setter. + * + * + * @return + * always non-null + */ + public Map<QName, String> getOtherAttributes() { + return otherAttributes; + } + +} Added: framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/RelatesToType.java =================================================================== --- framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/RelatesToType.java (rev 0) +++ framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/RelatesToType.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,138 @@ +/* + * 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.w3._2005._08.addressing; + +import java.util.HashMap; +import java.util.Map; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyAttribute; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.namespace.QName; + + +/** + * <p>Java class for RelatesToType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="RelatesToType"> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>anyURI"> + * <attribute name="RelationshipType" type="{http://www.w3.org/2005/08/addressing}RelationshipTypeOpenEnum" default="http://www.w3.org/2005/08/addressing/reply" /> + * <anyAttribute processContents='lax' namespace='##other'/> + * </extension> + * </simpleContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "RelatesToType", propOrder = { + "value" +}) +public class RelatesToType { + + @XmlValue + @XmlSchemaType(name = "anyURI") + protected String value; + @XmlAttribute(name = "RelationshipType") + protected String relationshipType; + @XmlAnyAttribute + private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the relationshipType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRelationshipType() { + if (relationshipType == null) { + return "http://www.w3.org/2005/08/addressing/reply"; + } else { + return relationshipType; + } + } + + /** + * Sets the value of the relationshipType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRelationshipType(String value) { + this.relationshipType = value; + } + + /** + * Gets a map that contains attributes that aren't bound to any typed property on this class. + * + * <p> + * the map is keyed by the name of the attribute and + * the value is the string value of the attribute. + * + * the map returned by this method is live, and you can add new attribute + * by updating the map directly. Because of this design, there's no setter. + * + * + * @return + * always non-null + */ + public Map<QName, String> getOtherAttributes() { + return otherAttributes; + } + +} Added: framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/package-info.java =================================================================== --- framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/package-info.java (rev 0) +++ framework/trunk/testsuite/test/java/org/w3/_2005/_08/addressing/package-info.java 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,23 @@ +/* + * 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. + */ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2005/08/addressing", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.w3._2005._08.addressing; Added: framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/jboss-web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/jboss-web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/jboss-web.xml 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-jbws3008</context-root> +</jboss-web> \ No newline at end of file Added: framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/web.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/web.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/web.xml 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <servlet-name>Endpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws3008.AddNumbersImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Endpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Added: framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/wsdl/AddNumbersService.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/wsdl/AddNumbersService.wsdl (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws3008/WEB-INF/wsdl/AddNumbersService.wsdl 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="AddNumbersService" targetNamespace="http://foobar.org/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.w3.org/2005/08/addressing" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://foobar.org/" xmlns:wsa="http://www.w3.org/2007/05/addressing/metadata" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <types> + <xs:schema targetNamespace="http://foobar.org/" version="1.0" xmlns:ns1="http://www.w3.org/2005/08/addressing" xmlns:tns="http://foobar.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/> + <xs:element name="doAddNumbers" type="tns:doAddNumbers"/> + <xs:element name="doAddNumbersResponse" type="tns:doAddNumbersResponse"/> + <xs:element name="getW3CEPR1" type="tns:getW3CEPR1"/> + <xs:element name="getW3CEPR1Response" type="tns:getW3CEPR1Response"/> + <xs:element name="getW3CEPR2" type="tns:getW3CEPR2"/> + <xs:element name="getW3CEPR2Response" type="tns:getW3CEPR2Response"/> + <xs:complexType name="getW3CEPR1"> + <xs:sequence/> + </xs:complexType> + <xs:complexType name="getW3CEPR1Response"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="ns1:EndpointReferenceType"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="getW3CEPR2"> + <xs:sequence/> + </xs:complexType> + <xs:complexType name="getW3CEPR2Response"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="ns1:EndpointReferenceType"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="doAddNumbers"> + <xs:sequence> + <xs:element name="arg0" type="xs:int"/> + <xs:element name="arg1" type="xs:int"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="doAddNumbersResponse"> + <xs:sequence> + <xs:element name="return" type="xs:int"/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name="AddNumbers_doAddNumbersResponse"> + <part element="tns:doAddNumbersResponse" name="doAddNumbersResponse"/> + </message> + <message name="AddNumbers_getW3CEPR2"> + <part element="tns:getW3CEPR2" name="getW3CEPR2"/> + </message> + <message name="AddNumbers_getW3CEPR1Response"> + <part element="tns:getW3CEPR1Response" name="getW3CEPR1Response"/> + </message> + <message name="AddNumbers_getW3CEPR1"> + <part element="tns:getW3CEPR1" name="getW3CEPR1"/> + </message> + <message name="AddNumbers_doAddNumbers"> + <part element="tns:doAddNumbers" name="doAddNumbers"/> + </message> + <message name="AddNumbers_getW3CEPR2Response"> + <part element="tns:getW3CEPR2Response" name="getW3CEPR2Response"/> + </message> + <portType name="AddNumbers"> + <operation name="doAddNumbers" parameterOrder="doAddNumbers"> + <input message="tns:AddNumbers_doAddNumbers" wsa:Action="http://foobar.org/AddNumbers/doAddNumbersRequest"/> + <output message="tns:AddNumbers_doAddNumbersResponse" wsa:Action="http://foobar.org/AddNumbers/doAddNumbersResponse"/> + </operation> + <operation name="getW3CEPR1" parameterOrder="getW3CEPR1"> + <input message="tns:AddNumbers_getW3CEPR1" wsa:Action="http://foobar.org/AddNumbers/getW3CEPR1Request"/> + <output message="tns:AddNumbers_getW3CEPR1Response" wsa:Action="http://foobar.org/AddNumbers/getW3CEPR1Response"/> + </operation> + <operation name="getW3CEPR2" parameterOrder="getW3CEPR2"> + <input message="tns:AddNumbers_getW3CEPR2" wsa:Action="http://foobar.org/AddNumbers/getW3CEPR2Request"/> + <output message="tns:AddNumbers_getW3CEPR2Response" wsa:Action="http://foobar.org/AddNumbers/getW3CEPR2Response"/> + </operation> + </portType> + <binding name="AddNumbersBinding" type="tns:AddNumbers"> + <wsp:PolicyReference URI="#7de8198-edcb-4296-8402-54b582df03d5" xmlns:wsp="http://www.w3.org/ns/ws-policy"/> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="doAddNumbers"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + <operation name="getW3CEPR1"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + <operation name="getW3CEPR2"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <service name="AddNumbersService"> + <port binding="tns:AddNumbersBinding" name="AddNumbersPort"> + <soap:address location="http://127.0.0.1:8080/jaxws-jbws3008"/> + </port> + </service> + <wsp:Policy wsu:Id="7de8198-edcb-4296-8402-54b582df03d5" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata"> + <wsp:Policy/> + </wsam:Addressing> + </wsp:Policy> +</definitions> \ No newline at end of file Added: framework/trunk/testsuite/test/resources/jaxws/jbws3008/customfile.xml =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/jbws3008/customfile.xml (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/jbws3008/customfile.xml 2010-04-30 10:52:17 UTC (rev 12128) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<jaxws:bindings + wsdlLocation="AddNumbersService.wsdl" + xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <jaxws:bindings node="wsdl:definitions"> + <jaxws:package name="org.jboss.test.ws.jaxws.jbws3008.generated"/> + </jaxws:bindings> +  + <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://foobar.org/']"> + <jaxb:schemaBindings> + <jaxb:package name="org.jboss.test.ws.jaxws.jbws3008.generated"/> + </jaxb:schemaBindings> + </jaxws:bindings> + +</jaxws:bindings>

14 years

1
0
0 / 0

JBossWS SVN: r12127 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-04-30 06:27:14 -0400 (Fri, 30 Apr 2010) New Revision: 12127 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java Log: [JBWS-2686] rollback the rollback - IOW the fix is effective again Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2010-04-30 08:11:02 UTC (rev 12126) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2010-04-30 10:27:14 UTC (rev 12127) @@ -77,7 +77,17 @@ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); unmarshaller.setAttachmentUnmarshaller( new AttachmentUnmarshallerImpl()); + + //workaround for https://jira.jboss.org/jira/browse/JBWS-2686 while waiting for Sun's bug to be fixed + unmarshaller.setEventHandler(new ValidationEventHandler() { + public boolean handleEvent(final ValidationEvent event) + { + int severity = event.getSeverity(); + return (severity != ValidationEvent.FATAL_ERROR && severity != ValidationEvent.ERROR); + } + }); + JAXBElement jbe = unmarshaller.unmarshal(xmlFragment, javaType); value = jbe.getValue();

14 years

1
0
0 / 0

JBossWS SVN: r12126 - common/trunk/src/main/java/org/jboss/wsf/common/management.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-04-30 04:11:02 -0400 (Fri, 30 Apr 2010) New Revision: 12126 Modified: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java Log: [CTS-11] JAXWS TCK workaround Modified: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2010-04-30 07:47:03 UTC (rev 12125) +++ common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2010-04-30 08:11:02 UTC (rev 12126) @@ -97,7 +97,7 @@ log.debug("Using local host: " + localHost.getHostName()); host = localHost.getHostName(); } - this.webServiceHost = host; + this.webServiceHost = "127.0.0.1".equals(host) ? "localhost" : host; // TCK workaround } public void setWebServicePort(int port)

14 years

1
0
0 / 0

JBossWS SVN: r12125 - in stack/native/trunk/modules/core/src/main/java/org/jboss: ws/extensions/addressing/jaxws and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-04-30 03:47:03 -0400 (Fri, 30 Apr 2010) New Revision: 12125 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java Log: [JBWS-3008] ensuring proper Dispatch usage with @Addressing feature Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2010-04-30 07:31:52 UTC (rev 12124) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2010-04-30 07:47:03 UTC (rev 12125) @@ -29,6 +29,7 @@ import java.util.concurrent.Future; import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import javax.xml.soap.MimeHeaders; import javax.xml.soap.SOAPException; @@ -157,17 +158,13 @@ handlerResolver.initHandlerChain(ecmd, HandlerType.PRE, true); handlerResolver.initHandlerChain(ecmd, HandlerType.ENDPOINT, true); handlerResolver.initHandlerChain(ecmd, HandlerType.POST, true); - + PortInfo portInfo = epMetaData.getPortInfo(); - List<Handler> preChain = handlerResolver.getHandlerChain(portInfo, HandlerType.PRE); - List<Handler> epChain = handlerResolver.getHandlerChain(portInfo, HandlerType.ENDPOINT); - List<Handler> postChain = handlerResolver.getHandlerChain(portInfo, HandlerType.POST); - - binding.setHandlerChain(preChain, HandlerType.PRE); - binding.setHandlerChain(epChain, HandlerType.ENDPOINT); - binding.setHandlerChain(postChain, HandlerType.POST); + this.appendHandlers(HandlerType.PRE, portInfo, binding); + this.appendHandlers(HandlerType.ENDPOINT, portInfo, binding); + this.appendHandlers(HandlerType.POST, portInfo, binding); } - + retObj = invokeInternalSOAP(obj); } else @@ -176,6 +173,21 @@ } return retObj; } + + private void appendHandlers(final HandlerType handlerType, final PortInfo portInfo, final BindingExt binding) + { + final List<Handler> resolverHandlerChain = this.handlerResolver.getHandlerChain(portInfo, handlerType); + final List<Handler> bindingHandlerChain = binding.getHandlerChain(handlerType); + + if (bindingHandlerChain == null || bindingHandlerChain.size() == 0) + { + binding.setHandlerChain(resolverHandlerChain, handlerType); + } + else + { + bindingHandlerChain.addAll(resolverHandlerChain); + } + } private Object invokeInternalSOAP(Object obj) throws Exception { @@ -261,7 +273,8 @@ if (handlerPass) { - retObj = getReturnObject(resMsg); + boolean unwrap = !(obj instanceof JAXBElement); + retObj = getReturnObject(resMsg, unwrap); } } catch (Exception ex) @@ -299,7 +312,8 @@ targetAddress = (String) callProps.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY); } MessageAbstraction resMsg = getRemotingConnection().invoke(reqMsg, targetAddress, false); - Object retObj = getReturnObject(resMsg); + boolean unwrap = !(obj instanceof JAXBElement); + Object retObj = getReturnObject(resMsg, unwrap); return retObj; } @@ -452,7 +466,7 @@ return message; } - private Object getReturnObject(MessageAbstraction resMsg) + private Object getReturnObject(MessageAbstraction resMsg, boolean unwrap) { String bindingID = bindingProvider.getBinding().getBindingID(); if (EndpointMetaData.SUPPORTED_BINDINGS.contains(bindingID) == false) @@ -467,7 +481,7 @@ else { DispatchSOAPBinding helper = new DispatchSOAPBinding(mode, type, jaxbContext); - retObj = helper.getReturnObject(resMsg); + retObj = helper.getReturnObject(resMsg, unwrap); } return retObj; } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2010-04-30 07:31:52 UTC (rev 12124) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2010-04-30 07:47:03 UTC (rev 12125) @@ -142,7 +142,7 @@ return reqMsg; } - public Object getReturnObject(MessageAbstraction message) + public Object getReturnObject(MessageAbstraction message, boolean unwrap) { SOAPMessage resMsg = (SOAPMessage)message; @@ -187,7 +187,7 @@ log.debug("JAXB unmarshal: " + DOMWriter.printNode(soapElement, false)); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); retObj = unmarshaller.unmarshal(soapElement); - if (retObj instanceof JAXBElement<?>) + if ((retObj instanceof JAXBElement<?>) && unwrap) { retObj = ((JAXBElement<?>)retObj).getValue(); } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2010-04-30 07:31:52 UTC (rev 12124) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2010-04-30 07:47:03 UTC (rev 12125) @@ -199,7 +199,7 @@ private AttributedURI getAction(final MessageContext msgContext) { - String action = null; + String action = "UNSPECIFIED"; if (msgContext.get(BindingProvider.SOAPACTION_URI_PROPERTY) != null) action = msgContext.get(BindingProvider.SOAPACTION_URI_PROPERTY).toString(); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2010-04-30 07:31:52 UTC (rev 12124) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2010-04-30 07:47:03 UTC (rev 12125) @@ -255,8 +255,7 @@ if (soapHeader == null) { - log.warn("No SOAP headers found!"); - return; + soapHeader = message.getSOAPPart().getEnvelope().addHeader(); } // Add the xmlns:wsa declaration Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2010-04-30 07:31:52 UTC (rev 12124) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2010-04-30 07:47:03 UTC (rev 12125) @@ -56,20 +56,22 @@ public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, final Element... referenceParameters) { - EndpointMetaData epMetaData = ((CommonMessageContext)getMessageContext()).getEndpointMetaData(); - if (epMetaData == null) + EndpointMetaData endpointMD = ((CommonMessageContext)getMessageContext()).getEndpointMetaData(); + if (endpointMD == null) { throw new WebServiceException("Cannot get EndpointMetaData!"); } - if (HTTPBinding.HTTP_BINDING.equals(epMetaData.getBindingId())) + if (HTTPBinding.HTTP_BINDING.equals(endpointMD.getBindingId())) { throw new UnsupportedOperationException("Cannot get epr when using the XML/HTTP binding"); } W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder(); - String address = epMetaData.getEndpointAddress(); + String address = endpointMD.getEndpointAddress(); builder.address(address); builder.wsdlDocumentLocation(address + "?wsdl"); - //TODO set other parameters in the builder + builder.serviceName(endpointMD.getServiceMetaData().getServiceName()); + builder.endpointName(endpointMD.getPortName()); + if (referenceParameters != null && W3CEndpointReference.class.getName().equals(clazz.getName())) { for (Element el : referenceParameters)

14 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2010