jbossws-commits April 2008

jbossws-commits@lists.jboss.org

2 participants
619 discussions

JBossWS SVN: r6234 - in stack/cxf/trunk: ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 07:58:14 -0400 (Fri, 04 Apr 2008) New Revision: 6234 Modified: stack/cxf/trunk/ant-import/build-testsuite.xml stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt stack/cxf/trunk/version.properties Log: [JBWS-2096] Migrate common jax-ws tests to framework (WIP) Modified: stack/cxf/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite.xml 2008-04-04 11:17:34 UTC (rev 6233) +++ stack/cxf/trunk/ant-import/build-testsuite.xml 2008-04-04 11:58:14 UTC (rev 6234) @@ -52,11 +52,27 @@ </target> +  +  +  + + <target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts"> + +  + </target> +    - <target name="tests-compile" depends="tests-init" description="Compile sources"> + <target name="tests-compile" depends="wsconsume" description="Compile sources"> <macro-compile-classes srcdir="${int.cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> <macro-compile-classes srcdir="${int.cxf.dir}/src/test/java" excludesfile="${excludesfile}"/> </target> Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-04-04 11:17:34 UTC (rev 6233) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-04-04 11:58:14 UTC (rev 6234) @@ -84,7 +84,10 @@ <target name="thirdparty-classpath" depends="thirdparty-get"> <path id="cxf.integration.classpath"> -  +  <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt =================================================================== --- stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-04 11:17:34 UTC (rev 6233) +++ stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-04 11:58:14 UTC (rev 6234) @@ -4,7 +4,28 @@ # EJB3/Injection excludes org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** +# [JBWS-1774] Provide tools implementation for CXF +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-2105] Remove dependency on native wsdl model +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jbws1190/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1529/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1809/** +org/jboss/test/ws/jaxws/jbws1904/** +org/jboss/test/ws/jaxws/jbws1909/** +org/jboss/test/ws/jaxws/jbws1969/** +org/jboss/test/ws/jaxws/jbws860/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/webfault/** + # [JBWS-1683] Fix JAXR samples for CXF org/jboss/test/ws/jaxws/samples/jaxr/** Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt =================================================================== --- stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-04 11:17:34 UTC (rev 6233) +++ stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-04 11:58:14 UTC (rev 6234) @@ -4,7 +4,28 @@ # EJB3/Injection excludes org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** +# [JBWS-1774] Provide tools implementation for CXF +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-2105] Remove dependency on native wsdl model +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jbws1190/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1529/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1809/** +org/jboss/test/ws/jaxws/jbws1904/** +org/jboss/test/ws/jaxws/jbws1909/** +org/jboss/test/ws/jaxws/jbws1969/** +org/jboss/test/ws/jaxws/jbws860/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/webfault/** + # [JBWS-1683] Fix JAXR samples for CXF org/jboss/test/ws/jaxws/samples/jaxr/** Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-04 11:17:34 UTC (rev 6233) +++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-04 11:58:14 UTC (rev 6234) @@ -2,6 +2,26 @@ # $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun(a)jboss.com $ # +# [JBWS-1774] Provide tools implementation for CXF +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-2105] Remove dependency on native wsdl model +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jbws1190/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1529/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1809/** +org/jboss/test/ws/jaxws/jbws1904/** +org/jboss/test/ws/jaxws/jbws1909/** +org/jboss/test/ws/jaxws/jbws1969/** +org/jboss/test/ws/jaxws/jbws860/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/webfault/** + # [JBWS-1683] Fix JAXR samples for CXF org/jboss/test/ws/jaxws/samples/jaxr/** Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-04 11:17:34 UTC (rev 6233) +++ stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-04 11:58:14 UTC (rev 6234) @@ -2,6 +2,26 @@ # $Id$ # +# [JBWS-1774] Provide tools implementation for CXF +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-2105] Remove dependency on native wsdl model +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jbws1190/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1529/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1809/** +org/jboss/test/ws/jaxws/jbws1904/** +org/jboss/test/ws/jaxws/jbws1909/** +org/jboss/test/ws/jaxws/jbws1969/** +org/jboss/test/ws/jaxws/jbws860/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/webfault/** + # [JBWS-1683] Fix JAXR samples for CXF org/jboss/test/ws/jaxws/samples/jaxr/** @@ -31,4 +51,5 @@ # TODO: Fix classpath to ClientLauncher org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2008-04-04 11:17:34 UTC (rev 6233) +++ stack/cxf/trunk/version.properties 2008-04-04 11:58:14 UTC (rev 6234) @@ -33,8 +33,8 @@ # Thirdparty library versions jbossws-spi=1.0.2.GA -jbossws-common=1.0.4.GA -jbossws-framework=3.0.1.GA +jbossws-common=snapshot +jbossws-framework=snapshot jbossws-jboss42=4.2.1.GA apache-xml-commons=1.2

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6233 - stack/native/trunk/ant-import-tests.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 07:17:34 -0400 (Fri, 04 Apr 2008) New Revision: 6233 Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml Log: [JBWS-2096] Migrate common jax-ws tests to framework (WIP) Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 11:17:16 UTC (rev 6232) +++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 11:17:34 UTC (rev 6233) @@ -90,8 +90,8 @@ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.framework.resources.dir}/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.framework.resources.dir}/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> </target> <!--

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6232 - in framework/trunk/src/test: resources and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 07:17:16 -0400 (Fri, 04 Apr 2008) New Revision: 6232 Added: framework/trunk/src/test/resources/jaxws/anonymous/ framework/trunk/src/test/resources/jaxws/binding/ framework/trunk/src/test/resources/jaxws/complex/ framework/trunk/src/test/resources/jaxws/endpoint/ framework/trunk/src/test/resources/jaxws/handlerscope/ framework/trunk/src/test/resources/jaxws/holder/ framework/trunk/src/test/resources/jaxws/jbws1190/ framework/trunk/src/test/resources/jaxws/jbws1357/ framework/trunk/src/test/resources/jaxws/jbws1529/ framework/trunk/src/test/resources/jaxws/jbws1556/ framework/trunk/src/test/resources/jaxws/jbws1581/ framework/trunk/src/test/resources/jaxws/jbws1611/ framework/trunk/src/test/resources/jaxws/jbws1666/ framework/trunk/src/test/resources/jaxws/jbws1702/ framework/trunk/src/test/resources/jaxws/jbws1733/ framework/trunk/src/test/resources/jaxws/jbws1762/ framework/trunk/src/test/resources/jaxws/jbws1797/ framework/trunk/src/test/resources/jaxws/jbws1798/ framework/trunk/src/test/resources/jaxws/jbws1807/ framework/trunk/src/test/resources/jaxws/jbws1809/ framework/trunk/src/test/resources/jaxws/jbws1813/ framework/trunk/src/test/resources/jaxws/jbws1815/ framework/trunk/src/test/resources/jaxws/jbws1822/ framework/trunk/src/test/resources/jaxws/jbws1841/ framework/trunk/src/test/resources/jaxws/jbws1843/ framework/trunk/src/test/resources/jaxws/jbws1854/ framework/trunk/src/test/resources/jaxws/jbws1969/ framework/trunk/src/test/resources/jaxws/jbws2009/ framework/trunk/src/test/resources/jaxws/jbws860/ framework/trunk/src/test/resources/jaxws/namespace/ framework/trunk/src/test/resources/jaxws/webfault/ framework/trunk/src/test/resources/jaxws/webserviceref/ framework/trunk/src/test/resources/jaxws/wrapped/ Removed: framework/trunk/src/test/resources/anonymous/ framework/trunk/src/test/resources/binding/ framework/trunk/src/test/resources/complex/ framework/trunk/src/test/resources/endpoint/ framework/trunk/src/test/resources/handlerscope/ framework/trunk/src/test/resources/holder/ framework/trunk/src/test/resources/jbws1190/ framework/trunk/src/test/resources/jbws1357/ framework/trunk/src/test/resources/jbws1529/ framework/trunk/src/test/resources/jbws1556/ framework/trunk/src/test/resources/jbws1581/ framework/trunk/src/test/resources/jbws1611/ framework/trunk/src/test/resources/jbws1666/ framework/trunk/src/test/resources/jbws1702/ framework/trunk/src/test/resources/jbws1733/ framework/trunk/src/test/resources/jbws1762/ framework/trunk/src/test/resources/jbws1797/ framework/trunk/src/test/resources/jbws1798/ framework/trunk/src/test/resources/jbws1807/ framework/trunk/src/test/resources/jbws1809/ framework/trunk/src/test/resources/jbws1813/ framework/trunk/src/test/resources/jbws1815/ framework/trunk/src/test/resources/jbws1822/ framework/trunk/src/test/resources/jbws1841/ framework/trunk/src/test/resources/jbws1843/ framework/trunk/src/test/resources/jbws1854/ framework/trunk/src/test/resources/jbws1969/ framework/trunk/src/test/resources/jbws2009/ framework/trunk/src/test/resources/jbws860/ framework/trunk/src/test/resources/namespace/ framework/trunk/src/test/resources/webfault/ framework/trunk/src/test/resources/webserviceref/ framework/trunk/src/test/resources/wrapped/ Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml Log: [JBWS-2096] Migrate common jax-ws tests to framework (WIP) Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-04 11:04:50 UTC (rev 6231) +++ framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-04 11:17:16 UTC (rev 6232) @@ -21,7 +21,7 @@ <mkdir dir="${tests.output.dir}/libs"/>  - <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/anonymous/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/> <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/> @@ -31,7 +31,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/binding/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/> @@ -55,7 +55,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/complex/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/complex/*.class"/> <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/> @@ -65,19 +65,19 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/endpoint/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/endpoint/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF"> <include name="wsdl/**"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/handlerscope/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/> @@ -87,19 +87,19 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/holder/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/> </classes> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jbws860/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jbws860/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -124,7 +124,7 @@ </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jbws1190/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/> @@ -141,12 +141,12 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jbws1357/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/> <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/> </classes> - <fileset dir="${tests.output.dir}/resources/jbws1357"> + <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357"> <include name="hello.jsp"/> </fileset> </war> @@ -175,7 +175,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jbws1529/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/> <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/> @@ -194,7 +194,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1556.jar"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1556/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1556/META-INF"> <include name="application.xml"/> <include name="jboss-app.xml"/> </metainf> @@ -208,12 +208,12 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jbws1581/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jbws1581/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -221,7 +221,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1581.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1581/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> <include name="application.xml"/> <include name="jboss-app.xml"/> </metainf> @@ -232,20 +232,20 @@ <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1581/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> <include name="wsdl/**"/> </metainf> </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jbws1611/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jaxws/jbws1611/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.class"/> </classes> </war>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jbws1666/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jaxws/jbws1666/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/> </classes> @@ -259,15 +259,15 @@ </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/resources/jbws1702/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1702/**/*.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jbws1702/WEB-INF"/> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF"/> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/resources/jbws1733/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/resources/jaxws/jbws1733/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733.class"/> <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.class"/> @@ -282,12 +282,12 @@ </jar> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jbws1762/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jbws1762/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -297,31 +297,31 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1762-packaged.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1762/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> - <copy file="${tests.output.dir}/resources/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> + <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear"> <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1762-packaged.jar"/> <include name="jaxws-jbws1762-packaged.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1762/META-INF/packaged"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged"> <include name="application.xml"/> </metainf> </jar> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> - <copy file="${tests.output.dir}/resources/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> + <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/> <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jbws1797/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jaxws/jbws1797/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1797/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1797/*TestCase.class"/> @@ -329,12 +329,12 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jbws1798/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1798/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1798/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jbws1798/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> @@ -348,11 +348,11 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/resources/jbws1807/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jbws1807/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> @@ -363,7 +363,7 @@ <include name="org/jboss/test/ws/jaxws/jbws1809/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1809/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1809/META-INF"/> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1809/META-INF"/> </jar>  @@ -371,7 +371,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1813/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> <include name="jboss.xml"/> </metainf> </jar> @@ -379,7 +379,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1813.jar"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1813/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> <include name="application.xml"/> </metainf> </jar> @@ -389,7 +389,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1815/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1815/META-INF"> <include name="wsdl/my-service.wsdl"/> </metainf> </jar> @@ -415,15 +415,15 @@ <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> </fileset> </jar> - <ear appxml="${tests.output.dir}/resources/jbws1822/two-ejb-modules/META-INF/application.xml" + <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml" earfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb-modules.ear"> - <metainf dir="${tests.output.dir}/resources/jbws1822/two-ejb-modules/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF"> <include name="jboss-app.xml"/> </metainf> <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar" /> <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar" /> </ear> - <ear appxml="${tests.output.dir}/resources/jbws1822/one-ejb-module/META-INF/application.xml" + <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml" earfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb-module.ear"> <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar" /> </ear> @@ -440,7 +440,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1841/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1841/META-INF"> <include name="wsdl/*"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> @@ -448,12 +448,12 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jbws1843/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1843/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1843/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jbws1843/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> @@ -467,11 +467,11 @@ </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jbws1854/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jbws1854/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -479,7 +479,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1854.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1854/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1854/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> @@ -515,7 +515,7 @@ <include name="org/jboss/test/ws/jaxws/jbws1969/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1969/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jbws1969/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1969/META-INF"> <include name="wsdl/**"/> </metainf> </jar> @@ -529,30 +529,30 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jbws2009/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws2009/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws2009/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jbws2009/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF"> <include name="wsdl/**"/> <include name="schema/**"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/namespace/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/namespace/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/samples/asynchronous/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> @@ -560,11 +560,11 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/samples/context/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/samples/context/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -572,17 +572,17 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/samples/context/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/context/META-INF"> <include name="jboss.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/resources/samples/eardeployment/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/samples/eardeployment/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> @@ -591,7 +591,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/samples/eardeployment/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> <include name="wsdl/**"/> </metainf> </jar> @@ -600,7 +600,7 @@ <include name="jaxws-samples-eardeployment.jar"/> <include name="jaxws-samples-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/samples/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> <include name="jboss-app.xml"/> </metainf> </jar> @@ -609,13 +609,13 @@ <include name="jaxws-samples-eardeployment.jar"/> <include name="jaxws-samples-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/samples/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> <include name="application.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/samples/exception/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/> <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/> @@ -627,7 +627,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/samples/handlerchain/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> @@ -637,30 +637,30 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/samples/httpbinding/jaxb/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/samples/httpbinding/shared"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> <include name="wsdl/HttpBinding.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/samples/httpbinding/payload/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/samples/httpbinding/shared"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> <include name="wsdl/HttpBinding.wsdl"/> </webinf> </war>  <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" - webxml="${tests.output.dir}/resources/samples/logicalhandler/WEB-INF/web-source.xml"> + webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> @@ -673,7 +673,7 @@ </classes> </war> <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" - webxml="${tests.output.dir}/resources/samples/logicalhandler/WEB-INF/web-jaxb.xml"> + webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> @@ -688,38 +688,38 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/samples/oneway/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> </classes> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/samples/provider/jaxb/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/samples/provider/jaxb/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/samples/provider/message/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/samples/provider/message/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/samples/provider/payload/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/samples/provider/payload/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> @@ -730,13 +730,13 @@ <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/**/*.class"/> <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/jaxws-handler.xml"/> </fileset> - <metainf dir="${tests.output.dir}/resources/samples/advanced/retail/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/advanced/retail/META-INF"> <include name="wsdl/*"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/samples/serviceref/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> @@ -749,22 +749,22 @@ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/samples/serviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/samples/serviceref/servlet-client/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/samples/serviceref/META-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/samples/serviceref/servlet-client/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -775,7 +775,7 @@ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/samples/serviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="wsdl/**"/> @@ -783,7 +783,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/samples/soapbinding/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/**"/> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.class"/> @@ -812,7 +812,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/samples/webmethod/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> @@ -820,7 +820,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/samples/webparam/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> @@ -829,7 +829,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/samples/webresult/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> @@ -838,20 +838,20 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/samples/webservice/WEB-INF01/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> </classes> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/samples/webservice/WEB-INF02/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/samples/webservice/WEB-INF02"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> <include name="wsdl/**"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/samples/webservice/WEB-INF03/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> @@ -868,7 +868,7 @@ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/samples/webservice/META-INF02"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> <include name="wsdl/**"/> </metainf> </jar> @@ -881,7 +881,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/webfault/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/jaxws/webfault/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webfault/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.class"/> @@ -891,7 +891,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/samples/webserviceref/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> </classes> @@ -903,7 +903,7 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/samples/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> @@ -914,7 +914,7 @@ </jar> <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/samples/webserviceref/WEB-INF-client/web.xml"> + webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> @@ -922,10 +922,10 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/samples/webserviceref/META-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/samples/webserviceref/WEB-INF-client"> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> <include name="jboss-web.xml"/> </webinf> </war> @@ -939,14 +939,14 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/samples/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> <include name="jboss.xml"/> <include name="wsdl/**"/> </metainf> </jar>  - <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/samples/xop/doclit/WEB-INF/web.xml"> + <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws/**"/> @@ -956,7 +956,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/webserviceref/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/> </classes> @@ -967,7 +967,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> @@ -977,7 +977,7 @@ </manifest> </jar> <war destfile="${tests.output.dir}/libs/jaxws-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/webserviceref/WEB-INF-client/web.xml"> + webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> @@ -985,10 +985,10 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/webserviceref/META-INF"> + <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/webserviceref/WEB-INF-client"> + <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client"> <include name="jboss-web.xml"/> </webinf> </war> @@ -1001,7 +1001,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> <include name="jboss.xml"/> <include name="wsdl/**"/> </metainf> @@ -1017,7 +1017,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-secure"> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> @@ -1031,12 +1031,12 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-override"> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> <include name="jbossws-client-config.xml"/> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> <include name="wsdl/**"/> </metainf> <manifest> @@ -1056,7 +1056,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-secure"> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> @@ -1070,7 +1070,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-override"> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> <include name="jbossws-client-config.xml"/> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1082,7 +1082,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/wrapped/accessor/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/> <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/> Copied: framework/trunk/src/test/resources/jaxws/anonymous (from rev 6228, framework/trunk/src/test/resources/anonymous) Copied: framework/trunk/src/test/resources/jaxws/binding (from rev 6228, framework/trunk/src/test/resources/binding) Copied: framework/trunk/src/test/resources/jaxws/complex (from rev 6228, framework/trunk/src/test/resources/complex) Copied: framework/trunk/src/test/resources/jaxws/endpoint (from rev 6228, framework/trunk/src/test/resources/endpoint) Copied: framework/trunk/src/test/resources/jaxws/handlerscope (from rev 6228, framework/trunk/src/test/resources/handlerscope) Copied: framework/trunk/src/test/resources/jaxws/holder (from rev 6228, framework/trunk/src/test/resources/holder) Copied: framework/trunk/src/test/resources/jaxws/jbws1190 (from rev 6228, framework/trunk/src/test/resources/jbws1190) Copied: framework/trunk/src/test/resources/jaxws/jbws1357 (from rev 6228, framework/trunk/src/test/resources/jbws1357) Copied: framework/trunk/src/test/resources/jaxws/jbws1529 (from rev 6228, framework/trunk/src/test/resources/jbws1529) Copied: framework/trunk/src/test/resources/jaxws/jbws1556 (from rev 6228, framework/trunk/src/test/resources/jbws1556) Copied: framework/trunk/src/test/resources/jaxws/jbws1581 (from rev 6228, framework/trunk/src/test/resources/jbws1581) Copied: framework/trunk/src/test/resources/jaxws/jbws1611 (from rev 6228, framework/trunk/src/test/resources/jbws1611) Copied: framework/trunk/src/test/resources/jaxws/jbws1666 (from rev 6228, framework/trunk/src/test/resources/jbws1666) Copied: framework/trunk/src/test/resources/jaxws/jbws1702 (from rev 6228, framework/trunk/src/test/resources/jbws1702) Copied: framework/trunk/src/test/resources/jaxws/jbws1733 (from rev 6228, framework/trunk/src/test/resources/jbws1733) Copied: framework/trunk/src/test/resources/jaxws/jbws1762 (from rev 6228, framework/trunk/src/test/resources/jbws1762) Copied: framework/trunk/src/test/resources/jaxws/jbws1797 (from rev 6228, framework/trunk/src/test/resources/jbws1797) Copied: framework/trunk/src/test/resources/jaxws/jbws1798 (from rev 6228, framework/trunk/src/test/resources/jbws1798) Copied: framework/trunk/src/test/resources/jaxws/jbws1807 (from rev 6228, framework/trunk/src/test/resources/jbws1807) Copied: framework/trunk/src/test/resources/jaxws/jbws1809 (from rev 6228, framework/trunk/src/test/resources/jbws1809) Copied: framework/trunk/src/test/resources/jaxws/jbws1813 (from rev 6228, framework/trunk/src/test/resources/jbws1813) Copied: framework/trunk/src/test/resources/jaxws/jbws1815 (from rev 6228, framework/trunk/src/test/resources/jbws1815) Copied: framework/trunk/src/test/resources/jaxws/jbws1822 (from rev 6228, framework/trunk/src/test/resources/jbws1822) Copied: framework/trunk/src/test/resources/jaxws/jbws1841 (from rev 6228, framework/trunk/src/test/resources/jbws1841) Copied: framework/trunk/src/test/resources/jaxws/jbws1843 (from rev 6228, framework/trunk/src/test/resources/jbws1843) Copied: framework/trunk/src/test/resources/jaxws/jbws1854 (from rev 6228, framework/trunk/src/test/resources/jbws1854) Copied: framework/trunk/src/test/resources/jaxws/jbws1969 (from rev 6228, framework/trunk/src/test/resources/jbws1969) Copied: framework/trunk/src/test/resources/jaxws/jbws2009 (from rev 6228, framework/trunk/src/test/resources/jbws2009) Copied: framework/trunk/src/test/resources/jaxws/jbws860 (from rev 6228, framework/trunk/src/test/resources/jbws860) Copied: framework/trunk/src/test/resources/jaxws/namespace (from rev 6228, framework/trunk/src/test/resources/namespace) Copied: framework/trunk/src/test/resources/jaxws/webfault (from rev 6228, framework/trunk/src/test/resources/webfault) Copied: framework/trunk/src/test/resources/jaxws/webserviceref (from rev 6228, framework/trunk/src/test/resources/webserviceref) Copied: framework/trunk/src/test/resources/jaxws/wrapped (from rev 6228, framework/trunk/src/test/resources/wrapped)

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6231 - stack/native/trunk/ant-import-tests.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 07:04:50 -0400 (Fri, 04 Apr 2008) New Revision: 6231 Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml Log: [JBWS-2096] Migrate common jax-ws tests to framework (WIP) Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 11:04:45 UTC (rev 6230) +++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 11:04:50 UTC (rev 6231) @@ -21,6 +21,9 @@ <property name="tests.dir" value="${core.dir}/src/test"/> <property name="tests.java.dir" value="${tests.dir}/java"/> <property name="tests.resources.dir" value="${tests.dir}/resources"/> + + <property name="tests.framework.dir" value="${core.dir}/src/test-framework"/> + <property name="tests.framework.resources.dir" value="${tests.framework.dir}/resources"/>  <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + + <wsconsume wsdl="${tests.framework.resources.dir}/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.framework.resources.dir}/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> </target> <!--

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6230 - framework/trunk/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 07:04:45 -0400 (Fri, 04 Apr 2008) New Revision: 6230 Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml Log: [JBWS-2096] Migrate common jax-ws tests to framework (WIP) Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-04 10:54:48 UTC (rev 6229) +++ framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-04 11:04:45 UTC (rev 6230) @@ -21,7 +21,7 @@ <mkdir dir="${tests.output.dir}/libs"/>  - <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/anonymous/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/> <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/> @@ -31,7 +31,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/binding/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/> @@ -55,7 +55,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/complex/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/complex/*.class"/> <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/> @@ -65,19 +65,19 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/endpoint/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/endpoint/WEB-INF"> <include name="wsdl/**"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/handlerscope/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/> @@ -87,19 +87,19 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/holder/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/> </classes> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jbws860/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws860/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -124,7 +124,7 @@ </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jbws1190/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/> @@ -141,12 +141,12 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jbws1357/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/> <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/> </classes> - <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357"> + <fileset dir="${tests.output.dir}/resources/jbws1357"> <include name="hello.jsp"/> </fileset> </war> @@ -175,7 +175,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jbws1529/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/> <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/> @@ -194,7 +194,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1556.jar"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1556/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1556/META-INF"> <include name="application.xml"/> <include name="jboss-app.xml"/> </metainf> @@ -208,12 +208,12 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jbws1581/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1581/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -221,7 +221,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1581.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1581/META-INF"> <include name="application.xml"/> <include name="jboss-app.xml"/> </metainf> @@ -232,20 +232,20 @@ <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1581/META-INF"> <include name="wsdl/**"/> </metainf> </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jaxws/jbws1611/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jbws1611/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.class"/> </classes> </war>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jaxws/jbws1666/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jbws1666/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/> </classes> @@ -259,15 +259,15 @@ </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/resources/jbws1702/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1702/**/*.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF"/> + <webinf dir="${tests.output.dir}/resources/jbws1702/WEB-INF"/> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/resources/jaxws/jbws1733/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/resources/jbws1733/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733.class"/> <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.class"/> @@ -282,12 +282,12 @@ </jar> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jbws1762/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1762/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -297,31 +297,31 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1762-packaged.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1762/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> - <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> + <copy file="${tests.output.dir}/resources/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear"> <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1762-packaged.jar"/> <include name="jaxws-jbws1762-packaged.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged"> + <metainf dir="${tests.output.dir}/resources/jbws1762/META-INF/packaged"> <include name="application.xml"/> </metainf> </jar> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> - <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> + <copy file="${tests.output.dir}/resources/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/> <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jaxws/jbws1797/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jbws1797/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1797/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1797/*TestCase.class"/> @@ -329,12 +329,12 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jbws1798/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1798/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1798/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1798/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> @@ -348,11 +348,11 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/resources/jbws1807/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1807/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> @@ -363,7 +363,7 @@ <include name="org/jboss/test/ws/jaxws/jbws1809/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1809/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1809/META-INF"/> + <metainf dir="${tests.output.dir}/resources/jbws1809/META-INF"/> </jar>  @@ -371,7 +371,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1813/META-INF"> <include name="jboss.xml"/> </metainf> </jar> @@ -379,7 +379,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1813.jar"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1813/META-INF"> <include name="application.xml"/> </metainf> </jar> @@ -389,7 +389,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1815/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1815/META-INF"> <include name="wsdl/my-service.wsdl"/> </metainf> </jar> @@ -415,15 +415,15 @@ <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> </fileset> </jar> - <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml" + <ear appxml="${tests.output.dir}/resources/jbws1822/two-ejb-modules/META-INF/application.xml" earfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb-modules.ear"> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1822/two-ejb-modules/META-INF"> <include name="jboss-app.xml"/> </metainf> <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar" /> <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar" /> </ear> - <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml" + <ear appxml="${tests.output.dir}/resources/jbws1822/one-ejb-module/META-INF/application.xml" earfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb-module.ear"> <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar" /> </ear> @@ -440,7 +440,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1841/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1841/META-INF"> <include name="wsdl/*"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> @@ -448,12 +448,12 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jbws1843/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1843/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1843/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1843/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> @@ -467,11 +467,11 @@ </jar>  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jbws1854/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1854/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -479,7 +479,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1854.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1854/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1854/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> @@ -515,7 +515,7 @@ <include name="org/jboss/test/ws/jaxws/jbws1969/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1969/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1969/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1969/META-INF"> <include name="wsdl/**"/> </metainf> </jar> @@ -529,30 +529,30 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jbws2009/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws2009/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws2009/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws2009/WEB-INF"> <include name="wsdl/**"/> <include name="schema/**"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/namespace/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/namespace/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/samples/asynchronous/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> @@ -560,11 +560,11 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/samples/context/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/context/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -572,17 +572,17 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/context/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/context/META-INF"> <include name="jboss.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/resources/samples/eardeployment/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/eardeployment/WEB-INF"> <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> @@ -591,7 +591,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/samples/eardeployment/WEB-INF"> <include name="wsdl/**"/> </metainf> </jar> @@ -600,7 +600,7 @@ <include name="jaxws-samples-eardeployment.jar"/> <include name="jaxws-samples-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/eardeployment/META-INF"> <include name="jboss-app.xml"/> </metainf> </jar> @@ -609,13 +609,13 @@ <include name="jaxws-samples-eardeployment.jar"/> <include name="jaxws-samples-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/eardeployment/META-INF"> <include name="application.xml"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/samples/exception/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/> <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/> @@ -627,7 +627,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/samples/handlerchain/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> @@ -637,30 +637,30 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/samples/httpbinding/jaxb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <webinf dir="${tests.output.dir}/resources/samples/httpbinding/shared"> <include name="wsdl/HttpBinding.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/samples/httpbinding/payload/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <webinf dir="${tests.output.dir}/resources/samples/httpbinding/shared"> <include name="wsdl/HttpBinding.wsdl"/> </webinf> </war>  <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> + webxml="${tests.output.dir}/resources/samples/logicalhandler/WEB-INF/web-source.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> @@ -673,7 +673,7 @@ </classes> </war> <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> + webxml="${tests.output.dir}/resources/samples/logicalhandler/WEB-INF/web-jaxb.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> @@ -688,38 +688,38 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/samples/oneway/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> </classes> </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/samples/provider/jaxb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/provider/jaxb/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/samples/provider/message/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/provider/message/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/samples/provider/payload/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/provider/payload/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> @@ -730,13 +730,13 @@ <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/**/*.class"/> <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/jaxws-handler.xml"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/advanced/retail/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/advanced/retail/META-INF"> <include name="wsdl/*"/> </metainf> </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/samples/serviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> @@ -749,22 +749,22 @@ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/serviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/samples/serviceref/servlet-client/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <webinf dir="${tests.output.dir}/resources/samples/serviceref/META-INF"> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/serviceref/servlet-client/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -775,7 +775,7 @@ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/serviceref/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="wsdl/**"/> @@ -783,7 +783,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/samples/soapbinding/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/**"/> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.class"/> @@ -812,7 +812,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/samples/webmethod/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> @@ -820,7 +820,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/samples/webparam/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> @@ -829,7 +829,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/samples/webresult/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> @@ -838,20 +838,20 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/samples/webservice/WEB-INF01/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> </classes> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/samples/webservice/WEB-INF02/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> + <webinf dir="${tests.output.dir}/resources/samples/webservice/WEB-INF02"> <include name="wsdl/**"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/samples/webservice/WEB-INF03/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> @@ -868,7 +868,7 @@ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> + <metainf dir="${tests.output.dir}/resources/samples/webservice/META-INF02"> <include name="wsdl/**"/> </metainf> </jar> @@ -881,7 +881,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/jaxws/webfault/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/webfault/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webfault/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.class"/> @@ -891,7 +891,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/samples/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> </classes> @@ -903,7 +903,7 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/webserviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> @@ -914,7 +914,7 @@ </jar> <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> + webxml="${tests.output.dir}/resources/samples/webserviceref/WEB-INF-client/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> @@ -922,10 +922,10 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <webinf dir="${tests.output.dir}/resources/samples/webserviceref/META-INF"> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> + <webinf dir="${tests.output.dir}/resources/samples/webserviceref/WEB-INF-client"> <include name="jboss-web.xml"/> </webinf> </war> @@ -939,14 +939,14 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/webserviceref/META-INF"> <include name="jboss.xml"/> <include name="wsdl/**"/> </metainf> </jar>  - <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> + <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/samples/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws/**"/> @@ -956,7 +956,7 @@ </war>  - <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/> </classes> @@ -967,7 +967,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> @@ -977,7 +977,7 @@ </manifest> </jar> <war destfile="${tests.output.dir}/libs/jaxws-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client/web.xml"> + webxml="${tests.output.dir}/resources/webserviceref/WEB-INF-client/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> @@ -985,10 +985,10 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <webinf dir="${tests.output.dir}/resources/webserviceref/META-INF"> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client"> + <webinf dir="${tests.output.dir}/resources/webserviceref/WEB-INF-client"> <include name="jboss-web.xml"/> </webinf> </war> @@ -1001,7 +1001,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF"> <include name="jboss.xml"/> <include name="wsdl/**"/> </metainf> @@ -1017,7 +1017,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-secure"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> @@ -1031,12 +1031,12 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-override"> <include name="jbossws-client-config.xml"/> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF"> <include name="wsdl/**"/> </metainf> <manifest> @@ -1056,7 +1056,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-secure"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> @@ -1070,7 +1070,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-override"> <include name="jbossws-client-config.xml"/> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1082,7 +1082,7 @@ </jar>  - <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/wrapped/accessor/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/> <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6229 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 06:54:48 -0400 (Fri, 04 Apr 2008) New Revision: 6229 Removed: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/ stack/native/trunk/src/test/resources/jaxws/anonymous/ stack/native/trunk/src/test/resources/jaxws/binding/ stack/native/trunk/src/test/resources/jaxws/complex/ stack/native/trunk/src/test/resources/jaxws/endpoint/ stack/native/trunk/src/test/resources/jaxws/handlerscope/ stack/native/trunk/src/test/resources/jaxws/holder/ stack/native/trunk/src/test/resources/jaxws/jbws1190/ stack/native/trunk/src/test/resources/jaxws/jbws1357/ stack/native/trunk/src/test/resources/jaxws/jbws1529/ stack/native/trunk/src/test/resources/jaxws/jbws1556/ stack/native/trunk/src/test/resources/jaxws/jbws1581/ stack/native/trunk/src/test/resources/jaxws/jbws1611/ stack/native/trunk/src/test/resources/jaxws/jbws1666/ stack/native/trunk/src/test/resources/jaxws/jbws1702/ stack/native/trunk/src/test/resources/jaxws/jbws1733/ stack/native/trunk/src/test/resources/jaxws/jbws1762/ stack/native/trunk/src/test/resources/jaxws/jbws1797/ stack/native/trunk/src/test/resources/jaxws/jbws1798/ stack/native/trunk/src/test/resources/jaxws/jbws1807/ stack/native/trunk/src/test/resources/jaxws/jbws1809/ stack/native/trunk/src/test/resources/jaxws/jbws1813/ stack/native/trunk/src/test/resources/jaxws/jbws1815/ stack/native/trunk/src/test/resources/jaxws/jbws1822/ stack/native/trunk/src/test/resources/jaxws/jbws1841/ stack/native/trunk/src/test/resources/jaxws/jbws1843/ stack/native/trunk/src/test/resources/jaxws/jbws1854/ stack/native/trunk/src/test/resources/jaxws/jbws1969/ stack/native/trunk/src/test/resources/jaxws/jbws2009/ stack/native/trunk/src/test/resources/jaxws/jbws860/ stack/native/trunk/src/test/resources/jaxws/namespace/ stack/native/trunk/src/test/resources/jaxws/webfault/ stack/native/trunk/src/test/resources/jaxws/webserviceref/ stack/native/trunk/src/test/resources/jaxws/wrapped/ Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/ant-import-tests/build-samples-jaxws.xml stack/native/trunk/ant-import-tests/build-testsuite.xml Log: [JBWS-2096] Migrate common jax-ws tests to framework (WIP) Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-04 10:54:10 UTC (rev 6228) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-04 10:54:48 UTC (rev 6229) @@ -20,16 +20,6 @@ <mkdir dir="${tests.output.dir}/libs"/> -  - <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/> - <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/> - <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/> - <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/> - </classes> - </war> -  <war warfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -67,37 +57,6 @@ </fileset> </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/complex/*.class"/> - <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/> - <include name="org/jboss/test/ws/jaxws/complex/types/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/complex/*TestCase.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - </war> -  <jar destfile="${tests.output.dir}/libs/jaxws-epr.jar"> <fileset dir="${tests.output.dir}/classes"> @@ -136,16 +95,6 @@ </metainf> </jar> -  - <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml"/> - </classes> - </war> -  <war warfile="${tests.output.dir}/libs/jaxws-json.war" webxml="${tests.output.dir}/resources/jaxws/json/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -173,17 +122,6 @@ </fileset> </jar> -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> -  <war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -205,25 +143,6 @@ </metainf> </jar> -  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/> - <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.class"/> - <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.class"/> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/> - <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/> - </fileset> - </jar> -  <war destfile="${tests.output.dir}/libs/jaxws-jbws1172.war" webxml="${tests.output.dir}/resources/jaxws/jbws1172/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -243,288 +162,6 @@ </classes> </war> -  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/> - </classes> - </war> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/> - </classes> - <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357"> - <include name="hello.jsp"/> - </fileset> - </war> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1422/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1422/*TestCase.class"/> - </fileset> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1446.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.class"/> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1505.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1505/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1505/*TestCase.class"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/> - </classes> - </war> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1556/UserType.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.ear"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxws-jbws1556.jar"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1556/META-INF"> - <include name="application.xml"/> - <include name="jboss-app.xml"/> - </metainf> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.ear"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxws-jbws1581.war"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> - <include name="application.xml"/> - <include name="jboss-app.xml"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1422/*.*"/> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1505.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1505/*.*"/> - </fileset> - </jar> - -  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jaxws/jbws1611/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.class"/> - </classes> - </war> - -  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jaxws/jbws1666/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/> - </classes> - </war> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1694.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1694/**/*.class"/> - </fileset> - </jar> - -  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1702/**/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF"/> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/resources/jaxws/jbws1733/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.class"/> - </classes> - </war> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.class"/> - </fileset> - </jar> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> - <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> - <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.sar"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxws-jbws1762-packaged.war"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> - <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> - <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxws-jbws1762-packaged.jar"/> - <include name="jaxws-jbws1762-packaged.war"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged"> - <include name="application.xml"/> - </metainf> - </jar> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/> - <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> - <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> - <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/> - <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/> - -  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jaxws/jbws1797/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1797/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1797/*TestCase.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1798/**/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1798/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1799.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1799/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1799/*TestCase.class"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1809.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1809/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1809/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1809/META-INF"/> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1813.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> - <include name="jboss.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1813.ear"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxws-jbws1813.jar"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> - <include name="application.xml"/> - </metainf> - </jar> -  <war warfile="${tests.output.dir}/libs/jaxws-jbws1814.war" webxml="${tests.output.dir}/resources/jaxws/jbws1814/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -535,88 +172,6 @@ </webinf> </war> -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1815.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1815/META-INF"> - <include name="wsdl/my-service.wsdl"/> - </metainf> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> - </fileset> - </jar> - <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml" - earfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb-modules.ear"> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF"> - <include name="jboss-app.xml"/> - </metainf> - <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar" /> - <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar" /> - </ear> - <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml" - earfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb-module.ear"> - <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar" /> - </ear> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1840.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.class"/> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1841.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1841/META-INF"> - <include name="wsdl/*"/> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1843/**/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1843/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1845.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1845/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1845/*TestCase.class"/> - </fileset> - </jar> -  <jar destfile="${tests.output.dir}/libs/jaxws-jbws1850.jar"> <fileset dir="${tests.output.dir}/classes"> @@ -624,60 +179,6 @@ </fileset> </jar> -  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1854.sar"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxws-jbws1854.war"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1854/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1872.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1872/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1872/*TestCase*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1872/ClientIface.class"/> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1904.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1904/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1904/*TestCase.class"/> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1909.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1909/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1909/*TestCase.class"/> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1969.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1969/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1969/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1969/META-INF"> - <include name="wsdl/**"/> - </metainf> - </jar> -  <jar destfile="${tests.output.dir}/libs/jaxws-jbws1988.jar"> <fileset dir="${tests.output.dir}/classes"> @@ -710,63 +211,6 @@ </metainf> </jar> -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws2000.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws2000/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws2000/*TestCase.class"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws2009/**/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws2009/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF"> - <include name="wsdl/**"/> - <include name="schema/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/> - <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/> - <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/jaxws/webfault/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webfault/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/webfault/CustomException.class"/> - <include name="org/jboss/test/ws/jaxws/webfault/SimpleException.class"/> - </classes> - </war> -  <war warfile="${tests.output.dir}/libs/jaxws-wsdd.war" webxml="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/trunk/ant-import-tests/build-samples-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-04 10:54:10 UTC (rev 6228) +++ stack/native/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-04 10:54:48 UTC (rev 6229) @@ -306,132 +306,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> - </manifest> - </jar> - <war destfile="${tests.output.dir}/libs/jaxws-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-ejb3-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Client.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Remote.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> - <include name="jboss.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/> - </fileset> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/> - </manifest> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-override-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> - <include name="jbossws-client-config.xml"/> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/> - </manifest> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/> - </fileset> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/> - </manifest> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-override-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> - <include name="jbossws-client-config.xml"/> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/> - </manifest> - </jar> -  </target> Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 10:54:10 UTC (rev 6228) +++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 10:54:48 UTC (rev 6229) @@ -83,8 +83,10 @@ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> +  <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6228 - in framework/trunk/src/test: java/org/jboss/test/ws/jaxws/anonymous and 82 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 06:54:10 -0400 (Fri, 04 Apr 2008) New Revision: 6228 Added: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/UserType.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSRpcSEI.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Wrapped.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithRPC_Bare.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWrappedSEI.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/types/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/generated/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/ framework/trunk/src/test/resources/anonymous/ framework/trunk/src/test/resources/anonymous/WEB-INF/ framework/trunk/src/test/resources/binding/ framework/trunk/src/test/resources/binding/WEB-INF/ framework/trunk/src/test/resources/complex/ framework/trunk/src/test/resources/complex/META-INF/ framework/trunk/src/test/resources/complex/WEB-INF/ framework/trunk/src/test/resources/endpoint/ framework/trunk/src/test/resources/endpoint/WEB-INF/ framework/trunk/src/test/resources/handlerscope/ framework/trunk/src/test/resources/handlerscope/WEB-INF/ framework/trunk/src/test/resources/holder/ framework/trunk/src/test/resources/holder/META-INF/ framework/trunk/src/test/resources/holder/WEB-INF/ framework/trunk/src/test/resources/jbws1190/ framework/trunk/src/test/resources/jbws1190/WEB-INF/ framework/trunk/src/test/resources/jbws1357/ framework/trunk/src/test/resources/jbws1357/WEB-INF/ framework/trunk/src/test/resources/jbws1357/hello.jsp framework/trunk/src/test/resources/jbws1529/ framework/trunk/src/test/resources/jbws1529/META-INF/ framework/trunk/src/test/resources/jbws1529/WEB-INF/ framework/trunk/src/test/resources/jbws1556/ framework/trunk/src/test/resources/jbws1556/META-INF/ framework/trunk/src/test/resources/jbws1581/ framework/trunk/src/test/resources/jbws1581/META-INF/ framework/trunk/src/test/resources/jbws1581/WEB-INF/ framework/trunk/src/test/resources/jbws1611/ framework/trunk/src/test/resources/jbws1611/WEB-INF/ framework/trunk/src/test/resources/jbws1666/ framework/trunk/src/test/resources/jbws1666/WEB-INF/ framework/trunk/src/test/resources/jbws1702/ framework/trunk/src/test/resources/jbws1702/WEB-INF/ framework/trunk/src/test/resources/jbws1733/ framework/trunk/src/test/resources/jbws1733/WEB-INF/ framework/trunk/src/test/resources/jbws1762/ framework/trunk/src/test/resources/jbws1762/META-INF/ framework/trunk/src/test/resources/jbws1762/WEB-INF/ framework/trunk/src/test/resources/jbws1797/ framework/trunk/src/test/resources/jbws1797/WEB-INF/ framework/trunk/src/test/resources/jbws1798/ framework/trunk/src/test/resources/jbws1798/WEB-INF/ framework/trunk/src/test/resources/jbws1807/ framework/trunk/src/test/resources/jbws1807/WEB-INF/ framework/trunk/src/test/resources/jbws1809/ framework/trunk/src/test/resources/jbws1809/META-INF/ framework/trunk/src/test/resources/jbws1813/ framework/trunk/src/test/resources/jbws1813/META-INF/ framework/trunk/src/test/resources/jbws1815/ framework/trunk/src/test/resources/jbws1815/META-INF/ framework/trunk/src/test/resources/jbws1822/ framework/trunk/src/test/resources/jbws1822/one-ejb-module/ framework/trunk/src/test/resources/jbws1822/two-ejb-modules/ framework/trunk/src/test/resources/jbws1841/ framework/trunk/src/test/resources/jbws1841/META-INF/ framework/trunk/src/test/resources/jbws1841/application.xml framework/trunk/src/test/resources/jbws1843/ framework/trunk/src/test/resources/jbws1843/WEB-INF/ framework/trunk/src/test/resources/jbws1854/ framework/trunk/src/test/resources/jbws1854/META-INF/ framework/trunk/src/test/resources/jbws1854/WEB-INF/ framework/trunk/src/test/resources/jbws1969/ framework/trunk/src/test/resources/jbws1969/META-INF/ framework/trunk/src/test/resources/jbws2009/ framework/trunk/src/test/resources/jbws2009/WEB-INF/ framework/trunk/src/test/resources/jbws860/ framework/trunk/src/test/resources/jbws860/WEB-INF/ framework/trunk/src/test/resources/namespace/ framework/trunk/src/test/resources/namespace/WEB-INF/ framework/trunk/src/test/resources/webfault/ framework/trunk/src/test/resources/webfault/WEB-INF/ framework/trunk/src/test/resources/webserviceref/ framework/trunk/src/test/resources/webserviceref/META-INF-override/ framework/trunk/src/test/resources/webserviceref/META-INF-secure/ framework/trunk/src/test/resources/webserviceref/META-INF/ framework/trunk/src/test/resources/webserviceref/WEB-INF-client/ framework/trunk/src/test/resources/webserviceref/WEB-INF/ framework/trunk/src/test/resources/wrapped/ framework/trunk/src/test/resources/wrapped/accessor/ Removed: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/UserType.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSRpcSEI.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Wrapped.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithRPC_Bare.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWrappedSEI.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/types/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/generated/ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java framework/trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/ framework/trunk/src/test/resources/anonymous/WEB-INF/ framework/trunk/src/test/resources/binding/WEB-INF/ framework/trunk/src/test/resources/complex/META-INF/ framework/trunk/src/test/resources/complex/WEB-INF/ framework/trunk/src/test/resources/endpoint/WEB-INF/ framework/trunk/src/test/resources/handlerscope/WEB-INF/ framework/trunk/src/test/resources/holder/META-INF/ framework/trunk/src/test/resources/holder/WEB-INF/ framework/trunk/src/test/resources/jbws1190/WEB-INF/ framework/trunk/src/test/resources/jbws1357/WEB-INF/ framework/trunk/src/test/resources/jbws1357/hello.jsp framework/trunk/src/test/resources/jbws1529/META-INF/ framework/trunk/src/test/resources/jbws1529/WEB-INF/ framework/trunk/src/test/resources/jbws1556/META-INF/ framework/trunk/src/test/resources/jbws1581/META-INF/ framework/trunk/src/test/resources/jbws1581/WEB-INF/ framework/trunk/src/test/resources/jbws1611/WEB-INF/ framework/trunk/src/test/resources/jbws1666/WEB-INF/ framework/trunk/src/test/resources/jbws1702/WEB-INF/ framework/trunk/src/test/resources/jbws1733/WEB-INF/ framework/trunk/src/test/resources/jbws1762/META-INF/ framework/trunk/src/test/resources/jbws1762/WEB-INF/ framework/trunk/src/test/resources/jbws1797/WEB-INF/ framework/trunk/src/test/resources/jbws1798/WEB-INF/ framework/trunk/src/test/resources/jbws1807/WEB-INF/ framework/trunk/src/test/resources/jbws1809/META-INF/ framework/trunk/src/test/resources/jbws1813/META-INF/ framework/trunk/src/test/resources/jbws1815/META-INF/ framework/trunk/src/test/resources/jbws1822/one-ejb-module/ framework/trunk/src/test/resources/jbws1822/two-ejb-modules/ framework/trunk/src/test/resources/jbws1841/META-INF/ framework/trunk/src/test/resources/jbws1841/application.xml framework/trunk/src/test/resources/jbws1843/WEB-INF/ framework/trunk/src/test/resources/jbws1854/META-INF/ framework/trunk/src/test/resources/jbws1854/WEB-INF/ framework/trunk/src/test/resources/jbws1969/META-INF/ framework/trunk/src/test/resources/jbws2009/WEB-INF/ framework/trunk/src/test/resources/jbws860/WEB-INF/ framework/trunk/src/test/resources/namespace/WEB-INF/ framework/trunk/src/test/resources/webfault/WEB-INF/ framework/trunk/src/test/resources/webserviceref/META-INF-override/ framework/trunk/src/test/resources/webserviceref/META-INF-secure/ framework/trunk/src/test/resources/webserviceref/META-INF/ framework/trunk/src/test/resources/webserviceref/WEB-INF-client/ framework/trunk/src/test/resources/webserviceref/WEB-INF/ framework/trunk/src/test/resources/wrapped/accessor/ Log: [JBWS-2096] Migrate common jax-ws tests to framework (WIP) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.anonymous; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * Tests anonymous bare types - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@WebService -@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) -public interface Anonymous -{ - public AnonymousResponse echoAnonymous(AnonymousRequest request); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/Anonymous.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.anonymous; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * Tests anonymous bare types + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +@WebService +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface Anonymous +{ + public AnonymousResponse echoAnonymous(AnonymousRequest request); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.anonymous; - -import javax.jws.WebService; - -/** - * An endpoint that echos an anonymous type. - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@WebService(endpointInterface="org.jboss.test.ws.jaxws.anonymous.Anonymous", serviceName="AnonymousService") -public class AnonymousImpl implements Anonymous -{ - public AnonymousResponse echoAnonymous(AnonymousRequest request) - { - AnonymousResponse response = new AnonymousResponse(); - response.message = request.message; - - return response; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.anonymous; + +import javax.jws.WebService; + +/** + * An endpoint that echos an anonymous type. + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +@WebService(endpointInterface="org.jboss.test.ws.jaxws.anonymous.Anonymous", serviceName="AnonymousService") +public class AnonymousImpl implements Anonymous +{ + public AnonymousResponse echoAnonymous(AnonymousRequest request) + { + AnonymousResponse response = new AnonymousResponse(); + response.message = request.message; + + return response; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.anonymous; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -/** - * An anonymous request - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@XmlType(name="") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class AnonymousRequest -{ - @XmlElement - public String message; -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.anonymous; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + * An anonymous request + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +@XmlType(name="") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class AnonymousRequest +{ + @XmlElement + public String message; +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.anonymous; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -/** - * An anonymous response - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -@XmlType(name="") -(a)XmlAccessorType(XmlAccessType.FIELD) -public class AnonymousResponse -{ - @XmlElement - public String message; -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.anonymous; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + * An anonymous response + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +@XmlType(name="") +(a)XmlAccessorType(XmlAccessType.FIELD) +public class AnonymousResponse +{ + @XmlElement + public String message; +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.anonymous; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test anonymous bare types. - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class AnonymousTestCase extends JBossWSTest -{ - private String targetNS = "http://anonymous.jaxws.ws.test.jboss.org/"; - private Anonymous proxy; - - public static Test suite() - { - return new JBossWSTestSetup(AnonymousTestCase.class, "jaxws-anonymous.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "AnonymousService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-anonymous/AnonymousService?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = (Anonymous) service.getPort(Anonymous.class); - } - - - public void testEcho() throws Exception - { - AnonymousRequest req = new AnonymousRequest(); - req.message = "echo123"; - assertEquals("echo123", proxy.echoAnonymous(req).message); - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.anonymous; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test anonymous bare types. + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class AnonymousTestCase extends JBossWSTest +{ + private String targetNS = "http://anonymous.jaxws.ws.test.jboss.org/"; + private Anonymous proxy; + + public static Test suite() + { + return new JBossWSTestSetup(AnonymousTestCase.class, "jaxws-anonymous.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "AnonymousService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-anonymous/AnonymousService?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + proxy = (Anonymous) service.getPort(Anonymous.class); + } + + + public void testEcho() throws Exception + { + AnonymousRequest req = new AnonymousRequest(); + req.message = "echo123"; + assertEquals("echo123", proxy.echoAnonymous(req).message); + } +} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,96 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.binding; - -import junit.framework.TestCase; - -import org.jboss.ws.core.jaxws.JAXBBindingCustomization; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.binding.BindingCustomization; -import org.jboss.wsf.spi.deployment.DeploymentModelFactory; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Endpoint.EndpointState; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jun 28, 2007 - */ -public class BindingCustomizationTestCase extends TestCase { - - DeploymentModelFactory deploymentModelFactory; - - protected void setUp() throws Exception - { - super.setUp(); - - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - } - - public void testCustomizationWriteAccess() throws Exception - { - Endpoint endpoint = deploymentModelFactory.newEndpoint(null); - JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); - jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - - // a started endpoint should deny customizations - try - { - endpoint.setState(EndpointState.STARTED); - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - - fail("It should not be possible to change bindinig customizations on a started endpoint"); - } - catch (Exception e) - { - // all fine, this should happen - } - } - - public void testCustomizationReadAccess() throws Exception - { - Endpoint endpoint = deploymentModelFactory.newEndpoint(null); - JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); - jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - endpoint.setState(EndpointState.STARTED); - - // read a single customization - BindingCustomization knownCustomization = endpoint.getAttachment(BindingCustomization.class); - assertNotNull(knownCustomization); - - // however the iteratoion should be unmodifiable - try - { - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - fail("Started Endpoints should only axpose read acccess to their binding customizations"); - } - catch (Exception e) - { - // all fine, we'd expect this - } - - - } -} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.binding; - -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; - -/** - * A client side handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Nov-2005 - */ -public class ClientHandler extends GenericSOAPHandler -{ - public boolean handleInbound(MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - SOAPEnvelope soapEnvelope = (SOAPEnvelope)soapMessage.getSOAPPart().getEnvelope(); - String nsURI = soapEnvelope.getNamespaceURI(); - - SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); - soapElement = (SOAPElement)soapElement.getChildElements().next(); - String value = soapElement.getValue(); - soapElement.setValue(value + ":" + nsURI); - - return true; - } - catch (SOAPException ex) - { - throw new WebServiceException(ex); - } - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.binding; + +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.wsf.common.handler.GenericSOAPHandler; + +/** + * A client side handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Nov-2005 + */ +public class ClientHandler extends GenericSOAPHandler +{ + public boolean handleInbound(MessageContext msgContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPEnvelope soapEnvelope = (SOAPEnvelope)soapMessage.getSOAPPart().getEnvelope(); + String nsURI = soapEnvelope.getNamespaceURI(); + + SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); + soapElement = (SOAPElement)soapElement.getChildElements().next(); + String value = soapElement.getValue(); + soapElement.setValue(value + ":" + nsURI); + + return true; + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.binding; - -import javax.xml.soap.MimeHeaders; -import javax.xml.soap.SOAPConstants; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; - -/** - * A client side handler - * - * @author Alessio Soldano, alessio.soldano(a)jboss.com - * @since 31-Oct-2007 - */ -public class ClientHandler2 extends GenericSOAPHandler -{ - private static Logger log = Logger.getLogger(ClientHandler2.class); - - public boolean handleInbound(MessageContext msgContext) - { - log.info("handleInbound"); - - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - - MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); - String[] ct = mimeHeaders.getHeader("Content-Type"); - if (ct != null) - { - for (int i = 0; i < ct.length; i++) - { - if (ct[i].startsWith(SOAPConstants.SOAP_1_2_CONTENT_TYPE)) - return true; - } - } - return false; - } - - protected boolean handleOutbound(MessageContext msgContext) - { - log.info("handleOutbound"); - - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - soapMessage.saveChanges(); - - MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); - String[] ct = mimeHeaders.getHeader("Content-Type"); - if (ct != null) - { - for (int i = 0; i < ct.length; i++) - { - if (ct[i].startsWith(SOAPConstants.SOAP_1_2_CONTENT_TYPE)) - return true; - } - } - return false; - } - catch (SOAPException ex) - { - throw new WebServiceException(ex); - } - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.binding; + +import javax.xml.soap.MimeHeaders; +import javax.xml.soap.SOAPConstants; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; +import org.jboss.wsf.common.handler.GenericSOAPHandler; + +/** + * A client side handler + * + * @author Alessio Soldano, alessio.soldano(a)jboss.com + * @since 31-Oct-2007 + */ +public class ClientHandler2 extends GenericSOAPHandler +{ + private static Logger log = Logger.getLogger(ClientHandler2.class); + + public boolean handleInbound(MessageContext msgContext) + { + log.info("handleInbound"); + + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + + MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); + String[] ct = mimeHeaders.getHeader("Content-Type"); + if (ct != null) + { + for (int i = 0; i < ct.length; i++) + { + if (ct[i].startsWith(SOAPConstants.SOAP_1_2_CONTENT_TYPE)) + return true; + } + } + return false; + } + + protected boolean handleOutbound(MessageContext msgContext) + { + log.info("handleOutbound"); + + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + soapMessage.saveChanges(); + + MimeHeaders mimeHeaders = soapMessage.getMimeHeaders(); + String[] ct = mimeHeaders.getHeader("Content-Type"); + if (ct != null) + { + for (int i = 0; i < ct.length; i++) + { + if (ct[i].startsWith(SOAPConstants.SOAP_1_2_CONTENT_TYPE)) + return true; + } + } + return false; + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,108 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.binding; - -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.wsdl.Binding; -import javax.wsdl.Definition; -import javax.wsdl.extensions.ExtensibilityElement; -import javax.wsdl.extensions.soap.SOAPBinding; -import javax.wsdl.extensions.soap12.SOAP12Binding; -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.handler.Handler; - -import junit.framework.Test; - -import org.jboss.ws.Constants; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test SOAP12 binding type - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-Aug-2006 - */ -public class SOAPBindingTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-binding"; - - public static Test suite() - { - return new JBossWSTestSetup(SOAPBindingTestCase.class, "jaxws-binding.war"); - } - - // [JBWS-1761] - WSProvide ignores SOAPBinding declaration - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - - WSDLDefinitions defs = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); - Definition wsdl = defs.getWsdlOneOneDefinition(); - - QName qname = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointBinding"); - Binding wsdlBinding = wsdl.getBinding(qname); - assertNotNull("Cannot find: " + qname, wsdlBinding); - - String transport = null; - List<ExtensibilityElement> extList = wsdlBinding.getExtensibilityElements(); - for (ExtensibilityElement ext : extList) - { - if (ext instanceof SOAPBinding) - { - fail("Expected SOAP-1.2 binding"); - } - else if (ext instanceof SOAP12Binding) - { - SOAP12Binding soapBinding = (SOAP12Binding)ext; - transport = soapBinding.getTransportURI(); - } - } - assertEquals("Invalid transport uri", Constants.URI_SOAP_HTTP, transport); - } - - public void testClientAccess() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName qname = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointBeanService"); - Service service = Service.create(wsdlURL, qname); - SOAPEndpoint port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); - - BindingProvider provider = (BindingProvider)port; - List<Handler> handlerChain = new ArrayList<Handler>(); - handlerChain.addAll(provider.getBinding().getHandlerChain()); - handlerChain.add(new ClientHandler()); - handlerChain.add(new ClientHandler2()); - provider.getBinding().setHandlerChain(handlerChain); - - String nsURI = port.namespace(); - assertEquals(Constants.NS_SOAP12_ENV + ":" + Constants.NS_SOAP12_ENV, nsURI); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,108 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.binding; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.wsdl.Binding; +import javax.wsdl.Definition; +import javax.wsdl.extensions.ExtensibilityElement; +import javax.wsdl.extensions.soap.SOAPBinding; +import javax.wsdl.extensions.soap12.SOAP12Binding; +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.handler.Handler; + +import junit.framework.Test; + +import org.jboss.ws.Constants; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test SOAP12 binding type + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Aug-2006 + */ +public class SOAPBindingTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-binding"; + + public static Test suite() + { + return new JBossWSTestSetup(SOAPBindingTestCase.class, "jaxws-binding.war"); + } + + // [JBWS-1761] - WSProvide ignores SOAPBinding declaration + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + + WSDLDefinitions defs = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); + Definition wsdl = defs.getWsdlOneOneDefinition(); + + QName qname = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointBinding"); + Binding wsdlBinding = wsdl.getBinding(qname); + assertNotNull("Cannot find: " + qname, wsdlBinding); + + String transport = null; + List<ExtensibilityElement> extList = wsdlBinding.getExtensibilityElements(); + for (ExtensibilityElement ext : extList) + { + if (ext instanceof SOAPBinding) + { + fail("Expected SOAP-1.2 binding"); + } + else if (ext instanceof SOAP12Binding) + { + SOAP12Binding soapBinding = (SOAP12Binding)ext; + transport = soapBinding.getTransportURI(); + } + } + assertEquals("Invalid transport uri", Constants.URI_SOAP_HTTP, transport); + } + + public void testClientAccess() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName qname = new QName("http://org.jboss.ws/jaxws/binding", "SOAPEndpointBeanService"); + Service service = Service.create(wsdlURL, qname); + SOAPEndpoint port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); + + BindingProvider provider = (BindingProvider)port; + List<Handler> handlerChain = new ArrayList<Handler>(); + handlerChain.addAll(provider.getBinding().getHandlerChain()); + handlerChain.add(new ClientHandler()); + handlerChain.add(new ClientHandler2()); + provider.getBinding().setHandlerChain(handlerChain); + + String nsURI = port.namespace(); + assertEquals(Constants.NS_SOAP12_ENV + ":" + Constants.NS_SOAP12_ENV, nsURI); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.binding; - -//$Id: $ - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - -@WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/binding") -@SOAPBinding(style = Style.RPC) - -public interface SOAPEndpoint -{ - public String namespace(); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.binding; + +//$Id: $ + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +@WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/binding") +@SOAPBinding(style = Style.RPC) + +public interface SOAPEndpoint +{ + public String namespace(); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.binding; - -// $Id: $ - -import static javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING; - -import javax.annotation.Resource; -import javax.jws.WebService; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.BindingType; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -import org.jboss.logging.Logger; - -@WebService(name="SOAPEndpoint", targetNamespace="http://org.jboss.ws/jaxws/binding", - endpointInterface = "org.jboss.test.ws.jaxws.binding.SOAPEndpoint") -@BindingType(SOAP12HTTP_BINDING) -public class SOAPEndpointBean implements SOAPEndpoint -{ - private static Logger log = Logger.getLogger(SOAPEndpointBean.class); - - @Resource - public WebServiceContext context; - - - public String namespace() - { - try - { - SOAPMessageContext msgContext = (SOAPMessageContext)context.getMessageContext(); - SOAPMessage soapMessage = msgContext.getMessage(); - SOAPEnvelope soapEnvelope = (SOAPEnvelope)soapMessage.getSOAPPart().getEnvelope(); - String nsURI = soapEnvelope.getNamespaceURI(); - - log.info(nsURI); - - return nsURI; - } - catch (SOAPException ex) - { - throw new WebServiceException(ex); - } - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.binding; + +// $Id: $ + +import static javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING; + +import javax.annotation.Resource; +import javax.jws.WebService; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.BindingType; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; + +@WebService(name="SOAPEndpoint", targetNamespace="http://org.jboss.ws/jaxws/binding", + endpointInterface = "org.jboss.test.ws.jaxws.binding.SOAPEndpoint") +@BindingType(SOAP12HTTP_BINDING) +public class SOAPEndpointBean implements SOAPEndpoint +{ + private static Logger log = Logger.getLogger(SOAPEndpointBean.class); + + @Resource + public WebServiceContext context; + + + public String namespace() + { + try + { + SOAPMessageContext msgContext = (SOAPMessageContext)context.getMessageContext(); + SOAPMessage soapMessage = msgContext.getMessage(); + SOAPEnvelope soapEnvelope = (SOAPEnvelope)soapMessage.getSOAPPart().getEnvelope(); + String nsURI = soapEnvelope.getNamespaceURI(); + + log.info(nsURI); + + return nsURI; + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/complex) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,277 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.complex; - -// $Id$ - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * A complex JAX-WS test - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @author Thomas.Diesler(a)jboss.com - */ -public class ComplexTestCase extends JBossWSTest -{ - private Registration port; - - public static Test suite() - { - return new JBossWSTestSetup(ComplexTestCase.class, "jaxws-complex.war"); - } - - protected void setUp() throws Exception - { - super.setUp(); - URL wsdlURL = new File("resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl").toURL(); - QName serviceName = new QName("http://complex.jaxws.ws.test.jboss.org/", "RegistrationService"); - Service service = Service.create(wsdlURL, serviceName); - port = (Registration)service.getPort(Registration.class); - } - - public void testRegistration() throws Exception - { - Customer customer = getFredJackson(); - customer.getReferredCustomers().add(getJohnDoe()); - customer.getReferredCustomers().add(getAlCapone()); - - XMLGregorianCalendar cal = getCalendar(); - - port.register(customer, cal); - - customer = getAlCapone(); - try - { - port.register(customer, cal); - fail("Expected AlreadyRegisteredFault"); - } - catch (AlreadyRegisteredFault_Exception e) - { - assertEquals(456, e.getFaultInfo().getExistingId()); - } - } - - public void testInvoiceRegistration() throws Exception - { - InvoiceCustomer customer = getInvoiceFredJackson(); - customer.getReferredCustomers().add(getJohnDoe()); - customer.getReferredCustomers().add(getAlCapone()); - - assertTrue(port.registerForInvoice(customer)); - } - - public void testOtherPackage() throws Exception - { - Statistics stats = port.getStatistics(getFredJackson()); - - System.out.println(stats.getActivationTime()); - assertEquals(10, stats.getHits()); - } - - public void testBulkRegistration() throws Exception - { - List<Customer> customers = new ArrayList<Customer>(); - customers.add(getFredJackson()); - customers.add(getJohnDoe()); - - List<Long> result = port.bulkRegister(customers, getCalendar()); - - assertEquals(123, result.get(0).longValue()); - assertEquals(124, result.get(1).longValue()); - - customers.clear(); - customers.add(getFredJackson()); - customers.add(getInvalid(754)); - customers.add(getInvalid(753)); - customers.add(getJohnDoe()); - customers.add(getInvalid(752)); - - try - { - port.bulkRegister(customers, getCalendar()); - } - catch (ValidationFault_Exception e) - { - List<Long> failedCustomers = e.getFaultInfo().getFailedCustomers(); - assertEquals(754, failedCustomers.get(0).longValue()); - assertEquals(753, failedCustomers.get(1).longValue()); - assertEquals(752, failedCustomers.get(2).longValue()); - } - } - - private Customer getFredJackson() - { - Name name = new Name(); - name.setFirstName("Fred"); - name.setMiddleName("Jones"); - name.setLastName("Jackson"); - - Address address = new Address(); - address.setCity("Atlanta"); - address.setState("Georgia"); - address.setZip("53717"); - address.setStreet("Yet Another Peach Tree St."); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("123"); - number1.setExchange("456"); - number1.setLine("7890"); - - PhoneNumber number2 = new PhoneNumber(); - number1.setAreaCode("333"); - number1.setExchange("222"); - number1.setLine("1234"); - - Customer customer = new Customer(); - customer.setId(123); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.getContactNumbers().add(number2); - return customer; - } - - private InvoiceCustomer getInvoiceFredJackson() - { - Name name = new Name(); - name.setFirstName("Fred"); - name.setMiddleName("Jones"); - name.setLastName("Jackson"); - - Address address = new Address(); - address.setCity("Atlanta"); - address.setState("Georgia"); - address.setZip("53717"); - address.setStreet("Yet Another Peach Tree St."); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("123"); - number1.setExchange("456"); - number1.setLine("7890"); - - PhoneNumber number2 = new PhoneNumber(); - number1.setAreaCode("333"); - number1.setExchange("222"); - number1.setLine("1234"); - - InvoiceCustomer customer = new InvoiceCustomer(); - customer.setId(123); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.getContactNumbers().add(number2); - customer.setCycleDay(10); - return customer; - } - - private Customer getJohnDoe() - { - Name name = new Name(); - name.setFirstName("John"); - name.setLastName("Doe"); - - Address address = new Address(); - address.setCity("New York"); - address.setState("New York"); - address.setZip("10010"); - address.setStreet("Park Street"); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("555"); - number1.setExchange("867"); - number1.setLine("5309"); - - Customer customer = new Customer(); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.setId(124); - return customer; - } - - private Customer getInvalid(long id) - { - Address address = new Address(); - address.setCity("New York"); - address.setState("New York"); - address.setZip("10010"); - address.setStreet("Park Street"); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("555"); - number1.setExchange("867"); - number1.setLine("5309"); - - Customer customer = new Customer(); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.setId(id); - return customer; - } - - private Customer getAlCapone() - { - Name name = new Name(); - name.setFirstName("Al"); - name.setLastName("Capone"); - - Address address = new Address(); - address.setCity("Chicago"); - address.setState("Illinois"); - address.setZip("60619"); - address.setStreet("7244 South Prairie Avenue."); - - PhoneNumber number1 = new PhoneNumber(); - number1.setAreaCode("888"); - number1.setExchange("722"); - number1.setLine("7322"); - - Customer customer = new Customer(); - customer.setName(name); - customer.setAddress(address); - customer.getContactNumbers().add(number1); - customer.setId(125); - return customer; - } - - private XMLGregorianCalendar getCalendar() throws DatatypeConfigurationException - { - DatatypeFactory calFactory = DatatypeFactory.newInstance(); - XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); - return cal; - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,277 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.complex; + +// $Id$ + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * A complex JAX-WS test + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @author Thomas.Diesler(a)jboss.com + */ +public class ComplexTestCase extends JBossWSTest +{ + private Registration port; + + public static Test suite() + { + return new JBossWSTestSetup(ComplexTestCase.class, "jaxws-complex.war"); + } + + protected void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new File("resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl").toURL(); + QName serviceName = new QName("http://complex.jaxws.ws.test.jboss.org/", "RegistrationService"); + Service service = Service.create(wsdlURL, serviceName); + port = (Registration)service.getPort(Registration.class); + } + + public void testRegistration() throws Exception + { + Customer customer = getFredJackson(); + customer.getReferredCustomers().add(getJohnDoe()); + customer.getReferredCustomers().add(getAlCapone()); + + XMLGregorianCalendar cal = getCalendar(); + + port.register(customer, cal); + + customer = getAlCapone(); + try + { + port.register(customer, cal); + fail("Expected AlreadyRegisteredFault"); + } + catch (AlreadyRegisteredFault_Exception e) + { + assertEquals(456, e.getFaultInfo().getExistingId()); + } + } + + public void testInvoiceRegistration() throws Exception + { + InvoiceCustomer customer = getInvoiceFredJackson(); + customer.getReferredCustomers().add(getJohnDoe()); + customer.getReferredCustomers().add(getAlCapone()); + + assertTrue(port.registerForInvoice(customer)); + } + + public void testOtherPackage() throws Exception + { + Statistics stats = port.getStatistics(getFredJackson()); + + System.out.println(stats.getActivationTime()); + assertEquals(10, stats.getHits()); + } + + public void testBulkRegistration() throws Exception + { + List<Customer> customers = new ArrayList<Customer>(); + customers.add(getFredJackson()); + customers.add(getJohnDoe()); + + List<Long> result = port.bulkRegister(customers, getCalendar()); + + assertEquals(123, result.get(0).longValue()); + assertEquals(124, result.get(1).longValue()); + + customers.clear(); + customers.add(getFredJackson()); + customers.add(getInvalid(754)); + customers.add(getInvalid(753)); + customers.add(getJohnDoe()); + customers.add(getInvalid(752)); + + try + { + port.bulkRegister(customers, getCalendar()); + } + catch (ValidationFault_Exception e) + { + List<Long> failedCustomers = e.getFaultInfo().getFailedCustomers(); + assertEquals(754, failedCustomers.get(0).longValue()); + assertEquals(753, failedCustomers.get(1).longValue()); + assertEquals(752, failedCustomers.get(2).longValue()); + } + } + + private Customer getFredJackson() + { + Name name = new Name(); + name.setFirstName("Fred"); + name.setMiddleName("Jones"); + name.setLastName("Jackson"); + + Address address = new Address(); + address.setCity("Atlanta"); + address.setState("Georgia"); + address.setZip("53717"); + address.setStreet("Yet Another Peach Tree St."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("123"); + number1.setExchange("456"); + number1.setLine("7890"); + + PhoneNumber number2 = new PhoneNumber(); + number1.setAreaCode("333"); + number1.setExchange("222"); + number1.setLine("1234"); + + Customer customer = new Customer(); + customer.setId(123); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.getContactNumbers().add(number2); + return customer; + } + + private InvoiceCustomer getInvoiceFredJackson() + { + Name name = new Name(); + name.setFirstName("Fred"); + name.setMiddleName("Jones"); + name.setLastName("Jackson"); + + Address address = new Address(); + address.setCity("Atlanta"); + address.setState("Georgia"); + address.setZip("53717"); + address.setStreet("Yet Another Peach Tree St."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("123"); + number1.setExchange("456"); + number1.setLine("7890"); + + PhoneNumber number2 = new PhoneNumber(); + number1.setAreaCode("333"); + number1.setExchange("222"); + number1.setLine("1234"); + + InvoiceCustomer customer = new InvoiceCustomer(); + customer.setId(123); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.getContactNumbers().add(number2); + customer.setCycleDay(10); + return customer; + } + + private Customer getJohnDoe() + { + Name name = new Name(); + name.setFirstName("John"); + name.setLastName("Doe"); + + Address address = new Address(); + address.setCity("New York"); + address.setState("New York"); + address.setZip("10010"); + address.setStreet("Park Street"); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("555"); + number1.setExchange("867"); + number1.setLine("5309"); + + Customer customer = new Customer(); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(124); + return customer; + } + + private Customer getInvalid(long id) + { + Address address = new Address(); + address.setCity("New York"); + address.setState("New York"); + address.setZip("10010"); + address.setStreet("Park Street"); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("555"); + number1.setExchange("867"); + number1.setLine("5309"); + + Customer customer = new Customer(); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(id); + return customer; + } + + private Customer getAlCapone() + { + Name name = new Name(); + name.setFirstName("Al"); + name.setLastName("Capone"); + + Address address = new Address(); + address.setCity("Chicago"); + address.setState("Illinois"); + address.setZip("60619"); + address.setStreet("7244 South Prairie Avenue."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("888"); + number1.setExchange("722"); + number1.setLine("7322"); + + Customer customer = new Customer(); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(125); + return customer; + } + + private XMLGregorianCalendar getCalendar() throws DatatypeConfigurationException + { + DatatypeFactory calFactory = DatatypeFactory.newInstance(); + XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); + return cal; + } +} \ No newline at end of file Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,129 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.complex; - -// $Id$ - -import java.util.ArrayList; -import java.util.List; - -import javax.jws.WebService; -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.XMLGregorianCalendar; - -import org.jboss.logging.Logger; - -/** - * A mock registration service that exercises the use of complex types, arrays, inheritence, - * and exceptions. Note that this test does not yet test polymorphic behavior. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @author Thomas.Diesler(a)jboss.com - */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.complex.Registration", name = "Registration", targetNamespace = "http://complex.jaxws.ws.test.jboss.org") -public class RegistrationServiceImpl implements Registration -{ - // Provide logging - private static Logger log = Logger.getLogger(RegistrationServiceImpl.class); - - public long register(Customer customer, Object when) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception - { - Name name = customer.getName(); - if (name == null) - { - ValidationFault fault = new ValidationFault(); - fault.getFailedCustomers().add(customer.getId()); - throw new ValidationFault_Exception("No name!", fault); - } - - if ("al".equalsIgnoreCase(name.getFirstName()) && "capone".equalsIgnoreCase(name.getLastName())) - { - AlreadyRegisteredFault fault = new AlreadyRegisteredFault(); - fault.setExistingId(456); - throw new AlreadyRegisteredFault_Exception("Al Capone is already registered", fault); - } - - for (Customer c : customer.getReferredCustomers()) - { - log.info("Refered customer: " + c.getName()); - } - - log.info("registering customer: " + customer); - return customer.getId(); - } - - public List<Long> bulkRegister(List<Customer> customers, Object when) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception - { - List<Long> registered = new ArrayList<Long>(customers.size()); - List<Long> failed = new ArrayList<Long>(customers.size()); - - for (Customer c : customers) - { - try - { - registered.add(register(c, when)); - } - catch (ValidationFault_Exception e) - { - failed.add(e.getFaultInfo().getFailedCustomers().get(0)); - } - } - - if (failed.size() > 0) - { - ValidationFault fault = new ValidationFault(); - fault.getFailedCustomers().addAll(failed); - throw new ValidationFault_Exception("Validation errors on bulk registering customers", fault); - } - - return registered; - } - - public boolean registerForInvoice(InvoiceCustomer invoiceCustomer) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception - { - log.info("registerForInvoice: " + invoiceCustomer.getCycleDay()); - return true; - } - - public Statistics getStatistics(Customer customer) - { - Statistics stats = new Statistics(); - stats.setHits(10); - stats.setActivationTime(getCalendar()); - return stats; - } - - private XMLGregorianCalendar getCalendar() - { - try - { - DatatypeFactory calFactory = DatatypeFactory.newInstance(); - XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); - return cal; - } - catch (DatatypeConfigurationException e) - { - throw new RuntimeException(e); - } - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,129 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.complex; + +// $Id$ + +import java.util.ArrayList; +import java.util.List; + +import javax.jws.WebService; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.jboss.logging.Logger; + +/** + * A mock registration service that exercises the use of complex types, arrays, inheritence, + * and exceptions. Note that this test does not yet test polymorphic behavior. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @author Thomas.Diesler(a)jboss.com + */ +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.complex.Registration", name = "Registration", targetNamespace = "http://complex.jaxws.ws.test.jboss.org") +public class RegistrationServiceImpl implements Registration +{ + // Provide logging + private static Logger log = Logger.getLogger(RegistrationServiceImpl.class); + + public long register(Customer customer, Object when) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + { + Name name = customer.getName(); + if (name == null) + { + ValidationFault fault = new ValidationFault(); + fault.getFailedCustomers().add(customer.getId()); + throw new ValidationFault_Exception("No name!", fault); + } + + if ("al".equalsIgnoreCase(name.getFirstName()) && "capone".equalsIgnoreCase(name.getLastName())) + { + AlreadyRegisteredFault fault = new AlreadyRegisteredFault(); + fault.setExistingId(456); + throw new AlreadyRegisteredFault_Exception("Al Capone is already registered", fault); + } + + for (Customer c : customer.getReferredCustomers()) + { + log.info("Refered customer: " + c.getName()); + } + + log.info("registering customer: " + customer); + return customer.getId(); + } + + public List<Long> bulkRegister(List<Customer> customers, Object when) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + { + List<Long> registered = new ArrayList<Long>(customers.size()); + List<Long> failed = new ArrayList<Long>(customers.size()); + + for (Customer c : customers) + { + try + { + registered.add(register(c, when)); + } + catch (ValidationFault_Exception e) + { + failed.add(e.getFaultInfo().getFailedCustomers().get(0)); + } + } + + if (failed.size() > 0) + { + ValidationFault fault = new ValidationFault(); + fault.getFailedCustomers().addAll(failed); + throw new ValidationFault_Exception("Validation errors on bulk registering customers", fault); + } + + return registered; + } + + public boolean registerForInvoice(InvoiceCustomer invoiceCustomer) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + { + log.info("registerForInvoice: " + invoiceCustomer.getCycleDay()); + return true; + } + + public Statistics getStatistics(Customer customer) + { + Statistics stats = new Statistics(); + stats.setHits(10); + stats.setActivationTime(getCalendar()); + return stats; + } + + private XMLGregorianCalendar getCalendar() + { + try + { + DatatypeFactory calFactory = DatatypeFactory.newInstance(); + XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); + return cal; + } + catch (DatatypeConfigurationException e) + { + throw new RuntimeException(e); + } + } +} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.endpoint; - -import javax.jws.WebService; - -/** - * Test Endpoint deployment - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 - */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.endpoint.EndpointInterface", targetNamespace = "http://org.jboss.ws/jaxws/endpoint", serviceName = "TestService") -public class EndpointBean implements EndpointInterface -{ - public String echo(String input) - { - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.endpoint; + +import javax.jws.WebService; + +/** + * Test Endpoint deployment + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Apr-2005 + */ +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.endpoint.EndpointInterface", targetNamespace = "http://org.jboss.ws/jaxws/endpoint", serviceName = "TestService") +public class EndpointBean implements EndpointInterface +{ + public String echo(String input) + { + return input; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.endpoint; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * Test the JSR-181 annotation: javax.jws.WebService - * This interface is only used in the client deployment. - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 - */ -@WebService(targetNamespace = "http://org.jboss.ws/jaxws/endpoint") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface EndpointInterface extends Remote -{ - String echo(String input) throws RemoteException; -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.endpoint; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * Test the JSR-181 annotation: javax.jws.WebService + * This interface is only used in the client deployment. + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Apr-2005 + */ +@WebService(targetNamespace = "http://org.jboss.ws/jaxws/endpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface EndpointInterface extends Remote +{ + String echo(String input) throws RemoteException; +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,98 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.endpoint; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URL; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.namespace.QName; -import javax.xml.ws.Endpoint; -import javax.xml.ws.Service; -import javax.xml.ws.soap.SOAPBinding; - -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.http.HttpContext; -import org.jboss.wsf.spi.http.HttpServer; -import org.jboss.wsf.spi.http.HttpServerFactory; - -/** - * Test Endpoint deployment - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-Jul-2006 - */ -public class EndpointServlet extends HttpServlet -{ - private Endpoint endpoint; - - @Override - public void init(ServletConfig config) throws ServletException - { - super.init(config); - - // Create the endpoint - EndpointBean epImpl = new EndpointBean(); - endpoint = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, epImpl); - - // Create and start the HTTP server - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - HttpServer httpServer = spiProvider.getSPI(HttpServerFactory.class).getHttpServer(); - httpServer.start(); - - // Create the context and publish the endpoint - HttpContext context = httpServer.createContext("/jaxws-endpoint"); - endpoint.publish(context); - } - - @Override - public void destroy() - { - // Stop the endpoint - endpoint.stop(); - - super.destroy(); - } - - protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - // Create the port - URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl"); - QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "TestService"); - Service service = Service.create(wsdlURL, qname); - EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); - - // Invoke the endpoint - String param = req.getParameter("param"); - String retStr = port.echo(param); - - // Return the result - PrintWriter pw = new PrintWriter(res.getWriter()); - pw.print(retStr); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,98 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.endpoint; + +import java.io.IOException; +import java.io.PrintWriter; +import java.net.URL; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.namespace.QName; +import javax.xml.ws.Endpoint; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPBinding; + +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.http.HttpContext; +import org.jboss.wsf.spi.http.HttpServer; +import org.jboss.wsf.spi.http.HttpServerFactory; + +/** + * Test Endpoint deployment + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Jul-2006 + */ +public class EndpointServlet extends HttpServlet +{ + private Endpoint endpoint; + + @Override + public void init(ServletConfig config) throws ServletException + { + super.init(config); + + // Create the endpoint + EndpointBean epImpl = new EndpointBean(); + endpoint = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, epImpl); + + // Create and start the HTTP server + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + HttpServer httpServer = spiProvider.getSPI(HttpServerFactory.class).getHttpServer(); + httpServer.start(); + + // Create the context and publish the endpoint + HttpContext context = httpServer.createContext("/jaxws-endpoint"); + endpoint.publish(context); + } + + @Override + public void destroy() + { + // Stop the endpoint + endpoint.stop(); + + super.destroy(); + } + + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + // Create the port + URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl"); + QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "TestService"); + Service service = Service.create(wsdlURL, qname); + EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); + + // Invoke the endpoint + String param = req.getParameter("param"); + String retStr = port.echo(param); + + // Return the result + PrintWriter pw = new PrintWriter(res.getWriter()); + pw.print(retStr); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,105 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.endpoint; - -// $Id$ - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.management.Attribute; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.extensions.TestSetup; -import junit.framework.Test; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test JAXWS Endpoint deployment - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 - */ -public class EndpointTestCase extends JBossWSTest -{ - public static Test suite() - { - return new TestSetup(new JBossWSTestSetup(EndpointTestCase.class, "jaxws-endpoint-servlet.war")) { - - private Boolean useJBossWebLoader; - - protected void setUp() throws Exception - { - MBeanServerConnection server = JBossWSTestHelper.getServer(); - useJBossWebLoader = (Boolean)server.getAttribute(new ObjectName("jboss.web:service=WebServer"), "UseJBossWebLoader"); - server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", Boolean.TRUE)); - super.setUp(); - } - - protected void tearDown() throws Exception - { - super.tearDown(); - MBeanServerConnection server = JBossWSTestHelper.getServer(); - server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", useJBossWebLoader)); - } - }; - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testClientAccess() throws Exception - { - // Create the port - URL wsdlURL = new File("resources/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl").toURL(); - QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "TestService"); - Service service = Service.create(wsdlURL, qname); - EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); - - String helloWorld = "Hello world!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testServletAccess() throws Exception - { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint-servlet?param=hello-world"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - assertEquals("hello-world", br.readLine()); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,105 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.endpoint; + +// $Id$ + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.management.Attribute; +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.extensions.TestSetup; +import junit.framework.Test; + +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test JAXWS Endpoint deployment + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Apr-2005 + */ +public class EndpointTestCase extends JBossWSTest +{ + public static Test suite() + { + return new TestSetup(new JBossWSTestSetup(EndpointTestCase.class, "jaxws-endpoint-servlet.war")) { + + private Boolean useJBossWebLoader; + + protected void setUp() throws Exception + { + MBeanServerConnection server = JBossWSTestHelper.getServer(); + useJBossWebLoader = (Boolean)server.getAttribute(new ObjectName("jboss.web:service=WebServer"), "UseJBossWebLoader"); + server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", Boolean.TRUE)); + super.setUp(); + } + + protected void tearDown() throws Exception + { + super.tearDown(); + MBeanServerConnection server = JBossWSTestHelper.getServer(); + server.setAttribute(new ObjectName("jboss.web:service=WebServer"), new Attribute("UseJBossWebLoader", useJBossWebLoader)); + } + }; + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testClientAccess() throws Exception + { + // Create the port + URL wsdlURL = new File("resources/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl").toURL(); + QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "TestService"); + Service service = Service.create(wsdlURL, qname); + EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); + + String helloWorld = "Hello world!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testServletAccess() throws Exception + { + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint-servlet?param=hello-world"); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + assertEquals("hello-world", br.readLine()); + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.handlerscope; - -// $Id: $ - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test SOAP12 binding type - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-Aug-2006 - */ -public class HandlerScopeTestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(HandlerScopeTestCase.class, "jaxws-handlerscope.war"); - } - - public void testClientAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-handlerscope?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerscope", "SOAPEndpointService"); - Service service = Service.create(wsdlURL, serviceName); - SOAPEndpoint port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); - - String retStr = port.echo("hello"); - - StringBuffer expStr = new StringBuffer("hello"); - expStr.append(":SOAP12ClientHandler"); - expStr.append(":SOAPClientHandler"); - expStr.append(":ServiceClientHandler"); - expStr.append(":ServiceWildcardClientHandler"); - expStr.append(":PortClientHandler"); - expStr.append(":PortWildcardClientHandler"); - expStr.append(":GeneralClientHandler"); - expStr.append(":GeneralServerHandler"); - expStr.append(":PortWildcardServerHandler"); - expStr.append(":PortServerHandler"); - expStr.append(":ServiceWildcardServerHandler"); - expStr.append(":ServiceServerHandler"); - expStr.append(":SOAPServerHandler"); - expStr.append(":SOAP12ServerHandler"); - expStr.append(":endpoint"); - expStr.append(":SOAP12ServerHandler"); - expStr.append(":SOAPServerHandler"); - expStr.append(":ServiceServerHandler"); - expStr.append(":ServiceWildcardServerHandler"); - expStr.append(":PortServerHandler"); - expStr.append(":PortWildcardServerHandler"); - expStr.append(":GeneralServerHandler"); - expStr.append(":GeneralClientHandler"); - expStr.append(":PortWildcardClientHandler"); - expStr.append(":PortClientHandler"); - expStr.append(":ServiceWildcardClientHandler"); - expStr.append(":ServiceClientHandler"); - expStr.append(":SOAPClientHandler"); - expStr.append(":SOAP12ClientHandler"); - assertEquals(expStr.toString(), retStr); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.handlerscope; + +// $Id: $ + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test SOAP12 binding type + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Aug-2006 + */ +public class HandlerScopeTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(HandlerScopeTestCase.class, "jaxws-handlerscope.war"); + } + + public void testClientAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-handlerscope?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerscope", "SOAPEndpointService"); + Service service = Service.create(wsdlURL, serviceName); + SOAPEndpoint port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); + + String retStr = port.echo("hello"); + + StringBuffer expStr = new StringBuffer("hello"); + expStr.append(":SOAP12ClientHandler"); + expStr.append(":SOAPClientHandler"); + expStr.append(":ServiceClientHandler"); + expStr.append(":ServiceWildcardClientHandler"); + expStr.append(":PortClientHandler"); + expStr.append(":PortWildcardClientHandler"); + expStr.append(":GeneralClientHandler"); + expStr.append(":GeneralServerHandler"); + expStr.append(":PortWildcardServerHandler"); + expStr.append(":PortServerHandler"); + expStr.append(":ServiceWildcardServerHandler"); + expStr.append(":ServiceServerHandler"); + expStr.append(":SOAPServerHandler"); + expStr.append(":SOAP12ServerHandler"); + expStr.append(":endpoint"); + expStr.append(":SOAP12ServerHandler"); + expStr.append(":SOAPServerHandler"); + expStr.append(":ServiceServerHandler"); + expStr.append(":ServiceWildcardServerHandler"); + expStr.append(":PortServerHandler"); + expStr.append(":PortWildcardServerHandler"); + expStr.append(":GeneralServerHandler"); + expStr.append(":GeneralClientHandler"); + expStr.append(":PortWildcardClientHandler"); + expStr.append(":PortClientHandler"); + expStr.append(":ServiceWildcardClientHandler"); + expStr.append(":ServiceClientHandler"); + expStr.append(":SOAPClientHandler"); + expStr.append(":SOAP12ClientHandler"); + assertEquals(expStr.toString(), retStr); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,66 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.handlerscope; - -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; - -public class ProtocolHandler extends GenericSOAPHandler -{ - @Override - public boolean handleOutbound(MessageContext msgContext) - { - return appendHandlerName(msgContext); - } - - @Override - public boolean handleInbound(MessageContext msgContext) - { - return appendHandlerName(msgContext); - } - - private boolean appendHandlerName(MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); - soapElement = (SOAPElement)soapElement.getChildElements().next(); - String value = soapElement.getValue(); - - String handlerName = getHandlerName(); - soapElement.setValue(value + ":" + handlerName); - - return true; - } - catch (SOAPException ex) - { - throw new WebServiceException(ex); - } - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.handlerscope; + +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.wsf.common.handler.GenericSOAPHandler; + +public class ProtocolHandler extends GenericSOAPHandler +{ + @Override + public boolean handleOutbound(MessageContext msgContext) + { + return appendHandlerName(msgContext); + } + + @Override + public boolean handleInbound(MessageContext msgContext) + { + return appendHandlerName(msgContext); + } + + private boolean appendHandlerName(MessageContext msgContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); + soapElement = (SOAPElement)soapElement.getChildElements().next(); + String value = soapElement.getValue(); + + String handlerName = getHandlerName(); + soapElement.setValue(value + ":" + handlerName); + + return true; + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.handlerscope; - -//$Id: $ - -import javax.jws.HandlerChain; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.xml.ws.BindingType; - -@WebService -@BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") -@HandlerChain(file = "jaxws-client-handlers.xml") -public interface SOAPEndpoint -{ - @WebMethod - public String echo(String msg); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.handlerscope; + +//$Id: $ + +import javax.jws.HandlerChain; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.xml.ws.BindingType; + +@WebService +@BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") +@HandlerChain(file = "jaxws-client-handlers.xml") +public interface SOAPEndpoint +{ + @WebMethod + public String echo(String msg); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.handlerscope; - -// $Id: $ - -import javax.jws.HandlerChain; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; -import javax.xml.ws.BindingType; - -import org.jboss.logging.Logger; - -@WebService(name = "SOAPEndpoint", serviceName = "SOAPEndpointService", targetNamespace = "http://org.jboss.ws/jaxws/handlerscope") -@BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") // SOAP-1.2 -@HandlerChain(file = "jaxws-server-handlers.xml") -@SOAPBinding(style = Style.RPC) -public class SOAPEndpointBean -{ - private static Logger log = Logger.getLogger(SOAPEndpointBean.class); - - @WebMethod - public String echo(String msg) - { - log.info("echo: " + msg); - return msg + ":endpoint"; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.handlerscope; + +// $Id: $ + +import javax.jws.HandlerChain; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; +import javax.xml.ws.BindingType; + +import org.jboss.logging.Logger; + +@WebService(name = "SOAPEndpoint", serviceName = "SOAPEndpointService", targetNamespace = "http://org.jboss.ws/jaxws/handlerscope") +@BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") // SOAP-1.2 +@HandlerChain(file = "jaxws-server-handlers.xml") +@SOAPBinding(style = Style.RPC) +public class SOAPEndpointBean +{ + private static Logger log = Logger.getLogger(SOAPEndpointBean.class); + + @WebMethod + public String echo(String msg) + { + log.info("echo: " + msg); + return msg + ":endpoint"; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <protocol-bindings>##SOAP12_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP12ClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP ##SOAP12_HTTP</protocol-bindings> - <handler> - <handler-name> SOAPClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:SOAPEndpointService</service-name-pattern> - <handler> - <handler-name> ServiceClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:SOAPEndpointSer*</service-name-pattern> - <handler> - <handler-name> ServiceWildcardClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:InvalidService</service-name-pattern> - <handler> - <handler-name> InvalidServiceClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPo*</port-name-pattern> - <handler> - <handler-name> PortWildcardClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:InvalidPort</port-name-pattern> - <handler> - <handler-name> InvalidPortClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> GeneralClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP12ClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP ##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAPClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointService</service-name-pattern> + <handler> + <handler-name> ServiceClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointSer*</service-name-pattern> + <handler> + <handler-name> ServiceWildcardClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:InvalidService</service-name-pattern> + <handler> + <handler-name> InvalidServiceClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPo*</port-name-pattern> + <handler> + <handler-name> PortWildcardClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:InvalidPort</port-name-pattern> + <handler> + <handler-name> InvalidPortClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> GeneralClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <protocol-bindings>##SOAP12_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP12ServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP ##SOAP12_HTTP</protocol-bindings> - <handler> - <handler-name> SOAPServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:SOAPEndpointService</service-name-pattern> - <handler> - <handler-name> ServiceServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:SOAPEndpointSer*</service-name-pattern> - <handler> - <handler-name> ServiceWildcardServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:InvalidService</service-name-pattern> - <handler> - <handler-name> InvalidServiceServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPo*</port-name-pattern> - <handler> - <handler-name> PortWildcardServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:InvalidPort</port-name-pattern> - <handler> - <handler-name> InvalidPortServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> GeneralServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP12ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP ##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAPServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointService</service-name-pattern> + <handler> + <handler-name> ServiceServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointSer*</service-name-pattern> + <handler> + <handler-name> ServiceWildcardServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:InvalidService</service-name-pattern> + <handler> + <handler-name> InvalidServiceServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPo*</port-name-pattern> + <handler> + <handler-name> PortWildcardServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:InvalidPort</port-name-pattern> + <handler> + <handler-name> InvalidPortServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> GeneralServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/holder) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.holder; - -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.xml.ws.Holder; - -/** - * A service which tests JAX-WS Holder types - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - */ -@WebService(name="Holder") -@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) -public class HolderServiceImpl -{ - public Long echoOuts( - @WebParam(name = "in1") Integer in1, - @WebParam(name = "in2") String in2, - @WebParam(name = "in3") Long in3, - @WebParam(name = "out1", mode = WebParam.Mode.OUT) Holder<Integer> out1, - @WebParam(name = "out2", mode = WebParam.Mode.OUT) Holder<String> out2) - { - out1.value = in1; - out2.value = in2; - return in3; - } - - public Long echoInOuts( - @WebParam(name = "in1") Long in1, - @WebParam(name = "inout1", mode = WebParam.Mode.INOUT) Holder<Integer> inout1, - @WebParam(name = "inout2", mode = WebParam.Mode.INOUT) Holder<String> inout2) - { - return in1; - } - - public Long echoMixed( - @WebParam(name = "in1") Integer in1, - @WebParam(name = "in2") String in2, - @WebParam(name = "inout1", mode = WebParam.Mode.INOUT) Holder<Integer> inout1, - @WebParam(name = "inout2", mode = WebParam.Mode.INOUT) Holder<String> inout2, - @WebParam(name = "in3") Long in3, - @WebParam(name = "out1", mode = WebParam.Mode.OUT) Holder<Integer> out1, - @WebParam(name = "out2", mode = WebParam.Mode.OUT) Holder<String> out2) - { - out1.value = in1; - out2.value = in2; - return in3; - } - - @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) - public void echoBareOut( - @WebParam(name ="in") String in, - @WebParam(name ="out", mode=WebParam.Mode.OUT) Holder<String> out) - { - out.value = in; - } - - @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) - public void echoBareInOut( - @WebParam(name ="inout", mode=WebParam.Mode.INOUT) Holder<String> inout) - { - } - - public void addInOut( - @WebParam(name ="sum", mode=WebParam.Mode.INOUT) Holder<Integer> sum, - @WebParam(name ="add") int add) - { - sum.value = sum.value.intValue() + add; - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,92 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.holder; + +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.ws.Holder; + +/** + * A service which tests JAX-WS Holder types + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + */ +@WebService(name="Holder") +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) +public class HolderServiceImpl +{ + public Long echoOuts( + @WebParam(name = "in1") Integer in1, + @WebParam(name = "in2") String in2, + @WebParam(name = "in3") Long in3, + @WebParam(name = "out1", mode = WebParam.Mode.OUT) Holder<Integer> out1, + @WebParam(name = "out2", mode = WebParam.Mode.OUT) Holder<String> out2) + { + out1.value = in1; + out2.value = in2; + return in3; + } + + public Long echoInOuts( + @WebParam(name = "in1") Long in1, + @WebParam(name = "inout1", mode = WebParam.Mode.INOUT) Holder<Integer> inout1, + @WebParam(name = "inout2", mode = WebParam.Mode.INOUT) Holder<String> inout2) + { + return in1; + } + + public Long echoMixed( + @WebParam(name = "in1") Integer in1, + @WebParam(name = "in2") String in2, + @WebParam(name = "inout1", mode = WebParam.Mode.INOUT) Holder<Integer> inout1, + @WebParam(name = "inout2", mode = WebParam.Mode.INOUT) Holder<String> inout2, + @WebParam(name = "in3") Long in3, + @WebParam(name = "out1", mode = WebParam.Mode.OUT) Holder<Integer> out1, + @WebParam(name = "out2", mode = WebParam.Mode.OUT) Holder<String> out2) + { + out1.value = in1; + out2.value = in2; + return in3; + } + + @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) + public void echoBareOut( + @WebParam(name ="in") String in, + @WebParam(name ="out", mode=WebParam.Mode.OUT) Holder<String> out) + { + out.value = in; + } + + @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) + public void echoBareInOut( + @WebParam(name ="inout", mode=WebParam.Mode.INOUT) Holder<String> inout) + { + } + + public void addInOut( + @WebParam(name ="sum", mode=WebParam.Mode.INOUT) Holder<Integer> sum, + @WebParam(name ="add") int add) + { + sum.value = sum.value.intValue() + add; + } +} \ No newline at end of file Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,119 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.holder; - -// $Id$ - -import java.io.File; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.ws.Holder; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * A JAX-WS holder test case - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - */ -public class HolderTestCase extends JBossWSTest -{ - private org.jboss.test.ws.jaxws.holder.Holder port; - - public static Test suite() - { - return new JBossWSTestSetup(HolderTestCase.class, "jaxws-holder.war"); - } - - protected void setUp() throws Exception - { - super.setUp(); - URL wsdlURL = new File("resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl").toURL(); - QName serviceName = new QName("http://holder.jaxws.ws.test.jboss.org/", "HolderService"); - Service service = Service.create(wsdlURL, serviceName); - port = (org.jboss.test.ws.jaxws.holder.Holder)service.getPort(org.jboss.test.ws.jaxws.holder.Holder.class); - } - - public void testEchoOuts() throws Exception - { - Holder<Integer> out1 = new Holder<Integer>(); - Holder<String> out2 = new Holder<String>(); - assertEquals(new Long(50), port.echoOuts(10, "Hello", 50L, out1, out2)); - assertEquals(new Integer(10), out1.value); - assertEquals("Hello", out2.value); - } - - public void testEchoInOuts() throws Exception - { - Holder<Integer> inout1 = new Holder<Integer>(); - Holder<String> inout2 = new Holder<String>(); - inout1.value = 50; - inout2.value = "Hello"; - assertEquals(new Long(10), port.echoInOuts(10L, inout1, inout2)); - assertEquals(new Integer(50), inout1.value); - assertEquals("Hello", inout2.value); - } - - public void testEchoMixed() throws Exception - { - Holder<Integer> out1 = new Holder<Integer>(); - Holder<String> out2 = new Holder<String>(); - Holder<Integer> inout1 = new Holder<Integer>(); - Holder<String> inout2 = new Holder<String>(); - inout1.value = 50; - inout2.value = "Hello2"; - assertEquals(new Long(20), port.echoMixed(30, "Hello1", inout1, inout2, 20L, out1, out2)); - assertEquals(new Integer(30), out1.value); - assertEquals("Hello1", out2.value); - assertEquals(new Integer(50), inout1.value); - assertEquals("Hello2", inout2.value); - } - - public void testEchoBareOut() throws Exception - { - Holder<String> out = new Holder<String>(); - port.echoBareOut("hi", out); - assertEquals("hi", out.value); - } - - public void testEchoBareInOut() throws Exception - { - Holder<String> inout = new Holder<String>(); - inout.value = "hello world!"; - port.echoBareInOut(inout); - assertEquals("hello world!", inout.value); - } - - public void testInOutAdd() throws Exception - { - Holder<Integer> sum = new Holder<Integer>(); - sum.value = 0; - port.addInOut(sum, 5); - port.addInOut(sum, 3); - port.addInOut(sum, 4); - assertEquals(new Integer(12), sum.value); - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,119 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.holder; + +// $Id$ + +import java.io.File; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Holder; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * A JAX-WS holder test case + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + */ +public class HolderTestCase extends JBossWSTest +{ + private org.jboss.test.ws.jaxws.holder.Holder port; + + public static Test suite() + { + return new JBossWSTestSetup(HolderTestCase.class, "jaxws-holder.war"); + } + + protected void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new File("resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl").toURL(); + QName serviceName = new QName("http://holder.jaxws.ws.test.jboss.org/", "HolderService"); + Service service = Service.create(wsdlURL, serviceName); + port = (org.jboss.test.ws.jaxws.holder.Holder)service.getPort(org.jboss.test.ws.jaxws.holder.Holder.class); + } + + public void testEchoOuts() throws Exception + { + Holder<Integer> out1 = new Holder<Integer>(); + Holder<String> out2 = new Holder<String>(); + assertEquals(new Long(50), port.echoOuts(10, "Hello", 50L, out1, out2)); + assertEquals(new Integer(10), out1.value); + assertEquals("Hello", out2.value); + } + + public void testEchoInOuts() throws Exception + { + Holder<Integer> inout1 = new Holder<Integer>(); + Holder<String> inout2 = new Holder<String>(); + inout1.value = 50; + inout2.value = "Hello"; + assertEquals(new Long(10), port.echoInOuts(10L, inout1, inout2)); + assertEquals(new Integer(50), inout1.value); + assertEquals("Hello", inout2.value); + } + + public void testEchoMixed() throws Exception + { + Holder<Integer> out1 = new Holder<Integer>(); + Holder<String> out2 = new Holder<String>(); + Holder<Integer> inout1 = new Holder<Integer>(); + Holder<String> inout2 = new Holder<String>(); + inout1.value = 50; + inout2.value = "Hello2"; + assertEquals(new Long(20), port.echoMixed(30, "Hello1", inout1, inout2, 20L, out1, out2)); + assertEquals(new Integer(30), out1.value); + assertEquals("Hello1", out2.value); + assertEquals(new Integer(50), inout1.value); + assertEquals("Hello2", inout2.value); + } + + public void testEchoBareOut() throws Exception + { + Holder<String> out = new Holder<String>(); + port.echoBareOut("hi", out); + assertEquals("hi", out.value); + } + + public void testEchoBareInOut() throws Exception + { + Holder<String> inout = new Holder<String>(); + inout.value = "hello world!"; + port.echoBareInOut(inout); + assertEquals("hello world!", inout.value); + } + + public void testInOutAdd() throws Exception + { + Holder<Integer> sum = new Holder<Integer>(); + sum.value = 0; + port.addInOut(sum, 5); + port.addInOut(sum, 3); + port.addInOut(sum, 4); + assertEquals(new Integer(12), sum.value); + } +} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1190; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - If the implementation bean does not implement a service endpoint interface and - there are no @WebMethod annotations in the implementation bean (excluding - @WebMethod annotations used to exclude inherited @WebMethods), all public - methods other than those inherited from java.lang.Object will be exposed as Web - Service operations, subject to the inheritance rules specified in Common - Annotations for the Java Platform [12], section 2.1. - */ -@WebService(serviceName = "ConfidentialService", targetNamespace = "http://org.jboss/test/ws/jbws1190") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class ConfidentialEndpoint -{ - - // Intentionally no @WebMethod, see above - public String helloWorld(final String message) - { - return message; - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1190; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + If the implementation bean does not implement a service endpoint interface and + there are no @WebMethod annotations in the implementation bean (excluding + @WebMethod annotations used to exclude inherited @WebMethods), all public + methods other than those inherited from java.lang.Object will be exposed as Web + Service operations, subject to the inheritance rules specified in Common + Annotations for the Java Platform [12], section 2.1. + */ +@WebService(serviceName = "ConfidentialService", targetNamespace = "http://org.jboss/test/ws/jbws1190") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class ConfidentialEndpoint +{ + + // Intentionally no @WebMethod, see above + public String helloWorld(final String message) + { + return message; + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1190; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -public class JBWS1190Exception extends RuntimeException -{ - - public JBWS1190Exception() - { - super(); - } - - public JBWS1190Exception(final String message, final Throwable cause) - { - super(message, cause); - } - - public JBWS1190Exception(final String message) - { - super(message); - } - - public JBWS1190Exception(final Throwable cause) - { - super(cause); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1190; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 19-October-2006 + */ +public class JBWS1190Exception extends RuntimeException +{ + + public JBWS1190Exception() + { + super(); + } + + public JBWS1190Exception(final String message, final Throwable cause) + { + super(message, cause); + } + + public JBWS1190Exception(final String message) + { + super(message); + } + + public JBWS1190Exception(final Throwable cause) + { + super(cause); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1190; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account - * - * http://jira.jboss.org/jira/browse/JBWS-1190 - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -public class JBWS1190TestCase extends JBossWSTest -{ - - private static final String ARCHIVE_NAME = "jaxws-jbws1190.war"; - - private static TestEndpoint port; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME); - } - - protected void setUp() throws Exception - { - if (port == null) - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/TestEndpoint?wsdl"); - QName qname = new QName("http://org.jboss/test/ws/jbws1190", "TestService"); - Service service = Service.create(wsdlURL, qname); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - - public void testTestEndpoint() throws Exception - { - port.testAddress(ARCHIVE_NAME, "TestService", "http", "8080"); - } - - public void testConfidentialEndpoint() throws Exception - { - port.testAddress(ARCHIVE_NAME, "ConfidentialService", "https", "8443"); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1190; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account + * + * http://jira.jboss.org/jira/browse/JBWS-1190 + * + * @author darran.lofthouse(a)jboss.com + * @since 19-October-2006 + */ +public class JBWS1190TestCase extends JBossWSTest +{ + + private static final String ARCHIVE_NAME = "jaxws-jbws1190.war"; + + private static TestEndpoint port; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME); + } + + protected void setUp() throws Exception + { + if (port == null) + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/TestEndpoint?wsdl"); + QName qname = new QName("http://org.jboss/test/ws/jbws1190", "TestService"); + Service service = Service.create(wsdlURL, qname); + port = (TestEndpoint)service.getPort(TestEndpoint.class); + } + } + + public void testTestEndpoint() throws Exception + { + port.testAddress(ARCHIVE_NAME, "TestService", "http", "8080"); + } + + public void testConfidentialEndpoint() throws Exception + { + port.testAddress(ARCHIVE_NAME, "ConfidentialService", "https", "8443"); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1190; - -import java.rmi.Remote; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint extends Remote -{ - - @WebMethod - public void testAddress(final String archive, final String service, final String scheme, final String port); - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1190; + +import java.rmi.Remote; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 19-October-2006 + */ +@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint extends Remote +{ + + @WebMethod + public void testAddress(final String archive, final String service, final String scheme, final String port); + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,118 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1190; - -import java.io.File; -import java.io.FilenameFilter; -import java.net.MalformedURLException; - -import javax.jws.WebService; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; - -/** - * [JBWS-1190] - WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account - * - * http://jira.jboss.org/jira/browse/JBWS-1190 - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -@WebService(name = "Test", serviceName = "TestService", targetNamespace = "http://org.jboss/test/ws/jbws1190", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint") -public class TestEndpointImpl implements TestEndpoint -{ - - public void testAddress(final String archive, final String service, final String scheme, final String port) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();File tmpDir = serverConfig.getServerTempDir(); - - File dataDir = serverConfig.getServerDataDir(); - File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); - - if (wsdlDir.exists() == false) - { - throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist."); - } - - File[] wsdls = wsdlDir.listFiles(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.startsWith(service); - } - }); - - File wsdlFile = null; - for (int i = 0; i < wsdls.length; i++) - { - if (wsdlFile == null || wsdls[i].compareTo(wsdlFile) > 0) - { - wsdlFile = wsdls[i]; - } - } - assertTrue("No WSDL files found", wsdlFile != null); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdl; - try - { - wsdl = factory.parse(wsdlFile.toURL()); - } - catch (MalformedURLException e) - { - throw new JBWS1190Exception("Error readin WSDL", e); - } - - WSDLService[] services = wsdl.getServices(); - assertEquals("No of services", 1, services.length); - - WSDLEndpoint[] endpoints = services[0].getEndpoints(); - assertEquals("No of endpoints", 1, endpoints.length); - - String address = endpoints[0].getAddress(); - assertTrue("Expected Scheme '" + scheme + "' from address '" + address + "'", address.startsWith(scheme + "://")); - assertTrue("Expected Port '" + port + "' from address '" + address + "'", address.indexOf(":" + port + "/") > -1); - } - - private void assertEquals(final String message, final int expected, final int actual) - { - if (expected != actual) - { - throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual); - } - } - - private void assertTrue(final String message, final boolean value) - { - if (value == false) - { - throw new JBWS1190Exception(message); - } - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,118 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1190; + +import java.io.File; +import java.io.FilenameFilter; +import java.net.MalformedURLException; + +import javax.jws.WebService; + +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLEndpoint; +import org.jboss.ws.metadata.wsdl.WSDLService; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; + +/** + * [JBWS-1190] - WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account + * + * http://jira.jboss.org/jira/browse/JBWS-1190 + * + * @author darran.lofthouse(a)jboss.com + * @since 19-October-2006 + */ +@WebService(name = "Test", serviceName = "TestService", targetNamespace = "http://org.jboss/test/ws/jbws1190", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint") +public class TestEndpointImpl implements TestEndpoint +{ + + public void testAddress(final String archive, final String service, final String scheme, final String port) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();File tmpDir = serverConfig.getServerTempDir(); + + File dataDir = serverConfig.getServerDataDir(); + File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); + + if (wsdlDir.exists() == false) + { + throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist."); + } + + File[] wsdls = wsdlDir.listFiles(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.startsWith(service); + } + }); + + File wsdlFile = null; + for (int i = 0; i < wsdls.length; i++) + { + if (wsdlFile == null || wsdls[i].compareTo(wsdlFile) > 0) + { + wsdlFile = wsdls[i]; + } + } + assertTrue("No WSDL files found", wsdlFile != null); + + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdl; + try + { + wsdl = factory.parse(wsdlFile.toURL()); + } + catch (MalformedURLException e) + { + throw new JBWS1190Exception("Error readin WSDL", e); + } + + WSDLService[] services = wsdl.getServices(); + assertEquals("No of services", 1, services.length); + + WSDLEndpoint[] endpoints = services[0].getEndpoints(); + assertEquals("No of endpoints", 1, endpoints.length); + + String address = endpoints[0].getAddress(); + assertTrue("Expected Scheme '" + scheme + "' from address '" + address + "'", address.startsWith(scheme + "://")); + assertTrue("Expected Port '" + port + "' from address '" + address + "'", address.indexOf(":" + port + "/") > -1); + } + + private void assertEquals(final String message, final int expected, final int actual) + { + if (expected != actual) + { + throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual); + } + } + + private void assertTrue(final String message, final boolean value) + { + if (value == false) + { + throw new JBWS1190Exception(message); + } + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1283; - -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; - -import javax.activation.DataHandler; -import javax.xml.soap.AttachmentPart; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -/** - * Appends attachments to outbound message. - * - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class AttachmentHandler extends GenericSOAPHandler -{ - protected boolean handleOutbound(MessageContext msgContext) - { - System.out.println("AttachmentHandler: Adding attachment ot message"); - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - AttachmentPart attachment = soapMessage.createAttachmentPart(new DataHandler("Server data", "text/plain")); - soapMessage.addAttachmentPart(attachment); - return true; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1283; + +import org.jboss.wsf.common.handler.GenericSOAPHandler; + +import javax.activation.DataHandler; +import javax.xml.soap.AttachmentPart; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +/** + * Appends attachments to outbound message. + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class AttachmentHandler extends GenericSOAPHandler +{ + protected boolean handleOutbound(MessageContext msgContext) + { + System.out.println("AttachmentHandler: Adding attachment ot message"); + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + AttachmentPart attachment = soapMessage.createAttachmentPart(new DataHandler("Server data", "text/plain")); + soapMessage.addAttachmentPart(attachment); + return true; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1283; - -import javax.jws.WebService; -import javax.ejb.Remote; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ - -@WebService(targetNamespace = "http://org.jboss.test.ws/jbws1283") -@Remote -public interface JBWS1283Endpoint -{ - void requestAttachmentData(); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283Endpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1283; + +import javax.jws.WebService; +import javax.ejb.Remote; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ + +@WebService(targetNamespace = "http://org.jboss.test.ws/jbws1283") +@Remote +public interface JBWS1283Endpoint +{ + void requestAttachmentData(); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1283; - -import org.jboss.wsf.spi.annotation.WebContext; - -import javax.jws.WebService; -import javax.jws.HandlerChain; -import javax.ejb.Stateless; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -@WebService( - endpointInterface = "org.jboss.test.ws.jaxws.jbws1283.JBWS1283Endpoint", - serviceName = "JBWS1283Service", - targetNamespace = "http://org.jboss.test.ws/jbws1283" - ) -@HandlerChain(file = "jaxws-handlers-server.xml") -@WebContext(contextRoot = "jaxws-jbws1283") -@Stateless -public class JBWS1283EndpointImpl implements JBWS1283Endpoint -{ - - public void requestAttachmentData() - { - System.out.println("AttachmentData will be added within Handler.handleResponse()"); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283EndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1283; + +import org.jboss.wsf.spi.annotation.WebContext; + +import javax.jws.WebService; +import javax.jws.HandlerChain; +import javax.ejb.Stateless; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@WebService( + endpointInterface = "org.jboss.test.ws.jaxws.jbws1283.JBWS1283Endpoint", + serviceName = "JBWS1283Service", + targetNamespace = "http://org.jboss.test.ws/jbws1283" + ) +@HandlerChain(file = "jaxws-handlers-server.xml") +@WebContext(contextRoot = "jaxws-jbws1283") +@Stateless +public class JBWS1283EndpointImpl implements JBWS1283Endpoint +{ + + public void requestAttachmentData() + { + System.out.println("AttachmentData will be added within Handler.handleResponse()"); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,111 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1283; - -import junit.framework.Test; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -import javax.xml.namespace.QName; -import javax.xml.soap.AttachmentPart; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.handler.Handler; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * Attachment dropped on outbound messages if they have been - * added thorugh a handler - * - * http://jira.jboss.org/jira/browse/JBWS-1283 - * - * @version $Revision:1370 $ - */ -public class JBWS1283TestCase extends JBossWSTest -{ - private String targetNS = "http://org.jboss.test.ws/jbws1283"; - private JBWS1283Endpoint port; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1283TestCase.class, "jaxws-jbws1283.jar"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "JBWS1283Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1283/JBWS1283EndpointImpl?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - port = (JBWS1283Endpoint)service.getPort(JBWS1283Endpoint.class); - } - - public void testAttachmentResponse() throws Exception - { - // Add a client-side handler that verifes existence of the attachment - BindingProvider bindingProvider = (BindingProvider)port; - List<Handler> handlerChain = new ArrayList<Handler>(); - handlerChain.add(new VerifyAttachmentHandler()); - bindingProvider.getBinding().setHandlerChain(handlerChain); - - port.requestAttachmentData(); - } - - // handler that verifies the attachment that have been added on the server-side - class VerifyAttachmentHandler extends GenericSOAPHandler - { - - protected boolean handleInbound(MessageContext msgContext) - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - Iterator it = soapMessage.getAttachments(); - while(it.hasNext()) - { - try - { - AttachmentPart attachment = (AttachmentPart)it.next(); - System.out.println("Recv " + attachment.getContentType() + " attachment:"); - System.out.println("'"+attachment.getContent()+"'"); - return true; - } - catch (SOAPException e) - { - throw new RuntimeException("Failed to access attachment data"); - } - } - - throw new IllegalStateException("Missing attachment on the client side"); - } - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,112 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1283; + +import junit.framework.Test; + +import org.jboss.wsf.common.handler.GenericSOAPHandler; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +import javax.xml.namespace.QName; +import javax.xml.soap.AttachmentPart; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.handler.Handler; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; +import java.net.URL; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** + * Attachment dropped on outbound messages if they have been + * added thorugh a handler + * + * http://jira.jboss.org/jira/browse/JBWS-1283 + * + * @version $Revision:1370 $ + */ +public class JBWS1283TestCase extends JBossWSTest +{ + private String targetNS = "http://org.jboss.test.ws/jbws1283"; + private JBWS1283Endpoint port; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1283TestCase.class, "jaxws-jbws1283.jar"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "JBWS1283Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1283/JBWS1283EndpointImpl?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + port = (JBWS1283Endpoint)service.getPort(JBWS1283Endpoint.class); + } + + public void testAttachmentResponse() throws Exception + { + // Add a client-side handler that verifes existence of the attachment + BindingProvider bindingProvider = (BindingProvider)port; + List<Handler> handlerChain = new ArrayList<Handler>(); + handlerChain.add(new VerifyAttachmentHandler()); + bindingProvider.getBinding().setHandlerChain(handlerChain); + + port.requestAttachmentData(); + } + + // handler that verifies the attachment that have been added on the server-side + class VerifyAttachmentHandler extends GenericSOAPHandler + { + + protected boolean handleInbound(MessageContext msgContext) + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + Iterator it = soapMessage.getAttachments(); + while(it.hasNext()) + { + try + { + AttachmentPart attachment = (AttachmentPart)it.next(); + System.out.println("Recv " + attachment.getContentType() + " attachment:"); + System.out.println("'"+attachment.getContent()+"'"); + return true; + } + catch (SOAPException e) + { + throw new RuntimeException("Failed to access attachment data"); + } + } + + throw new IllegalStateException("Missing attachment on the client side"); + } + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name>AttachmentHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxws.jbws1283.AttachmentHandler</handler-class> - </handler> - </handler-chain> -</handler-chains> \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/jaxws-handlers-server.xml 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name>AttachmentHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.jbws1283.AttachmentHandler</handler-class> + </handler> + </handler-chain> +</handler-chains> \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,29 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1357; -import javax.jws.WebService; - -@WebService -public interface JBWS1357 -{ - public String echo(String message); -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,29 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1357; +import javax.jws.WebService; + +@WebService +public interface JBWS1357 +{ + public String echo(String message); +} \ No newline at end of file Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1357; - -import javax.jws.WebService; - -@WebService(name="JBWS1357", serviceName="JBWS1357Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1357.JBWS1357") -public class JBWS1357Impl implements JBWS1357 -{ - public String echo(String message) - { - return message; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1357; + +import javax.jws.WebService; + +@WebService(name="JBWS1357", serviceName="JBWS1357Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1357.JBWS1357") +public class JBWS1357Impl implements JBWS1357 +{ + public String echo(String message) + { + return message; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1357; - -import java.net.HttpURLConnection; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * JAXWSDeployerJSE is not handling jsp servlet defs correctly - * - * http://jira.jboss.org/jira/browse/JBWS-1357 - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - * @version $Revision:1370 $ - */ -public class JBWS1357TestCase extends JBossWSTest -{ - private String targetNS = "http://jbws1357.jaxws.ws.test.jboss.org/"; - private JBWS1357 proxy; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1357TestCase.class, "jaxws-jbws1357.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "JBWS1357Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1357/JBWS1357Service?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = (JBWS1357)service.getPort(JBWS1357.class); - } - - public void testEcho() throws Exception - { - assertEquals("hi there", proxy.echo("hi there")); - } - - public void testJSP() throws Exception - { - URL jsp = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1357/hello.jsp"); - HttpURLConnection conn = (HttpURLConnection) jsp.openConnection(); - assertEquals(conn.getResponseCode(), 200); - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1357; + +import java.net.HttpURLConnection; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * JAXWSDeployerJSE is not handling jsp servlet defs correctly + * + * http://jira.jboss.org/jira/browse/JBWS-1357 + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + * @version $Revision:1370 $ + */ +public class JBWS1357TestCase extends JBossWSTest +{ + private String targetNS = "http://jbws1357.jaxws.ws.test.jboss.org/"; + private JBWS1357 proxy; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1357TestCase.class, "jaxws-jbws1357.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "JBWS1357Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1357/JBWS1357Service?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + proxy = (JBWS1357)service.getPort(JBWS1357.class); + } + + public void testEcho() throws Exception + { + assertEquals("hi there", proxy.echo("hi there")); + } + + public void testJSP() throws Exception + { + URL jsp = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1357/hello.jsp"); + HttpURLConnection conn = (HttpURLConnection) jsp.openConnection(); + assertEquals(conn.getResponseCode(), 200); + } +} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1422; - -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) -public interface IWebsvc -{ - - String cancel(@WebParam(name = "nBarFoo") - String myfoobar); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1422; + +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) +public interface IWebsvc +{ + + String cancel(@WebParam(name = "nBarFoo") + String myfoobar); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1422; - -import javax.ejb.Stateless; -import javax.jws.WebParam; -import javax.jws.WebService; - -@Stateless -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1422.IWebsvc", serviceName = "JBWS1422Service") -public class IWebsvcImpl implements IWebsvc -{ - - public String cancel(@WebParam(name = "nBarFoo") String myfoobar) - { - return "Cancelled-" + myfoobar; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1422; + +import javax.ejb.Stateless; +import javax.jws.WebParam; +import javax.jws.WebService; + +@Stateless +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1422.IWebsvc", serviceName = "JBWS1422Service") +public class IWebsvcImpl implements IWebsvc +{ + + public String cancel(@WebParam(name = "nBarFoo") String myfoobar) + { + return "Cancelled-" + myfoobar; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,70 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1422; - -// $Id$ - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1422] NPE if @WebParam.name like "mX.." - * - * @author Thomas.Diesler(a)jboss.com - */ -public class JBWS1422TestCase extends JBossWSTest -{ - private static final String TARGET_NAMESPACE = "http://jbws1422.jaxws.ws.test.jboss.org/"; - private static URL wsdlURL; - private static IWebsvc port; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1422TestCase.class, "jaxws-jbws1422.jar"); - } - - @Override - protected void setUp() throws Exception - { - if (port == null) - { - QName serviceName = new QName(TARGET_NAMESPACE, "JBWS1422Service"); - wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1422/IWebsvcImpl?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(IWebsvc.class); - } - } - - public void testDeployment() throws Exception - { - String result = port.cancel("myFooBar"); - assertEquals("Cancelled-myFooBar", result); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1422; + +// $Id$ + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1422] NPE if @WebParam.name like "mX.." + * + * @author Thomas.Diesler(a)jboss.com + */ +public class JBWS1422TestCase extends JBossWSTest +{ + private static final String TARGET_NAMESPACE = "http://jbws1422.jaxws.ws.test.jboss.org/"; + private static URL wsdlURL; + private static IWebsvc port; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1422TestCase.class, "jaxws-jbws1422.jar"); + } + + @Override + protected void setUp() throws Exception + { + if (port == null) + { + QName serviceName = new QName(TARGET_NAMESPACE, "JBWS1422Service"); + wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1422/IWebsvcImpl?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(IWebsvc.class); + } + } + + public void testDeployment() throws Exception + { + String result = port.cancel("myFooBar"); + assertEquals("Cancelled-myFooBar", result); + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1446; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.logging.Logger; - -@Stateless -@WebService -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class EJB3Bean -{ - private static Logger log = Logger.getLogger(EJB3Bean.class); - - @WebMethod - public Object helloObject(Object msg) - { - log.info("helloObject: " + msg.getClass() + " - " + msg); - return msg; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1446; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +@Stateless +@WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class EJB3Bean +{ + private static Logger log = Logger.getLogger(EJB3Bean.class); + + @WebMethod + public Object helloObject(Object msg) + { + log.info("helloObject: " + msg.getClass() + " - " + msg); + return msg; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,20 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 02 21:17:37 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jaxws.jbws1446; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface EndpointInterface -{ - public Object helloObject(Object msg); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,20 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 02 21:17:37 CET 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jaxws.jbws1446; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface EndpointInterface +{ + public Object helloObject(Object msg); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1446; - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1446] Invalid WSDL when a parameter of type Object is part of a webmethod - * - * http://jira.jboss.org/jira/browse/JBWS-1446 - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Jun-2007 - */ -public class JBWS1446TestCase extends JBossWSTest -{ - private static EndpointInterface port; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1446TestCase.class, "jaxws-jbws1446.jar"); - } - - public void setUp() throws MalformedURLException - { - if (port == null) - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1446/EJB3Bean?wsdl"); - QName serviceName = new QName("http://jbws1446.jaxws.ws.test.jboss.org/", "EJB3BeanService"); - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(EndpointInterface.class); - } - } - - public void testObjectAccess() throws Exception - { - Object hello = port.helloObject("hello"); - assertEquals("hello", hello); - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1446; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1446] Invalid WSDL when a parameter of type Object is part of a webmethod + * + * http://jira.jboss.org/jira/browse/JBWS-1446 + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Jun-2007 + */ +public class JBWS1446TestCase extends JBossWSTest +{ + private static EndpointInterface port; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1446TestCase.class, "jaxws-jbws1446.jar"); + } + + public void setUp() throws MalformedURLException + { + if (port == null) + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1446/EJB3Bean?wsdl"); + QName serviceName = new QName("http://jbws1446.jaxws.ws.test.jboss.org/", "EJB3BeanService"); + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(EndpointInterface.class); + } + } + + public void testObjectAccess() throws Exception + { + Object hello = port.helloObject("hello"); + assertEquals("hello", hello); + } +} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1505; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public final class CustomType implements Interface2 -{ - private int member1 = 1; - private int member2 = 2; - - public int getMember2() - { - return this.member2; - } - - public void setMember2(int member2) - { - - } - - public CustomType getCustomType() - { - return null; - } - - public int getMember1() - { - return this.member1; - } - - public void setMember1(int member1) - { - - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/CustomType.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1505; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public final class CustomType implements Interface2 +{ + private int member1 = 1; + private int member2 = 2; + + public int getMember2() + { + return this.member2; + } + + public void setMember2(int member2) + { + + } + + public CustomType getCustomType() + { + return null; + } + + public int getMember1() + { + return this.member1; + } + + public void setMember1(int member1) + { + + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1505; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public interface Interface1 -{ - public int getMember1(); - public void setMember1(int member1); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1505; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public interface Interface1 +{ + public int getMember1(); + public void setMember1(int member1); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1505; - -import javax.jws.WebService; -import javax.ejb.Remote; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -@WebService(targetNamespace = "http://org.jboss.test.ws/jbws1505") -@Remote -public interface Interface2 extends Interface1 -{ - public int getMember2(); - public void setMember2(int member2); - - public CustomType getCustomType(); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1505; + +import javax.jws.WebService; +import javax.ejb.Remote; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@WebService(targetNamespace = "http://org.jboss.test.ws/jbws1505") +@Remote +public interface Interface2 extends Interface1 +{ + public int getMember2(); + public void setMember2(int member2); + + public CustomType getCustomType(); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,67 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1505; - -import javax.jws.WebService; -import javax.ejb.Stateless; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -@WebService( - endpointInterface = "org.jboss.test.ws.jaxws.jbws1505.Interface2", - serviceName = "JBWS1505Service", - targetNamespace = "http://org.jboss.test.ws/jbws1505" -) -@Stateless -public class JBWS1505EndpointImpl implements Interface2 -{ - - private int member = 1; - private int member2 = 2; - - public int getMember2() - { - return this.member2; - } - - public void setMember2(int member2) - { - this.member = member2; - } - - public CustomType getCustomType() - { - return new CustomType(); - } - - public int getMember1() - { - return this.member; - } - - public void setMember1(int member1) - { - this.member = member1; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505EndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1505; + +import javax.jws.WebService; +import javax.ejb.Stateless; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@WebService( + endpointInterface = "org.jboss.test.ws.jaxws.jbws1505.Interface2", + serviceName = "JBWS1505Service", + targetNamespace = "http://org.jboss.test.ws/jbws1505" +) +@Stateless +public class JBWS1505EndpointImpl implements Interface2 +{ + + private int member = 1; + private int member2 = 2; + + public int getMember2() + { + return this.member2; + } + + public void setMember2(int member2) + { + this.member = member2; + } + + public CustomType getCustomType() + { + return new CustomType(); + } + + public int getMember1() + { + return this.member; + } + + public void setMember1(int member1) + { + this.member = member1; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1505; - -import junit.framework.Test; -import org.jboss.ws.WSException; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.net.URL; - -/** - * Verify wsdl gerneration on SEI inheritance. - * - * http://jira.jboss.org/jira/browse/JBWS-1505 - * - * @version $Revision:1370 $ - */ -public class JBWS1505TestCase extends JBossWSTest -{ - private String targetNS = "http://org.jboss.test.ws/jbws1505"; - private Interface2 port; - private URL wsdlURL; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1505TestCase.class, "jaxws-jbws1505.jar"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "JBWS1505Service"); - wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1505/JBWS1505EndpointImpl?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(Interface2.class); - } - - /** - * All methods on the SEI should be mapped. - * - * @throws Exception - */ - public void testWSDLGeneration() throws Exception - { - try - { - WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); - assertTrue(wsdl.getInterfaces().length == 1); // a single port - assertTrue(wsdl.getInterfaces()[0].getOperations().length == 5); // with five op's - } - catch (Exception ex) - { - WSException.rethrow(ex); - } - } - - /** - * Complex types that inherit from a SEI hirarchy shold expose - * all members in xml schema. - * - * @throws Exception - */ - public void testTypeInheritance() throws Exception - { - try - { - CustomType ct = port.getCustomType(); - assertTrue(ct.getMember1() == 1); - assertTrue(ct.getMember2() == 2); - } - catch (Exception ex) - { - WSException.rethrow(ex); - } - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1505; + +import junit.framework.Test; +import org.jboss.ws.WSException; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import java.net.URL; + +/** + * Verify wsdl gerneration on SEI inheritance. + * + * http://jira.jboss.org/jira/browse/JBWS-1505 + * + * @version $Revision:1370 $ + */ +public class JBWS1505TestCase extends JBossWSTest +{ + private String targetNS = "http://org.jboss.test.ws/jbws1505"; + private Interface2 port; + private URL wsdlURL; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1505TestCase.class, "jaxws-jbws1505.jar"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "JBWS1505Service"); + wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1505/JBWS1505EndpointImpl?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(Interface2.class); + } + + /** + * All methods on the SEI should be mapped. + * + * @throws Exception + */ + public void testWSDLGeneration() throws Exception + { + try + { + WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); + assertTrue(wsdl.getInterfaces().length == 1); // a single port + assertTrue(wsdl.getInterfaces()[0].getOperations().length == 5); // with five op's + } + catch (Exception ex) + { + WSException.rethrow(ex); + } + } + + /** + * Complex types that inherit from a SEI hirarchy shold expose + * all members in xml schema. + * + * @throws Exception + */ + public void testTypeInheritance() throws Exception + { + try + { + CustomType ct = port.getCustomType(); + assertTrue(ct.getMember1() == 1); + assertTrue(ct.getMember2() == 2); + } + catch (Exception ex) + { + WSException.rethrow(ex); + } + } + +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,29 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1529; -import javax.jws.WebService; - -@WebService (targetNamespace="http://sei-namespace") -public interface JBWS1529 -{ - public String echo(String message) throws UserException; -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,29 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1529; +import javax.jws.WebService; + +@WebService (targetNamespace="http://sei-namespace") +public interface JBWS1529 +{ + public String echo(String message) throws UserException; +} \ No newline at end of file Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1529; - -import javax.jws.WebService; - -// An endpoint implementation that does not define a target namespace -// does NOT inherit the namespace from the referrenced SEI -@WebService(name="JBWS1529", serviceName="JBWS1529Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1529.JBWS1529") -public class JBWS1529Impl implements JBWS1529 -{ - public String echo(String message) throws UserException - { - if ("dofault".equals(message)) - throw new UserException(); - - return message; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1529; + +import javax.jws.WebService; + +// An endpoint implementation that does not define a target namespace +// does NOT inherit the namespace from the referrenced SEI +@WebService(name="JBWS1529", serviceName="JBWS1529Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1529.JBWS1529") +public class JBWS1529Impl implements JBWS1529 +{ + public String echo(String message) throws UserException + { + if ("dofault".equals(message)) + throw new UserException(); + + return message; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1529; - -import java.io.File; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * wsdlReader fails with faults defined on jaxws SEI - * - * http://jira.jboss.org/jira/browse/JBWS-1529 - * - * @author Thomas.Diesler(a)jboss.com - */ -public class JBWS1529TestCase extends JBossWSTest -{ - private String targetNS = "http://jbws1529.jaxws.ws.test.jboss.org/"; - private JBWS1529 proxy; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "JBWS1529Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1529/TestService?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = (JBWS1529)service.getPort(JBWS1529.class); - } - - public void testWSDLReader() throws Exception - { - File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); - assertTrue(wsdlFile.exists()); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdl = factory.parse(wsdlFile.toURL()); - assertNotNull(wsdl); - } - - public void testEcho() throws Exception - { - String retStr = proxy.echo("hi there"); - assertEquals("hi there", retStr); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1529; + +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * wsdlReader fails with faults defined on jaxws SEI + * + * http://jira.jboss.org/jira/browse/JBWS-1529 + * + * @author Thomas.Diesler(a)jboss.com + */ +public class JBWS1529TestCase extends JBossWSTest +{ + private String targetNS = "http://jbws1529.jaxws.ws.test.jboss.org/"; + private JBWS1529 proxy; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "JBWS1529Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1529/TestService?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + proxy = (JBWS1529)service.getPort(JBWS1529.class); + } + + public void testWSDLReader() throws Exception + { + File wsdlFile = new File("resources/jaxws/jbws1529/META-INF/wsdl/JBWS1529Service.wsdl"); + assertTrue(wsdlFile.exists()); + + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdl = factory.parse(wsdlFile.toURL()); + assertNotNull(wsdl); + } + + public void testEcho() throws Exception + { + String retStr = proxy.echo("hi there"); + assertEquals("hi there", retStr); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,26 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1529; - -public class UserException extends Exception -{ -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1529/UserException.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1529; + +public class UserException extends Exception +{ +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1556; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.wsf.spi.annotation.WebContext; - -@Stateless - -@WebService -@SOAPBinding(style = SOAPBinding.Style.RPC) -@WebContext(contextRoot = "jaxws-jbws1556") -public class EJB3Bean -{ - @WebMethod - public String helloSimple(String msg) - { - return msg; - } - - @WebMethod - public UserType helloComplex(UserType msg) - { - return msg; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1556; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.wsf.spi.annotation.WebContext; + +@Stateless + +@WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) +@WebContext(contextRoot = "jaxws-jbws1556") +public class EJB3Bean +{ + @WebMethod + public String helloSimple(String msg) + { + return msg; + } + + @WebMethod + public UserType helloComplex(UserType msg) + { + return msg; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,22 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 02 21:17:37 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jaxws.jbws1556; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface EndpointInterface -{ - String helloSimple(String msg); - - UserType helloComplex(UserType msg); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,22 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 02 21:17:37 CET 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jaxws.jbws1556; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface EndpointInterface +{ + String helloSimple(String msg); + + UserType helloComplex(UserType msg); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1556; - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1556] @WebWservice does not work with class isolation - * - * http://jira.jboss.org/jira/browse/JBWS-1556 - * - * @author Thomas.Diesler(a)jboss.com - * @since 15-Jun-2007 - */ -public class JBWS1556EarTestCase extends JBossWSTest -{ - private static EndpointInterface port; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1556EarTestCase.class, "jaxws-jbws1556.ear"); - } - - public void setUp() throws MalformedURLException - { - if (port == null) - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1556/EJB3Bean?wsdl"); - QName serviceName = new QName("http://jbws1556.jaxws.ws.test.jboss.org/", "EJB3BeanService"); - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(EndpointInterface.class); - } - } - - public void testSimpleAccess() throws Exception - { - String hello = port.helloSimple("hello"); - assertEquals("hello", hello); - } - - public void testComplexAccess() throws Exception - { - UserType req = new UserType("hello"); - UserType res = port.helloComplex(req); - assertEquals(req, res); - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1556; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1556] @WebWservice does not work with class isolation + * + * http://jira.jboss.org/jira/browse/JBWS-1556 + * + * @author Thomas.Diesler(a)jboss.com + * @since 15-Jun-2007 + */ +public class JBWS1556EarTestCase extends JBossWSTest +{ + private static EndpointInterface port; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1556EarTestCase.class, "jaxws-jbws1556.ear"); + } + + public void setUp() throws MalformedURLException + { + if (port == null) + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1556/EJB3Bean?wsdl"); + QName serviceName = new QName("http://jbws1556.jaxws.ws.test.jboss.org/", "EJB3BeanService"); + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(EndpointInterface.class); + } + } + + public void testSimpleAccess() throws Exception + { + String hello = port.helloSimple("hello"); + assertEquals("hello", hello); + } + + public void testComplexAccess() throws Exception + { + UserType req = new UserType("hello"); + UserType res = port.helloComplex(req); + assertEquals(req, res); + } +} \ No newline at end of file Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/UserType.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/UserType.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/UserType.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1556; - -public class UserType -{ - private String name; - - public UserType() - { - } - - public UserType(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public boolean equals(Object obj) - { - if (obj instanceof UserType) - { - return toString().equals(obj.toString()); - } - return false; - } - - public String toString() - { - return "" + name; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/UserType.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/UserType.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/UserType.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1556/UserType.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1556; + +public class UserType +{ + private String name; + + public UserType() + { + } + + public UserType(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public boolean equals(Object obj) + { + if (obj instanceof UserType) + { + return toString().equals(obj.toString()); + } + return false; + } + + public String toString() + { + return "" + name; + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/a) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/b) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1581; - -import java.net.URL; - -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.xml.ws.WebServiceRef; - -@Stateless -(a)Remote(EJB3Remote.class) -public class EJB3Bean implements EJB3Remote -{ - @WebServiceRef(wsdlLocation = "META-INF/wsdl/TestService.wsdl") - public EndpointInterface port; - - public String runTest(String message) - { - URL seiSource = EndpointInterface.class.getProtectionDomain().getCodeSource().getLocation(); - URL ejb3Source = EJB3Bean.class.getProtectionDomain().getCodeSource().getLocation(); - - if (seiSource.equals(ejb3Source) == false) - message = "SEI incorrectly loaded from: " + seiSource; - - return port.hello(message); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1581; + +import java.net.URL; + +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.xml.ws.WebServiceRef; + +@Stateless +(a)Remote(EJB3Remote.class) +public class EJB3Bean implements EJB3Remote +{ + @WebServiceRef(wsdlLocation = "META-INF/wsdl/TestService.wsdl") + public EndpointInterface port; + + public String runTest(String message) + { + URL seiSource = EndpointInterface.class.getProtectionDomain().getCodeSource().getLocation(); + URL ejb3Source = EJB3Bean.class.getProtectionDomain().getCodeSource().getLocation(); + + if (seiSource.equals(ejb3Source) == false) + message = "SEI incorrectly loaded from: " + seiSource; + + return port.hello(message); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,30 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1581; - - -public interface EJB3Remote -{ - - public String runTest(final String message); - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,30 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1581; + + +public interface EJB3Remote +{ + + public String runTest(final String message); + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1581; - -import javax.jws.WebService; - -import org.jboss.logging.Logger; - -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1581.EndpointInterface", serviceName = "TestService") -public class EndpointBean -{ - private static final Logger log = Logger.getLogger(EndpointBean.class); - - public String hello(final String message) - { - log.info("hello: " + message); - return message; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1581; + +import javax.jws.WebService; + +import org.jboss.logging.Logger; + +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1581.EndpointInterface", serviceName = "TestService") +public class EndpointBean +{ + private static final Logger log = Logger.getLogger(EndpointBean.class); + + public String hello(final String message) + { + log.info("hello: " + message); + return message; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,25 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 02 21:17:37 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jaxws.jbws1581; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService -@SOAPBinding(style = SOAPBinding.Style.RPC) - -/** - * The SEI that is packaged with the war endpoint may potentially - * contain different annotations that the one packaged with the EJB client - */ -public interface EndpointInterface -{ - String hello(String msg); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,25 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 02 21:17:37 CET 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jaxws.jbws1581; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) + +/** + * The SEI that is packaged with the war endpoint may potentially + * contain different annotations that the one packaged with the EJB client + */ +public interface EndpointInterface +{ + String hello(String msg); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1581; - -import java.net.URL; - -import junit.framework.Test; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * EJB vehicle using loader repository not sufficiently isolated - * - * http://jira.jboss.org/jira/browse/JBWS-1581 - * - * @author Thomas.Diesler(a)jboss.com - * @since 19-Mar-2007 - */ -public class JBWS1581EarTestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581.jar"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl"); - WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); - assertNotNull("wsdl expected", wsdl); - } - - public void testEJBVehicle() throws Exception - { - EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote"); - String retStr = remote.runTest("Hello World!"); - assertEquals("Hello World!", retStr); - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1581; + +import java.net.URL; + +import junit.framework.Test; + +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * EJB vehicle using loader repository not sufficiently isolated + * + * http://jira.jboss.org/jira/browse/JBWS-1581 + * + * @author Thomas.Diesler(a)jboss.com + * @since 19-Mar-2007 + */ +public class JBWS1581EarTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl"); + WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); + assertNotNull("wsdl expected", wsdl); + } + + public void testEJBVehicle() throws Exception + { + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote"); + String retStr = remote.runTest("Hello World!"); + assertEquals("Hello World!", retStr); + } +} \ No newline at end of file Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1581; - -import java.net.URL; - -import junit.framework.Test; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * EJB vehicle using loader repository not sufficiently isolated - * - * http://jira.jboss.org/jira/browse/JBWS-1581 - * - * @author Thomas.Diesler(a)jboss.com - * @since 19-Mar-2007 - */ -public class JBWS1581WarTestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581.war, jaxws-jbws1581.jar"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl"); - WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); - assertNotNull("wsdl expected", wsdl); - } - - public void testEJBVehicle() throws Exception - { - EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote"); - String retStr = remote.runTest("Hello World!"); - assertEquals("Hello World!", retStr); - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1581; + +import java.net.URL; + +import junit.framework.Test; + +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * EJB vehicle using loader repository not sufficiently isolated + * + * http://jira.jboss.org/jira/browse/JBWS-1581 + * + * @author Thomas.Diesler(a)jboss.com + * @since 19-Mar-2007 + */ +public class JBWS1581WarTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581.war, jaxws-jbws1581.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581?wsdl"); + WSDLDefinitions wsdl = WSDLDefinitionsFactory.newInstance().parse(wsdlURL); + assertNotNull("wsdl expected", wsdl); + } + + public void testEJBVehicle() throws Exception + { + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote"); + String retStr = remote.runTest("Hello World!"); + assertEquals("Hello World!", retStr); + } +} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,79 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1611; - -import java.io.StringReader; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Dispatch; -import javax.xml.ws.Service; -import javax.xml.ws.Service.Mode; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.common.DOMWriter; -import org.w3c.dom.Element; - -/** - * [JBWS-1611] SOAPAction is not sent in dispath requests - * - * http://jira.jboss.org/jira/browse/JBWS-1611 - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Jun-2007 - */ -public class JBWS1611TestCase extends JBossWSTest -{ - private static final String targetNS = "http://jbws1611.jaxws.ws.test.jboss.org/"; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1611TestCase.class, "jaxws-jbws1611.war"); - } - - public void testWebService() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1611?wsdl"); - QName serviceName = new QName(targetNS, "PingEndpointService"); - QName portName = new QName(targetNS, "PingEndpointPort"); - Service service = Service.create(wsdlURL, serviceName); - Dispatch dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD); - - dispatch.getRequestContext().put(BindingProvider.SOAPACTION_USE_PROPERTY, true); - dispatch.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY, "uri:placeBuyOrder"); - - String payload = "<ns1:ping xmlns:ns1='" + targetNS + "'/>"; - Source retObj = (Source)dispatch.invoke(new StreamSource(new StringReader(payload))); - - Element docElement = DOMUtils.sourceToElement(retObj); - Element retElement = DOMUtils.getFirstChildElement(docElement); - String retPayload = DOMWriter.printNode(retElement, false); - assertEquals("<return>"uri:placeBuyOrder"</return>", retPayload); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1611; + +import java.io.StringReader; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Dispatch; +import javax.xml.ws.Service; +import javax.xml.ws.Service.Mode; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.DOMWriter; +import org.w3c.dom.Element; + +/** + * [JBWS-1611] SOAPAction is not sent in dispath requests + * + * http://jira.jboss.org/jira/browse/JBWS-1611 + * + * @author Thomas.Diesler(a)jboss.org + * @since 14-Jun-2007 + */ +public class JBWS1611TestCase extends JBossWSTest +{ + private static final String targetNS = "http://jbws1611.jaxws.ws.test.jboss.org/"; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1611TestCase.class, "jaxws-jbws1611.war"); + } + + public void testWebService() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1611?wsdl"); + QName serviceName = new QName(targetNS, "PingEndpointService"); + QName portName = new QName(targetNS, "PingEndpointPort"); + Service service = Service.create(wsdlURL, serviceName); + Dispatch dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD); + + dispatch.getRequestContext().put(BindingProvider.SOAPACTION_USE_PROPERTY, true); + dispatch.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY, "uri:placeBuyOrder"); + + String payload = "<ns1:ping xmlns:ns1='" + targetNS + "'/>"; + Source retObj = (Source)dispatch.invoke(new StreamSource(new StringReader(payload))); + + Element docElement = DOMUtils.sourceToElement(retObj); + Element retElement = DOMUtils.getFirstChildElement(docElement); + String retPayload = DOMWriter.printNode(retElement, false); + assertEquals("<return>"uri:placeBuyOrder"</return>", retPayload); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1611; - -import javax.annotation.Resource; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.servlet.http.HttpServletRequest; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; - -import org.jboss.logging.Logger; - -@WebService(name = "PingEndpoint", serviceName = "PingEndpointService") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class PingEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(PingEndpointImpl.class); - - @Resource - WebServiceContext wsctx; - - @WebMethod - public String ping() - { - HttpServletRequest req = (HttpServletRequest)wsctx.getMessageContext().get(MessageContext.SERVLET_REQUEST); - String soapAction = req.getHeader("SOAPAction"); - log.info("ping: " + soapAction); - return soapAction; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1611; + +import javax.annotation.Resource; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.servlet.http.HttpServletRequest; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.logging.Logger; + +@WebService(name = "PingEndpoint", serviceName = "PingEndpointService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class PingEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(PingEndpointImpl.class); + + @Resource + WebServiceContext wsctx; + + @WebMethod + public String ping() + { + HttpServletRequest req = (HttpServletRequest)wsctx.getMessageContext().get(MessageContext.SERVLET_REQUEST); + String soapAction = req.getHeader("SOAPAction"); + log.info("ping: " + soapAction); + return soapAction; + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,9 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws1665; - -import java.io.Serializable; -import java.math.BigDecimal; - -public class CoordinateData implements Serializable { - public BigDecimal latitude; - public BigDecimal longitude; -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,9 @@ +package org.jboss.test.ws.jaxws.jbws1665; + +import java.io.Serializable; +import java.math.BigDecimal; + +public class CoordinateData implements Serializable { + public BigDecimal latitude; + public BigDecimal longitude; +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1665; - -// $Id: $ - -import java.net.MalformedURLException; -import java.net.URL; - -import junit.framework.Test; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1665] incorrect wsdl generation - * - * http://jira.jboss.org/jira/browse/JBWS-1665 - */ -public class JBWS1665TestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1655/TrackingService"; - -// public static Test suite() -// { -// return JBossWSTestSetup.newTestSetup(JBWS1665TestCase.class, "jaxws-jbws1665.jar"); -// } - - public void testWebService() throws Exception - { - System.out.println("FIXME [JBWS-1665] incorrect wsdl generation"); - - //assertWSDLAccess(); - - // Need to validate the WSDL is property populated. Several fields such as - // element names are being left blank. This is related to case 16130. The - // entire generated wsdl is attached to the case. - - /* - QName serviceName = new QName("http://org.jboss.ws/jbws1665", "EJB3BeanService"); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - Service service = Service.create(wsdlURL, serviceName); - TrackingServiceInterface port = (TrackingServiceInterface)service.getPort(TrackingServiceInterface.class); - */ - } - - private void assertWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1665; + +// $Id: $ + +import java.net.MalformedURLException; +import java.net.URL; + +import junit.framework.Test; + +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1665] incorrect wsdl generation + * + * http://jira.jboss.org/jira/browse/JBWS-1665 + */ +public class JBWS1665TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1655/TrackingService"; + +// public static Test suite() +// { +// return JBossWSTestSetup.newTestSetup(JBWS1665TestCase.class, "jaxws-jbws1665.jar"); +// } + + public void testWebService() throws Exception + { + System.out.println("FIXME [JBWS-1665] incorrect wsdl generation"); + + //assertWSDLAccess(); + + // Need to validate the WSDL is property populated. Several fields such as + // element names are being left blank. This is related to case 16130. The + // entire generated wsdl is attached to the case. + + /* + QName serviceName = new QName("http://org.jboss.ws/jbws1665", "EJB3BeanService"); + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + TrackingServiceInterface port = (TrackingServiceInterface)service.getPort(TrackingServiceInterface.class); + */ + } + + private void assertWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,24 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws1665; - -import java.io.Serializable; - -public class PropertyData implements Serializable { - private String key; - private String value; - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,24 @@ +package org.jboss.test.ws.jaxws.jbws1665; + +import java.io.Serializable; + +public class PropertyData implements Serializable { + private String key; + private String value; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,90 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws1665; - -import java.io.Serializable; -import java.util.Calendar; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TraceData", propOrder = { "type", "source", "time", - "coordinate", "mileage", "heading", "speed", "property" }) -public class TraceData implements Serializable { - @XmlElement(required=true) - private short type; - @XmlElement(required=true) - private String source; - @XmlElement(required=true) - private Calendar time; - private CoordinateData coordinate; - private Integer mileage; - private Short heading; - private Short speed; - private PropertyData[] property; - - public CoordinateData getCoordinate() { - return coordinate; - } - - public void setCoordinate(CoordinateData coordinate) { - this.coordinate = coordinate; - } - - public Short getHeading() { - return heading; - } - - public void setHeading(Short heading) { - this.heading = heading; - } - - public Integer getMileage() { - return mileage; - } - - public void setMileage(Integer mileage) { - this.mileage = mileage; - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public Short getSpeed() { - return speed; - } - - public void setSpeed(Short speed) { - this.speed = speed; - } - - public Calendar getTime() { - return time; - } - - public void setTime(Calendar time) { - this.time = time; - } - - public short getType() { - return type; - } - - public void setType(short type) { - this.type = type; - } - - public void setProperty(PropertyData[] property) { - this.property = property; - } - - public PropertyData[] getProperty() { - return property; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,90 @@ +package org.jboss.test.ws.jaxws.jbws1665; + +import java.io.Serializable; +import java.util.Calendar; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TraceData", propOrder = { "type", "source", "time", + "coordinate", "mileage", "heading", "speed", "property" }) +public class TraceData implements Serializable { + @XmlElement(required=true) + private short type; + @XmlElement(required=true) + private String source; + @XmlElement(required=true) + private Calendar time; + private CoordinateData coordinate; + private Integer mileage; + private Short heading; + private Short speed; + private PropertyData[] property; + + public CoordinateData getCoordinate() { + return coordinate; + } + + public void setCoordinate(CoordinateData coordinate) { + this.coordinate = coordinate; + } + + public Short getHeading() { + return heading; + } + + public void setHeading(Short heading) { + this.heading = heading; + } + + public Integer getMileage() { + return mileage; + } + + public void setMileage(Integer mileage) { + this.mileage = mileage; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public Short getSpeed() { + return speed; + } + + public void setSpeed(Short speed) { + this.speed = speed; + } + + public Calendar getTime() { + return time; + } + + public void setTime(Calendar time) { + this.time = time; + } + + public short getType() { + return type; + } + + public void setType(short type) { + this.type = type; + } + + public void setProperty(PropertyData[] property) { + this.property = property; + } + + public PropertyData[] getProperty() { + return property; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,42 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws1665; - -import java.io.Serializable; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TracePollData", propOrder = { "traces", "mark", "more" }) -public class TracePollData implements Serializable { - @XmlElement(required=true,nillable=true) - protected TraceData[] traces; - @XmlElement(required = true, nillable = true) - protected String mark; - protected boolean more; - - public String getMark() { - return mark; - } - - public void setMark(String mark) { - this.mark = mark; - } - - public boolean isMore() { - return more; - } - - public void setMore(boolean more) { - this.more = more; - } - - public void setTraces(TraceData[] traces) { - this.traces = traces; - } - - public TraceData[] getTraces() { - return traces; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,42 @@ +package org.jboss.test.ws.jaxws.jbws1665; + +import java.io.Serializable; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TracePollData", propOrder = { "traces", "mark", "more" }) +public class TracePollData implements Serializable { + @XmlElement(required=true,nillable=true) + protected TraceData[] traces; + @XmlElement(required = true, nillable = true) + protected String mark; + protected boolean more; + + public String getMark() { + return mark; + } + + public void setMark(String mark) { + this.mark = mark; + } + + public boolean isMore() { + return more; + } + + public void setMore(boolean more) { + this.more = more; + } + + public void setTraces(TraceData[] traces) { + this.traces = traces; + } + + public TraceData[] getTraces() { + return traces; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,38 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws1665; - -import java.rmi.RemoteException; -import java.text.DateFormat; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; - -import javax.ejb.FinderException; -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@Stateless -@WebService(name = "TrackingService", targetNamespace = "http://fleetworks.acunia.com/fleet/service") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class TrackingServiceBean implements TrackingServiceInterface { - @WebMethod - public TracePollData pollTraces( - @WebParam(name="customer") String customer, - @WebParam(name="mark") String mark) throws NullPointerException - { - return null; - } - - @WebMethod - public void requestTrace( - @WebParam(name="customer") String customer, - @WebParam(name="terminals") String[] terminals) - throws NullPointerException - { - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,38 @@ +package org.jboss.test.ws.jaxws.jbws1665; + +import java.rmi.RemoteException; +import java.text.DateFormat; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + +import javax.ejb.FinderException; +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@Stateless +@WebService(name = "TrackingService", targetNamespace = "http://fleetworks.acunia.com/fleet/service") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class TrackingServiceBean implements TrackingServiceInterface { + @WebMethod + public TracePollData pollTraces( + @WebParam(name="customer") String customer, + @WebParam(name="mark") String mark) throws NullPointerException + { + return null; + } + + @WebMethod + public void requestTrace( + @WebParam(name="customer") String customer, + @WebParam(name="terminals") String[] terminals) + throws NullPointerException + { + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,7 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws1665; - -public interface TrackingServiceInterface { - public TracePollData pollTraces(String customer, String mark) throws NullPointerException; - - public void requestTrace(String customer, String[] terminals) throws NullPointerException; -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,7 @@ +package org.jboss.test.ws.jaxws.jbws1665; + +public interface TrackingServiceInterface { + public TracePollData pollTraces(String customer, String mark) throws NullPointerException; + + public void requestTrace(String customer, String[] terminals) throws NullPointerException; +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,98 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1666; - -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.InputStreamReader; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.common.IOUtils; - -/** - * [JBWS-1666] Simplify jbosws jar dependencies - * - * http://jira.jboss.org/jira/browse/JBWS-1666 - * - * @author Thomas.Diesler(a)jboss.com - * @since 14-Jun-2007 - */ -public class JBWS1666TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1666TestCase.class, "jaxws-jbws1666.war"); - } - - public void testPortAccess() throws Exception - { - String resStr = TestClient.testPortAccess(getServerHost()); - assertEquals(TestClient.REQ_STR, resStr); - } - - public void testClientAccess() throws Exception - { - File javaFile = new File (System.getProperty("java.home") + "/bin/java"); - String javaCmd = javaFile.exists() ? javaFile.getCanonicalPath() : "java"; - - String jbh = System.getProperty("jboss.home"); - String jbc = jbh + "/client"; - String jbl = jbh + "/lib"; - - // Setup the classpath - do not modify this lightheartedly. - // Maybe you should extend the Class-Path in the MANIFEST instead. - StringBuffer cp = new StringBuffer("./classes"); - cp.append(":" + jbc + "/jbossws-client.jar"); - if (isTargetJBoss50()) - { - cp.append(":" + jbc + "/jboss-common-core.jar"); - cp.append(":" + jbc + "/jboss-logging-spi.jar"); - } - else - { - cp.append(":" + jbc + "/jboss-common-client.jar"); - } - - Runtime rt = Runtime.getRuntime(); - - String command = javaCmd + " -Djava.endorsed.dirs=" + jbl + "/endorsed -cp " + cp + " " + TestClient.class.getName() + " " + getServerHost(); - Process proc = rt.exec(command); - int status = proc.waitFor(); - if (status == 0) - { - BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream())); - String resStr = br.readLine(); - assertEquals(TestClient.REQ_STR, resStr); - } - else - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - IOUtils.copyStream(baos, proc.getErrorStream()); - String errStr = new String(baos.toByteArray()); - fail(errStr); - } - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,98 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1666; + +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.InputStreamReader; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.wsf.common.IOUtils; + +/** + * [JBWS-1666] Simplify jbosws jar dependencies + * + * http://jira.jboss.org/jira/browse/JBWS-1666 + * + * @author Thomas.Diesler(a)jboss.com + * @since 14-Jun-2007 + */ +public class JBWS1666TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1666TestCase.class, "jaxws-jbws1666.war"); + } + + public void testPortAccess() throws Exception + { + String resStr = TestClient.testPortAccess(getServerHost()); + assertEquals(TestClient.REQ_STR, resStr); + } + + public void testClientAccess() throws Exception + { + File javaFile = new File (System.getProperty("java.home") + "/bin/java"); + String javaCmd = javaFile.exists() ? javaFile.getCanonicalPath() : "java"; + + String jbh = System.getProperty("jboss.home"); + String jbc = jbh + "/client"; + String jbl = jbh + "/lib"; + + // Setup the classpath - do not modify this lightheartedly. + // Maybe you should extend the Class-Path in the MANIFEST instead. + StringBuffer cp = new StringBuffer("./classes"); + cp.append(":" + jbc + "/jbossws-client.jar"); + if (isTargetJBoss50()) + { + cp.append(":" + jbc + "/jboss-common-core.jar"); + cp.append(":" + jbc + "/jboss-logging-spi.jar"); + } + else + { + cp.append(":" + jbc + "/jboss-common-client.jar"); + } + + Runtime rt = Runtime.getRuntime(); + + String command = javaCmd + " -Djava.endorsed.dirs=" + jbl + "/endorsed -cp " + cp + " " + TestClient.class.getName() + " " + getServerHost(); + Process proc = rt.exec(command); + int status = proc.waitFor(); + if (status == 0) + { + BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream())); + String resStr = br.readLine(); + assertEquals(TestClient.REQ_STR, resStr); + } + else + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + IOUtils.copyStream(baos, proc.getErrorStream()); + String errStr = new String(baos.toByteArray()); + fail(errStr); + } + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1666; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -public class TestClient -{ - public static final String REQ_STR = "Hello World!"; - - public static String testPortAccess(String serverHost) throws Exception - { - URL wsdlURL = new URL("http://" + serverHost + ":8080/jaxws-jbws1666?wsdl"); - - QName serviceName = new QName("http://org.jboss.ws/jbws1666", "TestEndpointImplService"); - Service service = Service.create(wsdlURL, serviceName); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String resStr = port.echo(REQ_STR); - return resStr; - } - - public static void main(String[] args) throws Exception - { - String serverHost = args[0]; - String resStr = testPortAccess(serverHost); - System.out.println(resStr); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1666; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +public class TestClient +{ + public static final String REQ_STR = "Hello World!"; + + public static String testPortAccess(String serverHost) throws Exception + { + URL wsdlURL = new URL("http://" + serverHost + ":8080/jaxws-jbws1666?wsdl"); + + QName serviceName = new QName("http://org.jboss.ws/jbws1666", "TestEndpointImplService"); + Service service = Service.create(wsdlURL, serviceName); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String resStr = port.echo(REQ_STR); + return resStr; + } + + public static void main(String[] args) throws Exception + { + String serverHost = args[0]; + String resStr = testPortAccess(serverHost); + System.out.println(resStr); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1666; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1666") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint -{ - String echo(String input); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1666; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1666") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint +{ + String echo(String input); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1666; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1666") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class TestEndpointImpl -{ - @WebMethod - public String echo(String input) - { - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1666; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1666") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class TestEndpointImpl +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1694; - -import java.util.List; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class Basket -{ - String customerId; - - public String getCustomerId() - { - return customerId; - } - - public void setCustomerId(String customerId) - { - this.customerId = customerId; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Basket.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1694; + +import java.util.List; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class Basket +{ + String customerId; + + public String getCustomerId() + { + return customerId; + } + + public void setCustomerId(String customerId) + { + this.customerId = customerId; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,30 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1694; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class BasketEntries -{ -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/BasketEntries.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,30 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1694; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class BasketEntries +{ +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1694; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class Header -{ - private String uuid; - - public String getUuid() - { - return this.uuid; - } - - public void setUuid(String uuid) - { - this.uuid = uuid; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Header.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1694; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class Header +{ + private String uuid; + + public String getUuid() + { + return this.uuid; + } + + public void setUuid(String uuid) + { + this.uuid = uuid; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1694; - -import org.jboss.wsf.spi.annotation.WebContext; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.xml.ws.Holder; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1694.JBWS1694EndpointSEI") -@Stateless -@WebContext(contextRoot = "jbws1694") -public class JBWS1694Endpoint implements JBWS1694EndpointSEI -{ - @WebMethod(operationName = "SubmitBasket") - @WebResult(name = "receipt", targetNamespace = "http://www.m-bar-go.com", partName = "response") - public Receipt submitBasket( - - @WebParam(name = "inout", targetNamespace = "http://www.m-bar-go.com", header = true, - mode = WebParam.Mode.INOUT) - Holder<Header> header, - - @WebParam(name = "basket", targetNamespace = "http://www.m-bar-go.com", partName = "request") - Basket request) - throws Exception - { - if(null==header) - throw new IllegalArgumentException("inout header was null"); - - Receipt receipt = new Receipt(); - receipt.setMsg(header.value.getUuid()); - return receipt; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694Endpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1694; + +import org.jboss.wsf.spi.annotation.WebContext; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.Holder; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1694.JBWS1694EndpointSEI") +@Stateless +@WebContext(contextRoot = "jbws1694") +public class JBWS1694Endpoint implements JBWS1694EndpointSEI +{ + @WebMethod(operationName = "SubmitBasket") + @WebResult(name = "receipt", targetNamespace = "http://www.m-bar-go.com", partName = "response") + public Receipt submitBasket( + + @WebParam(name = "inout", targetNamespace = "http://www.m-bar-go.com", header = true, + mode = WebParam.Mode.INOUT) + Holder<Header> header, + + @WebParam(name = "basket", targetNamespace = "http://www.m-bar-go.com", partName = "request") + Basket request) + throws Exception + { + if(null==header) + throw new IllegalArgumentException("inout header was null"); + + Receipt receipt = new Receipt(); + receipt.setMsg(header.value.getUuid()); + return receipt; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1694; - -import javax.jws.WebMethod; -import javax.jws.WebResult; -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.xml.ws.Holder; -import javax.ejb.Remote; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -@WebService -@Remote -public interface JBWS1694EndpointSEI -{ - @WebMethod(operationName = "SubmitBasket") - @WebResult(name = "receipt", targetNamespace = "http://www.m-bar-go.com", partName = "response") - public Receipt submitBasket( - - @WebParam(name = "inout", targetNamespace = "http://www.m-bar-go.com", header = true, - mode = WebParam.Mode.INOUT) - Holder<Header> header, - - @WebParam(name = "basket", targetNamespace = "http://www.m-bar-go.com", partName = "request") - Basket request) - throws Exception; -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694EndpointSEI.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1694; + +import javax.jws.WebMethod; +import javax.jws.WebResult; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.xml.ws.Holder; +import javax.ejb.Remote; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@WebService +@Remote +public interface JBWS1694EndpointSEI +{ + @WebMethod(operationName = "SubmitBasket") + @WebResult(name = "receipt", targetNamespace = "http://www.m-bar-go.com", partName = "response") + public Receipt submitBasket( + + @WebParam(name = "inout", targetNamespace = "http://www.m-bar-go.com", header = true, + mode = WebParam.Mode.INOUT) + Holder<Header> header, + + @WebParam(name = "basket", targetNamespace = "http://www.m-bar-go.com", partName = "request") + Basket request) + throws Exception; +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,65 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1694; - -import junit.framework.Test; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.Holder; -import java.net.URL; - -import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.wsf.test.JBossWSTest; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class JBWS1694TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1694TestCase.class, "jaxws-jbws1694.jar"); - } - - public void testInheritanceRpc() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1694/JBWS1694Endpoint?wsdl"); - QName serviceName = new QName("http://jbws1694.jaxws.ws.test.jboss.org/", "JBWS1694EndpointService"); - Service service = Service.create(wsdlURL, serviceName); - - JBWS1694EndpointSEI port = service.getPort(JBWS1694EndpointSEI .class); - - Header inout = new Header(); - inout.setUuid("1234"); - - Basket basket = new Basket(); - basket.setCustomerId("4567"); - - Receipt receipt = port.submitBasket(new Holder(inout), basket); - assertTrue(receipt.getMsg().equals("1234")); - } - - - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/JBWS1694TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1694; + +import junit.framework.Test; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.Holder; +import java.net.URL; + +import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class JBWS1694TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1694TestCase.class, "jaxws-jbws1694.jar"); + } + + public void testInheritanceRpc() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1694/JBWS1694Endpoint?wsdl"); + QName serviceName = new QName("http://jbws1694.jaxws.ws.test.jboss.org/", "JBWS1694EndpointService"); + Service service = Service.create(wsdlURL, serviceName); + + JBWS1694EndpointSEI port = service.getPort(JBWS1694EndpointSEI .class); + + Header inout = new Header(); + inout.setUuid("1234"); + + Basket basket = new Basket(); + basket.setCustomerId("4567"); + + Receipt receipt = port.submitBasket(new Holder(inout), basket); + assertTrue(receipt.getMsg().equals("1234")); + } + + + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1694; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class Receipt -{ - String msg; - - public String getMsg() - { - return msg; - } - - public void setMsg(String msg) - { - this.msg = msg; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1694/Receipt.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1694; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class Receipt +{ + String msg; + + public String getMsg() + { + return msg; + } + + public void setMsg(String msg) + { + this.msg = msg; + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1702; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.jaxws.jbws1702.types.ClassB; -import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; -import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperB; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1702] JAXWS type inheritance - * - * http://jira.jboss.org/jira/browse/JBWS-1702 - * - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class JBWS1702TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1702TestCase.class, "jaxws-jbws1702.war"); - } - - public void testInheritanceRpc() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithRPC_Bare?wsdl"); - QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithRPC_BareService"); - Service service = Service.create(wsdlURL, serviceName); - - SampleWSRpcSEI port = service.getPort(SampleWSRpcSEI.class); - ClassB b = port.getClassCAsClassB(); - assertTrue("Should be an instance of ClassC, but was " + b, (b instanceof ClassC)); - } - - public void testInheritanceBare() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithDocument_Bare?wsdl"); - QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithDocument_BareService"); - Service service = Service.create(wsdlURL, serviceName); - - SampleWSBareSEI port = service.getPort(SampleWSBareSEI.class); - ResponseWrapperB wrapper = port.getClassCAsClassB(); - ClassB b = wrapper.getData(); - assertTrue("Should be an instance of ClassC, but was " + b, (b instanceof ClassC)); - } - - public void testInheritanceWrapped() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithDocument_Wrapped?wsdl"); - QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithDocument_WrappedService"); - Service service = Service.create(wsdlURL, serviceName); - - SampleWSWrappedSEI port = service.getPort(SampleWSWrappedSEI.class); - ClassB b = port.getClassCAsClassB(); - assertTrue("Should be an instance of ClassC, but was " + b, (b instanceof ClassC)); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1702; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxws.jbws1702.types.ClassB; +import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; +import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperB; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1702] JAXWS type inheritance + * + * http://jira.jboss.org/jira/browse/JBWS-1702 + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class JBWS1702TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1702TestCase.class, "jaxws-jbws1702.war"); + } + + public void testInheritanceRpc() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithRPC_Bare?wsdl"); + QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithRPC_BareService"); + Service service = Service.create(wsdlURL, serviceName); + + SampleWSRpcSEI port = service.getPort(SampleWSRpcSEI.class); + ClassB b = port.getClassCAsClassB(); + assertTrue("Should be an instance of ClassC, but was " + b, (b instanceof ClassC)); + } + + public void testInheritanceBare() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithDocument_Bare?wsdl"); + QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithDocument_BareService"); + Service service = Service.create(wsdlURL, serviceName); + + SampleWSBareSEI port = service.getPort(SampleWSBareSEI.class); + ResponseWrapperB wrapper = port.getClassCAsClassB(); + ClassB b = wrapper.getData(); + assertTrue("Should be an instance of ClassC, but was " + b, (b instanceof ClassC)); + } + + public void testInheritanceWrapped() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithDocument_Wrapped?wsdl"); + QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithDocument_WrappedService"); + Service service = Service.create(wsdlURL, serviceName); + + SampleWSWrappedSEI port = service.getPort(SampleWSWrappedSEI.class); + ClassB b = port.getClassCAsClassB(); + assertTrue("Should be an instance of ClassC, but was " + b, (b instanceof ClassC)); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1702; - -import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperB; -import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperC; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -@WebService -@SOAPBinding( - style = SOAPBinding.Style.DOCUMENT, - use = SOAPBinding.Use.LITERAL, - parameterStyle = SOAPBinding.ParameterStyle.BARE -) -public interface SampleWSBareSEI -{ - ResponseWrapperB getClassCAsClassB(); - - ResponseWrapperC getClassC(); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSBareSEI.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1702; + +import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperB; +import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperC; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@WebService +@SOAPBinding( + style = SOAPBinding.Style.DOCUMENT, + use = SOAPBinding.Use.LITERAL, + parameterStyle = SOAPBinding.ParameterStyle.BARE +) +public interface SampleWSBareSEI +{ + ResponseWrapperB getClassCAsClassB(); + + ResponseWrapperC getClassC(); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSRpcSEI.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSRpcSEI.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSRpcSEI.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1702; - -import org.jboss.test.ws.jaxws.jbws1702.types.ClassB; -import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -@WebService() -@SOAPBinding( - style = SOAPBinding.Style.RPC, - use = SOAPBinding.Use.LITERAL, - parameterStyle = SOAPBinding.ParameterStyle.BARE -) - -public interface SampleWSRpcSEI -{ - ClassB getClassCAsClassB(); - - ClassC getClassC(); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSRpcSEI.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSRpcSEI.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSRpcSEI.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSRpcSEI.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1702; + +import org.jboss.test.ws.jaxws.jbws1702.types.ClassB; +import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@WebService() +@SOAPBinding( + style = SOAPBinding.Style.RPC, + use = SOAPBinding.Use.LITERAL, + parameterStyle = SOAPBinding.ParameterStyle.BARE +) + +public interface SampleWSRpcSEI +{ + ClassB getClassCAsClassB(); + + ClassC getClassC(); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1702; - -import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperB; -import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; -import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperC; - -import javax.jws.soap.SOAPBinding; -import javax.jws.WebService; -import javax.jws.WebMethod; - -/** - * - * - * <p>Copyright: Copyright (c) 2006</p> - * <p>Organisation: Marabu EDV</p> - * @author strauch - * @version 1.0 - */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1702.SampleWSBareSEI") -public class SampleWSWithDocument_Bare implements SampleWSBareSEI -{ - - /** - * Creates a new instance of SampleWSWithDocument_Bare - */ - public SampleWSWithDocument_Bare() { - } - - /** - * In .NET Client (C#) only the content information of ClassB is being submitted. (--> propC is unknown) - */ - public ResponseWrapperB getClassCAsClassB() { - ClassC classC= new ClassC(); - classC.setPropA("propA"); - classC.setPropB("propB"); - classC.setPropC("propC"); - - ResponseWrapperB resp = new ResponseWrapperB(); - resp.setData(classC); - return resp; - } - - /** - * Method that make ClassC available for all clients using this web service. - */ - public ResponseWrapperC getClassC() { - ClassC data = (ClassC) getClassCAsClassB().getData(); - ResponseWrapperC resp = new ResponseWrapperC(); - resp.setData(data); - return resp; - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Bare.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1702; + +import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperB; +import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; +import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperC; + +import javax.jws.soap.SOAPBinding; +import javax.jws.WebService; +import javax.jws.WebMethod; + +/** + * + * + * <p>Copyright: Copyright (c) 2006</p> + * <p>Organisation: Marabu EDV</p> + * @author strauch + * @version 1.0 + */ +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1702.SampleWSBareSEI") +public class SampleWSWithDocument_Bare implements SampleWSBareSEI +{ + + /** + * Creates a new instance of SampleWSWithDocument_Bare + */ + public SampleWSWithDocument_Bare() { + } + + /** + * In .NET Client (C#) only the content information of ClassB is being submitted. (--> propC is unknown) + */ + public ResponseWrapperB getClassCAsClassB() { + ClassC classC= new ClassC(); + classC.setPropA("propA"); + classC.setPropB("propB"); + classC.setPropC("propC"); + + ResponseWrapperB resp = new ResponseWrapperB(); + resp.setData(classC); + return resp; + } + + /** + * Method that make ClassC available for all clients using this web service. + */ + public ResponseWrapperC getClassC() { + ClassC data = (ClassC) getClassCAsClassB().getData(); + ResponseWrapperC resp = new ResponseWrapperC(); + resp.setData(data); + return resp; + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Wrapped.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Wrapped.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Wrapped.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1702; - -import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; -import org.jboss.test.ws.jaxws.jbws1702.types.ClassB; - -import javax.jws.WebService; -import javax.jws.WebMethod; -import javax.jws.soap.SOAPBinding; - -/** - * - * - * <p>Copyright: Copyright (c) 2006</p> - * <p>Organisation: Marabu EDV</p> - * @author strauch - * @version 1.0 - */ - -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1702.SampleWSWrappedSEI") -@SOAPBinding( style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED ) -public class SampleWSWithDocument_Wrapped implements SampleWSWrappedSEI -{ - - /** - * Creates a new instance of SampleWSWithDocument_Wrapped - */ - public SampleWSWithDocument_Wrapped() { - } - - /** - * In .NET Client (C#) only the content information of ClassB is being submitted. (--> propC is unknown) - */ - public ClassB getClassCAsClassB() { - ClassC classC= new ClassC(); - classC.setPropA("propA"); - classC.setPropB("propB"); - classC.setPropC("propC"); - return classC; - } - - /** - * Method that make ClassC available for all clients using this web service. - * !! Is there another possibility to make inherited classes available? In J2EE4 styled endpoints you could - * declare additional Classes in a seperate xml descriptor file. !! - */ - public ClassC getClassC() { - return new ClassC(); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Wrapped.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Wrapped.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Wrapped.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithDocument_Wrapped.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1702; + +import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; +import org.jboss.test.ws.jaxws.jbws1702.types.ClassB; + +import javax.jws.WebService; +import javax.jws.WebMethod; +import javax.jws.soap.SOAPBinding; + +/** + * + * + * <p>Copyright: Copyright (c) 2006</p> + * <p>Organisation: Marabu EDV</p> + * @author strauch + * @version 1.0 + */ + +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1702.SampleWSWrappedSEI") +@SOAPBinding( style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED ) +public class SampleWSWithDocument_Wrapped implements SampleWSWrappedSEI +{ + + /** + * Creates a new instance of SampleWSWithDocument_Wrapped + */ + public SampleWSWithDocument_Wrapped() { + } + + /** + * In .NET Client (C#) only the content information of ClassB is being submitted. (--> propC is unknown) + */ + public ClassB getClassCAsClassB() { + ClassC classC= new ClassC(); + classC.setPropA("propA"); + classC.setPropB("propB"); + classC.setPropC("propC"); + return classC; + } + + /** + * Method that make ClassC available for all clients using this web service. + * !! Is there another possibility to make inherited classes available? In J2EE4 styled endpoints you could + * declare additional Classes in a seperate xml descriptor file. !! + */ + public ClassC getClassC() { + return new ClassC(); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithRPC_Bare.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithRPC_Bare.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithRPC_Bare.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1702; - -import org.jboss.test.ws.jaxws.jbws1702.types.ClassB; -import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; - -import javax.jws.WebService; -import javax.jws.WebMethod; -import javax.jws.soap.SOAPBinding; - -/** - * - * - * <p>Copyright: Copyright (c) 2006</p> - * <p>Organisation: Marabu EDV</p> - * @author strauch - * @version 1.0 - */ - -@WebService() -@SOAPBinding( - style = SOAPBinding.Style.RPC, - use = SOAPBinding.Use.LITERAL, - parameterStyle = SOAPBinding.ParameterStyle.BARE -) -public class SampleWSWithRPC_Bare implements SampleWSRpcSEI -{ - - /** - * Creates a new instance of SampleWSWithDocument_Wrapped - */ - public SampleWSWithRPC_Bare() { - } - - /** - * In .NET Client (C#) the follow error occurs: - * "The specified type was not recognized: name='classC', namespace='', at <return xmlns=''>." - */ - public ClassB getClassCAsClassB() { - ClassC classC= new ClassC(); - classC.setPropA("propA"); - classC.setPropB("propB"); - classC.setPropC("propC"); - return classC; - } - - /** - * Method that make ClassC available for all clients using this web service. - * !! Is there another possibility to make inherited classes available? In J2EE4 styled endpoints you could - * declare additional Classes in a seperate xml descriptor file. !! - */ - public ClassC getClassC() { - return new ClassC(); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithRPC_Bare.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithRPC_Bare.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithRPC_Bare.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWithRPC_Bare.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1702; + +import org.jboss.test.ws.jaxws.jbws1702.types.ClassB; +import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; + +import javax.jws.WebService; +import javax.jws.WebMethod; +import javax.jws.soap.SOAPBinding; + +/** + * + * + * <p>Copyright: Copyright (c) 2006</p> + * <p>Organisation: Marabu EDV</p> + * @author strauch + * @version 1.0 + */ + +@WebService() +@SOAPBinding( + style = SOAPBinding.Style.RPC, + use = SOAPBinding.Use.LITERAL, + parameterStyle = SOAPBinding.ParameterStyle.BARE +) +public class SampleWSWithRPC_Bare implements SampleWSRpcSEI +{ + + /** + * Creates a new instance of SampleWSWithDocument_Wrapped + */ + public SampleWSWithRPC_Bare() { + } + + /** + * In .NET Client (C#) the follow error occurs: + * "The specified type was not recognized: name='classC', namespace='', at <return xmlns=''>." + */ + public ClassB getClassCAsClassB() { + ClassC classC= new ClassC(); + classC.setPropA("propA"); + classC.setPropB("propB"); + classC.setPropC("propC"); + return classC; + } + + /** + * Method that make ClassC available for all clients using this web service. + * !! Is there another possibility to make inherited classes available? In J2EE4 styled endpoints you could + * declare additional Classes in a seperate xml descriptor file. !! + */ + public ClassC getClassC() { + return new ClassC(); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWrappedSEI.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWrappedSEI.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWrappedSEI.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1702; - -import org.jboss.test.ws.jaxws.jbws1702.types.ClassB; -import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; - -import javax.jws.WebMethod; -import javax.jws.WebService; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -@WebService -public interface SampleWSWrappedSEI -{ - - ClassB getClassCAsClassB(); - - ClassC getClassC(); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWrappedSEI.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWrappedSEI.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWrappedSEI.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/SampleWSWrappedSEI.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1702; + +import org.jboss.test.ws.jaxws.jbws1702.types.ClassB; +import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@WebService +public interface SampleWSWrappedSEI +{ + + ClassB getClassCAsClassB(); + + ClassC getClassC(); +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/types (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/types) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,30 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1733; - -import javax.jws.WebService; - -@WebService -public interface JBWS1733 -{ - int getCounter(); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,30 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1733; + +import javax.jws.WebService; + +@WebService +public interface JBWS1733 +{ + int getCounter(); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,59 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1733; - -import javax.annotation.Resource; -import javax.jws.WebService; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.MessageContext; - -@WebService(name = "JBWS1733", serviceName = "JBWS1733Service", endpointInterface = "org.jboss.test.ws.jaxws.jbws1733.JBWS1733") -public class JBWS1733Impl implements JBWS1733 -{ - - @Resource - private WebServiceContext wsContext; - - public int getCounter() - { - MessageContext mc = wsContext.getMessageContext(); - HttpSession session = ((HttpServletRequest)mc.get(MessageContext.SERVLET_REQUEST)).getSession(); - - // Get a session property "counter" from context - if (session == null) - throw new WebServiceException("No session in WebServiceContext"); - - Integer counter = (Integer)session.getAttribute("counter"); - if (counter == null) - { - counter = new Integer(0); - System.out.println("Starting the Session"); - } - counter = new Integer(counter.intValue() + 1); - session.setAttribute("counter", counter); - return counter; - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1733; + +import javax.annotation.Resource; +import javax.jws.WebService; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; + +@WebService(name = "JBWS1733", serviceName = "JBWS1733Service", endpointInterface = "org.jboss.test.ws.jaxws.jbws1733.JBWS1733") +public class JBWS1733Impl implements JBWS1733 +{ + + @Resource + private WebServiceContext wsContext; + + public int getCounter() + { + MessageContext mc = wsContext.getMessageContext(); + HttpSession session = ((HttpServletRequest)mc.get(MessageContext.SERVLET_REQUEST)).getSession(); + + // Get a session property "counter" from context + if (session == null) + throw new WebServiceException("No session in WebServiceContext"); + + Integer counter = (Integer)session.getAttribute("counter"); + if (counter == null) + { + counter = new Integer(0); + System.out.println("Starting the Session"); + } + counter = new Integer(counter.intValue() + 1); + session.setAttribute("counter", counter); + return counter; + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,72 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1733; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1733] JBoss WebService client not sending JSESSIONID cookie after 2 calls - * - * @author ropalka(a)redhat.com - * @since 09-Aug-2007 - */ -public class JBWS1733TestCase extends JBossWSTest -{ - private String targetNS = "http://jbws1733.jaxws.ws.test.jboss.org/"; - private JBWS1733 proxy; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1733TestCase.class, "jaxws-jbws1733.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "JBWS1733Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1733/JBWS1733Service?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = (JBWS1733)service.getPort(JBWS1733.class); - } - - public void testIssue() throws Exception - { - ((BindingProvider)proxy).getRequestContext().put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true); - for (int i = 1; i <= 10; i++) - { - assertTrue(proxy.getCounter() == i); - } - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1733; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1733] JBoss WebService client not sending JSESSIONID cookie after 2 calls + * + * @author ropalka(a)redhat.com + * @since 09-Aug-2007 + */ +public class JBWS1733TestCase extends JBossWSTest +{ + private String targetNS = "http://jbws1733.jaxws.ws.test.jboss.org/"; + private JBWS1733 proxy; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1733TestCase.class, "jaxws-jbws1733.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "JBWS1733Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1733/JBWS1733Service?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + proxy = (JBWS1733)service.getPort(JBWS1733.class); + } + + public void testIssue() throws Exception + { + ((BindingProvider)proxy).getRequestContext().put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true); + for (int i = 1; i <= 10; i++) + { + assertTrue(proxy.getCounter() == i); + } + } + +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,66 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1762; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import org.jboss.test.ws.jaxws.jbws1762.services.EJB3Iface; -import org.jboss.wsf.test.JBossWSTest; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public abstract class AbstractEJB3Test extends JBossWSTest -{ - private String ejb3TargetNS = "http://services.jbws1762.jaxws.ws.test.jboss.org/"; - private String ejb3ServiceName = "JBWS1762EJB3Service"; - private static EJB3Iface ejb3Proxy; - - @Override - public void setUp() throws Exception - { - super.setUp(); - - if (ejb3Proxy == null) - { - QName serviceName = new QName(ejb3TargetNS, ejb3ServiceName); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - - Service service = Service.create(wsdlURL, serviceName); - ejb3Proxy = service.getPort(EJB3Iface.class); - } - } - - protected abstract String getWSDLLocation(); - - public void testEJB3() throws Exception - { - assertEquals(ejb3Proxy.echo("Hello!"), "Hello!"); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractEJB3Test.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1762; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.jboss.test.ws.jaxws.jbws1762.services.EJB3Iface; +import org.jboss.wsf.test.JBossWSTest; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 17, 2007 + */ +public abstract class AbstractEJB3Test extends JBossWSTest +{ + private String ejb3TargetNS = "http://services.jbws1762.jaxws.ws.test.jboss.org/"; + private String ejb3ServiceName = "JBWS1762EJB3Service"; + private static EJB3Iface ejb3Proxy; + + @Override + public void setUp() throws Exception + { + super.setUp(); + + if (ejb3Proxy == null) + { + QName serviceName = new QName(ejb3TargetNS, ejb3ServiceName); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); + + Service service = Service.create(wsdlURL, serviceName); + ejb3Proxy = service.getPort(EJB3Iface.class); + } + } + + protected abstract String getWSDLLocation(); + + public void testEJB3() throws Exception + { + assertEquals(ejb3Proxy.echo("Hello!"), "Hello!"); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,66 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1762; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.test.ws.jaxws.jbws1762.services.POJOIface; - -/** - * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 17, 2007 - */ -public abstract class AbstractPOJOTest extends JBossWSTest -{ - private String pojoTargetNS = "http://services.jbws1762.jaxws.ws.test.jboss.org/"; - private String pojoServiceName = "JBWS1762POJOService"; - private POJOIface pojoProxy; - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - if (pojoProxy == null) - { - QName serviceName = new QName(pojoTargetNS, pojoServiceName); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); - - Service service = Service.create(wsdlURL, serviceName); - pojoProxy = (POJOIface)service.getPort(POJOIface.class); - } - } - - protected abstract String getWSDLLocation(); - - public void testPOJO() throws Exception - { - assertEquals(pojoProxy.echo("Hello!"), "Hello!"); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/AbstractPOJOTest.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1762; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.test.ws.jaxws.jbws1762.services.POJOIface; + +/** + * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 17, 2007 + */ +public abstract class AbstractPOJOTest extends JBossWSTest +{ + private String pojoTargetNS = "http://services.jbws1762.jaxws.ws.test.jboss.org/"; + private String pojoServiceName = "JBWS1762POJOService"; + private POJOIface pojoProxy; + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + if (pojoProxy == null) + { + QName serviceName = new QName(pojoTargetNS, pojoServiceName); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + getWSDLLocation()); + + Service service = Service.create(wsdlURL, serviceName); + pojoProxy = (POJOIface)service.getPort(POJOIface.class); + } + } + + protected abstract String getWSDLLocation(); + + public void testPOJO() throws Exception + { + assertEquals(pojoProxy.echo("Hello!"), "Hello!"); + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3 (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3 (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3 (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3 (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1762/services) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1797; - -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) -public interface IWebsvc -{ - public String submit(@WebParam(name = "foo") String foo); - - public String cancel(@WebParam(name = "foo") String foo, @WebParam(name = "bar", header=true) String bar); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1797; + +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) +public interface IWebsvc +{ + public String submit(@WebParam(name = "foo") String foo); + + public String cancel(@WebParam(name = "foo") String foo, @WebParam(name = "bar", header=true) String bar); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1797; - -import javax.jws.WebParam; -import javax.jws.WebService; - -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1797.IWebsvc", serviceName = "JBWS1797Service") -public class IWebsvcImpl implements IWebsvc -{ - public String submit(@WebParam(name = "foo") String foo) - { - return "submit-" + foo; - } - - public String cancel(@WebParam(name = "foo") String foo, @WebParam(name = "bar", header = true) String bar) - { - return "cancel-" + foo + bar; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1797; + +import javax.jws.WebParam; +import javax.jws.WebService; + +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1797.IWebsvc", serviceName = "JBWS1797Service") +public class IWebsvcImpl implements IWebsvc +{ + public String submit(@WebParam(name = "foo") String foo) + { + return "submit-" + foo; + } + + public String cancel(@WebParam(name = "foo") String foo, @WebParam(name = "bar", header = true) String bar) + { + return "cancel-" + foo + bar; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,146 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1797; - -// $Id: JBWS1797TestCase.java 3729 2007-06-26 19:38:00Z thomas.diesler(a)jboss.com $ - -import java.net.URL; -import java.util.List; - -import javax.wsdl.Binding; -import javax.wsdl.BindingOperation; -import javax.wsdl.Definition; -import javax.wsdl.Message; -import javax.wsdl.extensions.ExtensibilityElement; -import javax.wsdl.extensions.soap.SOAPBody; -import javax.wsdl.extensions.soap.SOAPHeader; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1797] Setting .NET friendly Endpoint in web.xml - * - * @author Thomas.Diesler(a)jboss.com - * @since 17-Oct-2007 - */ -public class JBWS1797TestCase extends JBossWSTest -{ - private static final String TARGET_NAMESPACE = "http://jbws1797.jaxws.ws.test.jboss.org/"; - private static URL wsdlURL; - private static IWebsvc port; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1797TestCase.class, "jaxws-jbws1797.war"); - } - - @Override - protected void setUp() throws Exception - { - if (port == null) - { - QName serviceName = new QName(TARGET_NAMESPACE, "JBWS1797Service"); - wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1797/IWebsvcImpl?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(IWebsvc.class); - } - } - - public void testSubmit() throws Exception - { - String result = port.submit("foo"); - assertEquals("submit-foo", result); - } - - public void testCancel() throws Exception - { - String result = port.cancel("foo", "bar"); - assertEquals("cancel-foobar", result); - } - - public void testMessagePartNames() throws Exception - { - Definition wsdl = getWSDLDefinition(wsdlURL.toExternalForm()); - - Message wsdlReqMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancel")); - assertNotNull("Expected part with name 'parameters' in: " + wsdlReqMessage, wsdlReqMessage.getPart("parameters")); - assertNotNull("Expected part with name 'bar' in: " + wsdlReqMessage, wsdlReqMessage.getPart("bar")); - - Message wsdlResMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancelResponse")); - assertNotNull("Expected part with name 'parameters' in: " + wsdlResMessage, wsdlResMessage.getPart("parameters")); - - /* - <binding name='IWebsvcBinding' type='tns:IWebsvc'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='cancel'> - <soap:operation soapAction=''/> - <input> - <soap:body parts='parameters' use='literal'/> - <soap:header message='tns:IWebsvc_cancel' part='bar' use='literal'></soap:header> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - */ - Binding wsdlBinding = wsdl.getBinding(new QName(TARGET_NAMESPACE, "IWebsvcBinding")); - BindingOperation bindingOperation = wsdlBinding.getBindingOperation("cancel", null, null); - - boolean foundBody = false; - boolean foundHeader = false; - List<ExtensibilityElement> extList = bindingOperation.getBindingInput().getExtensibilityElements(); - for (ExtensibilityElement extElement : extList) - { - if (extElement instanceof SOAPBody) - { - SOAPBody body = (SOAPBody)extElement; - assertEquals("parameters", body.getParts().get(0)); - foundBody = true; - } - if (extElement instanceof SOAPHeader) - { - SOAPHeader header = (SOAPHeader)extElement; - assertEquals("bar", header.getPart()); - foundHeader = true; - } - } - assertTrue("Found soap:body", foundBody); - assertTrue("Found soap:header", foundHeader); - } - - private Definition getWSDLDefinition(String wsdlLocation) throws Exception - { - WSDLFactory wsdlFactory = WSDLFactory.newInstance(); - WSDLReader wsdlReader = wsdlFactory.newWSDLReader(); - - Definition definition = wsdlReader.readWSDL(null, wsdlLocation); - return definition; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,146 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1797; + +// $Id: JBWS1797TestCase.java 3729 2007-06-26 19:38:00Z thomas.diesler(a)jboss.com $ + +import java.net.URL; +import java.util.List; + +import javax.wsdl.Binding; +import javax.wsdl.BindingOperation; +import javax.wsdl.Definition; +import javax.wsdl.Message; +import javax.wsdl.extensions.ExtensibilityElement; +import javax.wsdl.extensions.soap.SOAPBody; +import javax.wsdl.extensions.soap.SOAPHeader; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1797] Setting .NET friendly Endpoint in web.xml + * + * @author Thomas.Diesler(a)jboss.com + * @since 17-Oct-2007 + */ +public class JBWS1797TestCase extends JBossWSTest +{ + private static final String TARGET_NAMESPACE = "http://jbws1797.jaxws.ws.test.jboss.org/"; + private static URL wsdlURL; + private static IWebsvc port; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1797TestCase.class, "jaxws-jbws1797.war"); + } + + @Override + protected void setUp() throws Exception + { + if (port == null) + { + QName serviceName = new QName(TARGET_NAMESPACE, "JBWS1797Service"); + wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1797/IWebsvcImpl?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(IWebsvc.class); + } + } + + public void testSubmit() throws Exception + { + String result = port.submit("foo"); + assertEquals("submit-foo", result); + } + + public void testCancel() throws Exception + { + String result = port.cancel("foo", "bar"); + assertEquals("cancel-foobar", result); + } + + public void testMessagePartNames() throws Exception + { + Definition wsdl = getWSDLDefinition(wsdlURL.toExternalForm()); + + Message wsdlReqMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancel")); + assertNotNull("Expected part with name 'parameters' in: " + wsdlReqMessage, wsdlReqMessage.getPart("parameters")); + assertNotNull("Expected part with name 'bar' in: " + wsdlReqMessage, wsdlReqMessage.getPart("bar")); + + Message wsdlResMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancelResponse")); + assertNotNull("Expected part with name 'parameters' in: " + wsdlResMessage, wsdlResMessage.getPart("parameters")); + + /* + <binding name='IWebsvcBinding' type='tns:IWebsvc'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='cancel'> + <soap:operation soapAction=''/> + <input> + <soap:body parts='parameters' use='literal'/> + <soap:header message='tns:IWebsvc_cancel' part='bar' use='literal'></soap:header> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + */ + Binding wsdlBinding = wsdl.getBinding(new QName(TARGET_NAMESPACE, "IWebsvcBinding")); + BindingOperation bindingOperation = wsdlBinding.getBindingOperation("cancel", null, null); + + boolean foundBody = false; + boolean foundHeader = false; + List<ExtensibilityElement> extList = bindingOperation.getBindingInput().getExtensibilityElements(); + for (ExtensibilityElement extElement : extList) + { + if (extElement instanceof SOAPBody) + { + SOAPBody body = (SOAPBody)extElement; + assertEquals("parameters", body.getParts().get(0)); + foundBody = true; + } + if (extElement instanceof SOAPHeader) + { + SOAPHeader header = (SOAPHeader)extElement; + assertEquals("bar", header.getPart()); + foundHeader = true; + } + } + assertTrue("Found soap:body", foundBody); + assertTrue("Found soap:header", foundHeader); + } + + private Definition getWSDLDefinition(String wsdlLocation) throws Exception + { + WSDLFactory wsdlFactory = WSDLFactory.newInstance(); + WSDLReader wsdlReader = wsdlFactory.newWSDLReader(); + + Definition definition = wsdlReader.readWSDL(null, wsdlLocation); + return definition; + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1798; - -// $Id: $ - -import java.net.URL; -import java.util.List; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.jaxws.jbws1798.generated.CountryCodeType; -import org.jboss.test.ws.jaxws.jbws1798.generated.CurrencyCodeType; -import org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType; -import org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1798] JBossWS cannot find local schema with relative urls - * - * @author thomas.diesler(a)jboss.com - * @since 16-Oct-2007 - */ -public class JBWS1798TestCase extends JBossWSTest -{ - private String targetNS = "http://jbws1798.jaxws.ws.test.jboss.org/"; - private ServiceType proxy; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1798TestCase.class, "jaxws-jbws1798.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1798/Service?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = service.getPort(ServiceType.class); - } - - public void testCountryCodes() throws Exception - { - Response response = proxy.getCountryCodes(); - List<CountryCodeType> countryCodes = response.getCountry(); - assertEquals(countryCodes.get(0), CountryCodeType.CZ); - assertEquals(countryCodes.get(1), CountryCodeType.DE); - } - - public void testCurrencyCodes() throws Exception - { - org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes(); - List<CurrencyCodeType> currencyCodes = response.getCurrency(); - assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK); - assertEquals(currencyCodes.get(1), CurrencyCodeType.EUR); - } - - public void test() throws Exception - { - assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ)); - assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE)); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,91 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1798; + +// $Id: $ + +import java.net.URL; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxws.jbws1798.generated.CountryCodeType; +import org.jboss.test.ws.jaxws.jbws1798.generated.CurrencyCodeType; +import org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType; +import org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1798] JBossWS cannot find local schema with relative urls + * + * @author thomas.diesler(a)jboss.com + * @since 16-Oct-2007 + */ +public class JBWS1798TestCase extends JBossWSTest +{ + private String targetNS = "http://jbws1798.jaxws.ws.test.jboss.org/"; + private ServiceType proxy; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1798TestCase.class, "jaxws-jbws1798.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1798/Service?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + proxy = service.getPort(ServiceType.class); + } + + public void testCountryCodes() throws Exception + { + Response response = proxy.getCountryCodes(); + List<CountryCodeType> countryCodes = response.getCountry(); + assertEquals(countryCodes.get(0), CountryCodeType.CZ); + assertEquals(countryCodes.get(1), CountryCodeType.DE); + } + + public void testCurrencyCodes() throws Exception + { + org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes(); + List<CurrencyCodeType> currencyCodes = response.getCurrency(); + assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK); + assertEquals(currencyCodes.get(1), CurrencyCodeType.EUR); + } + + public void test() throws Exception + { + assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ)); + assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE)); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1798; - -// $Id: $ - -import java.util.List; - -import javax.jws.WebService; - -import org.jboss.test.ws.jaxws.jbws1798.generated.CountryCodeType; -import org.jboss.test.ws.jaxws.jbws1798.generated.CurrencyCodeType; -import org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse; -import org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType; -import org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response; - -@WebService(portName = "ServicePort", serviceName = "Service", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", endpointInterface = "org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType") -public class ServiceImpl implements ServiceType -{ - - public Response getCountryCodes() - { - Response response = new Response(); - List<CountryCodeType> values = response.getCountry(); - values.add(CountryCodeType.CZ); - values.add(CountryCodeType.DE); - return response; - } - - public CurrencyCodeType getCurrency(CountryCodeType parameters) - { - if (parameters == CountryCodeType.CZ) - return CurrencyCodeType.CZK; - if (parameters == CountryCodeType.DE) - return CurrencyCodeType.EUR; - - throw new IllegalArgumentException(); - } - - public GetCurrencyCodesResponse.Response getCurrencyCodes() - { - GetCurrencyCodesResponse.Response response = new GetCurrencyCodesResponse.Response(); - List<CurrencyCodeType> values = response.getCurrency(); - values.add(CurrencyCodeType.CZK); - values.add(CurrencyCodeType.EUR); - return response; - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1798; + +// $Id: $ + +import java.util.List; + +import javax.jws.WebService; + +import org.jboss.test.ws.jaxws.jbws1798.generated.CountryCodeType; +import org.jboss.test.ws.jaxws.jbws1798.generated.CurrencyCodeType; +import org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse; +import org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType; +import org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response; + +@WebService(portName = "ServicePort", serviceName = "Service", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", endpointInterface = "org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType") +public class ServiceImpl implements ServiceType +{ + + public Response getCountryCodes() + { + Response response = new Response(); + List<CountryCodeType> values = response.getCountry(); + values.add(CountryCodeType.CZ); + values.add(CountryCodeType.DE); + return response; + } + + public CurrencyCodeType getCurrency(CountryCodeType parameters) + { + if (parameters == CountryCodeType.CZ) + return CurrencyCodeType.CZK; + if (parameters == CountryCodeType.DE) + return CurrencyCodeType.EUR; + + throw new IllegalArgumentException(); + } + + public GetCurrencyCodesResponse.Response getCurrencyCodes() + { + GetCurrencyCodesResponse.Response response = new GetCurrencyCodesResponse.Response(); + List<CurrencyCodeType> values = response.getCurrency(); + values.add(CurrencyCodeType.CZK); + values.add(CurrencyCodeType.EUR); + return response; + } + +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1799; - -import javax.ejb.Remote; -import javax.jws.WebParam; -import javax.jws.WebService; - -/** - * First service interface - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 8, 2007 - */ -@Remote -@WebService -public interface IUserAccountService -{ - public boolean authenticate - ( - @WebParam(name="username") String username - ); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1799; + +import javax.ejb.Remote; +import javax.jws.WebParam; +import javax.jws.WebService; + +/** + * First service interface + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 8, 2007 + */ +@Remote +@WebService +public interface IUserAccountService +{ + public boolean authenticate + ( + @WebParam(name="username") String username + ); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1799; - -import javax.ejb.Remote; -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - -/** - * Second service interface - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 8, 2007 - */ -@Remote -@WebService -public interface IUserAccountServiceExt -{ - @RequestWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1") - @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1Response") - public boolean authenticate - ( - @WebParam(name="username") String username, - @WebParam(name="password") String password - ); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1799; + +import javax.ejb.Remote; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * Second service interface + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 8, 2007 + */ +@Remote +@WebService +public interface IUserAccountServiceExt +{ + @RequestWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1") + @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1Response") + public boolean authenticate + ( + @WebParam(name="username") String username, + @WebParam(name="password") String password + ); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,72 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1799; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1799] Two ejb3s exposed as 2 different web services in the same ear file. - * Can't have same methods with different parameters in two separate EJBs. - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 8, 2007 - */ -public class JBWS1799TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1799TestCase.class, "jaxws-jbws1799.jar"); - } - - public void testFirstService() throws Exception - { - QName serviceName = new QName("namespace1", "UserAccountService1.0"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/svc-useracctv1.0/UserAccountService1.0?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - IUserAccountService proxy = (IUserAccountService)service.getPort(IUserAccountService.class); - - assertTrue(proxy.authenticate("authorized")); - assertFalse(proxy.authenticate("unauthorized")); - } - - public void testSecondService() throws Exception - { - QName serviceName = new QName("namespaceExt", "UserAccountServiceExt1.0"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/svc-useracctv1.0/UserAccountServiceExt1.0?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - IUserAccountServiceExt proxy = (IUserAccountServiceExt)service.getPort(IUserAccountServiceExt.class); - - assertTrue(proxy.authenticate("authorized", "password")); - assertFalse(proxy.authenticate("unauthorized", "password")); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/JBWS1799TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1799; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1799] Two ejb3s exposed as 2 different web services in the same ear file. + * Can't have same methods with different parameters in two separate EJBs. + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 8, 2007 + */ +public class JBWS1799TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1799TestCase.class, "jaxws-jbws1799.jar"); + } + + public void testFirstService() throws Exception + { + QName serviceName = new QName("namespace1", "UserAccountService1.0"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/svc-useracctv1.0/UserAccountService1.0?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + IUserAccountService proxy = (IUserAccountService)service.getPort(IUserAccountService.class); + + assertTrue(proxy.authenticate("authorized")); + assertFalse(proxy.authenticate("unauthorized")); + } + + public void testSecondService() throws Exception + { + QName serviceName = new QName("namespaceExt", "UserAccountServiceExt1.0"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/svc-useracctv1.0/UserAccountServiceExt1.0?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + IUserAccountServiceExt proxy = (IUserAccountServiceExt)service.getPort(IUserAccountServiceExt.class); + + assertTrue(proxy.authenticate("authorized", "password")); + assertFalse(proxy.authenticate("unauthorized", "password")); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1799; - -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.wsf.spi.annotation.WebContext; - -/** - * First service implementation - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 8, 2007 - */ -@Stateless -@WebService -( - name="UserAccountServiceEndPoint", - targetNamespace="namespace1", - serviceName="UserAccountService1.0" -) -@SOAPBinding -( - style=SOAPBinding.Style.DOCUMENT, - use=SOAPBinding.Use.LITERAL -) -@WebContext -( - transportGuarantee="NONE", - contextRoot="/svc-useracctv1.0", - urlPattern="/UserAccountService1.0" -) -public class UserAccountService implements IUserAccountService -{ - @WebMethod - @TransactionAttribute(javax.ejb.TransactionAttributeType.SUPPORTS) - public boolean authenticate - ( - @WebParam(name="username") String username - ) - { - return "authorized".equals(username); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1799; + +import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.wsf.spi.annotation.WebContext; + +/** + * First service implementation + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 8, 2007 + */ +@Stateless +@WebService +( + name="UserAccountServiceEndPoint", + targetNamespace="namespace1", + serviceName="UserAccountService1.0" +) +@SOAPBinding +( + style=SOAPBinding.Style.DOCUMENT, + use=SOAPBinding.Use.LITERAL +) +@WebContext +( + transportGuarantee="NONE", + contextRoot="/svc-useracctv1.0", + urlPattern="/UserAccountService1.0" +) +public class UserAccountService implements IUserAccountService +{ + @WebMethod + @TransactionAttribute(javax.ejb.TransactionAttributeType.SUPPORTS) + public boolean authenticate + ( + @WebParam(name="username") String username + ) + { + return "authorized".equals(username); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1799; - -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - -import org.jboss.wsf.spi.annotation.WebContext; - -/** - * Second service implementation - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 8, 2007 - */ -@Stateless -@WebService -( - name="UserAccountServiceExtEndPoint", - targetNamespace="namespaceExt", - serviceName="UserAccountServiceExt1.0" -) -@SOAPBinding -( - style=SOAPBinding.Style.DOCUMENT, - use=SOAPBinding.Use.LITERAL -) -@WebContext -( - transportGuarantee="NONE", - contextRoot="/svc-useracctv1.0", - urlPattern="/UserAccountServiceExt1.0" -) -public class UserAccountServiceExt implements IUserAccountServiceExt -{ - @WebMethod - @TransactionAttribute(javax.ejb.TransactionAttributeType.SUPPORTS) - @RequestWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1") - @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1Response") - public boolean authenticate - ( - @WebParam(name="username") String username, - @WebParam(name="password") String password - ) - { - return "authorized".equals(username) && "password".equals(password); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1799; + +import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +import org.jboss.wsf.spi.annotation.WebContext; + +/** + * Second service implementation + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 8, 2007 + */ +@Stateless +@WebService +( + name="UserAccountServiceExtEndPoint", + targetNamespace="namespaceExt", + serviceName="UserAccountServiceExt1.0" +) +@SOAPBinding +( + style=SOAPBinding.Style.DOCUMENT, + use=SOAPBinding.Use.LITERAL +) +@WebContext +( + transportGuarantee="NONE", + contextRoot="/svc-useracctv1.0", + urlPattern="/UserAccountServiceExt1.0" +) +public class UserAccountServiceExt implements IUserAccountServiceExt +{ + @WebMethod + @TransactionAttribute(javax.ejb.TransactionAttributeType.SUPPORTS) + @RequestWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1") + @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1Response") + public boolean authenticate + ( + @WebParam(name="username") String username, + @WebParam(name="password") String password + ) + { + return "authorized".equals(username) && "password".equals(password); + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1807; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; -import javax.xml.ws.Dispatch; -import javax.xml.ws.Service; -import javax.xml.ws.Service.Mode; -import javax.xml.ws.http.HTTPBinding; - -import junit.framework.Test; - -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.w3c.dom.Element; - -/** - * HTTP bindings for Provider - * - * http://jira.jboss.org/jira/browse/JBWS-1807 - * - * @author Thomas.Diesler(a)jboss.com - * @since 09-Oct-2007 - */ -public class JBWS1807TestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1807"; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1807TestCase.class, "jaxws-jbws1807.war"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - Element wsdl = DOMUtils.parse(wsdlURL.openStream()); - assertNotNull(wsdl); - } - - public void testProviderDispatch() throws Exception - { - String targetNS = "http://ws.com/"; - QName serviceName = new QName(targetNS, "Provider"); - QName portName = new QName(targetNS, "ProviderPort"); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - - Service service = Service.create(serviceName); - service.addPort(portName, HTTPBinding.HTTP_BINDING, wsdlURL.toExternalForm()); - - Dispatch<Source> dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD); - Source resPayload = dispatch.invoke(new DOMSource(DOMUtils.parse("<input>hello</input>"))); - - Element docElement = DOMUtils.sourceToElement(resPayload); - assertEquals(DOMUtils.parse("<reply><input>hello</input></reply>"), docElement); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1807; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; +import javax.xml.ws.Dispatch; +import javax.xml.ws.Service; +import javax.xml.ws.Service.Mode; +import javax.xml.ws.http.HTTPBinding; + +import junit.framework.Test; + +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.w3c.dom.Element; + +/** + * HTTP bindings for Provider + * + * http://jira.jboss.org/jira/browse/JBWS-1807 + * + * @author Thomas.Diesler(a)jboss.com + * @since 09-Oct-2007 + */ +public class JBWS1807TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1807"; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1807TestCase.class, "jaxws-jbws1807.war"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); + } + + public void testProviderDispatch() throws Exception + { + String targetNS = "http://ws.com/"; + QName serviceName = new QName(targetNS, "Provider"); + QName portName = new QName(targetNS, "ProviderPort"); + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + + Service service = Service.create(serviceName); + service.addPort(portName, HTTPBinding.HTTP_BINDING, wsdlURL.toExternalForm()); + + Dispatch<Source> dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD); + Source resPayload = dispatch.invoke(new DOMSource(DOMUtils.parse("<input>hello</input>"))); + + Element docElement = DOMUtils.sourceToElement(resPayload); + assertEquals(DOMUtils.parse("<reply><input>hello</input></reply>"), docElement); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,63 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1807; - -import java.io.ByteArrayInputStream; -import java.io.IOException; - -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import javax.xml.ws.BindingType; -import javax.xml.ws.Provider; -import javax.xml.ws.Service; -import javax.xml.ws.ServiceMode; -import javax.xml.ws.WebServiceProvider; -import javax.xml.ws.http.HTTPBinding; - -import org.jboss.logging.Logger; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.common.DOMWriter; - -@WebServiceProvider(wsdlLocation = "WEB-INF/wsdl/provider.wsdl", portName = "ProviderPort", serviceName = "Provider", targetNamespace = "http://ws.com/") -@ServiceMode(value = Service.Mode.PAYLOAD) -@BindingType(value = HTTPBinding.HTTP_BINDING) -public class ProviderImpl implements Provider<Source> -{ - // provide logging - private final static Logger log = Logger.getLogger(ProviderImpl.class); - - public Source invoke(Source source) - { - try - { - String input = DOMWriter.printNode(DOMUtils.sourceToElement(source), false); - log.info("invoke: " + input); - - String reply = "<reply>" + input + "</reply>"; - return new StreamSource(new ByteArrayInputStream(reply.getBytes())); - } - catch (IOException ex) - { - throw new RuntimeException(ex); - } - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1807; + +import java.io.ByteArrayInputStream; +import java.io.IOException; + +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.BindingType; +import javax.xml.ws.Provider; +import javax.xml.ws.Service; +import javax.xml.ws.ServiceMode; +import javax.xml.ws.WebServiceProvider; +import javax.xml.ws.http.HTTPBinding; + +import org.jboss.logging.Logger; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.DOMWriter; + +@WebServiceProvider(wsdlLocation = "WEB-INF/wsdl/provider.wsdl", portName = "ProviderPort", serviceName = "Provider", targetNamespace = "http://ws.com/") +@ServiceMode(value = Service.Mode.PAYLOAD) +@BindingType(value = HTTPBinding.HTTP_BINDING) +public class ProviderImpl implements Provider<Source> +{ + // provide logging + private final static Logger log = Logger.getLogger(ProviderImpl.class); + + public Source invoke(Source source) + { + try + { + String input = DOMWriter.printNode(DOMUtils.sourceToElement(source), false); + log.info("invoke: " + input); + + String reply = "<reply>" + input + "</reply>"; + return new StreamSource(new ByteArrayInputStream(reply.getBytes())); + } + catch (IOException ex) + { + throw new RuntimeException(ex); + } + } +} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1809; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class DocRequest -{ - String value; - - public String getValue() - { - return value; - } - - public void setValue(String value) - { - this.value = value; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1809; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class DocRequest +{ + String value; + + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1809; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class DocResponse -{ - String value; - - - public String getValue() - { - return value; - } - - public void setValue(String value) - { - this.value = value; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1809; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class DocResponse +{ + String value; + + + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1809; - -import javax.ejb.Remote; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -@Remote -@WebService(targetNamespace = "http://org.jboss.ws/jaxbintro/wsdl") -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) -public interface Endpoint -{ - DocResponse processDocument(DocRequest req); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1809; + +import javax.ejb.Remote; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@Remote +@WebService(targetNamespace = "http://org.jboss.ws/jaxbintro/wsdl") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface Endpoint +{ + DocResponse processDocument(DocRequest req); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1809; - -import javax.ejb.Stateless; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -@Stateless -@WebService( - targetNamespace = "http://org.jboss.ws/jaxbintro/wsdl", - endpointInterface = "org.jboss.test.ws.jaxws.jbws1809.Endpoint" -) -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) -public class EndpointImpl implements Endpoint -{ - public DocResponse processDocument(DocRequest req) - { - DocResponse res = new DocResponse(); - res.setValue(req.getValue()+"Response"); - return res; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1809; + +import javax.ejb.Stateless; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +@Stateless +@WebService( + targetNamespace = "http://org.jboss.ws/jaxbintro/wsdl", + endpointInterface = "org.jboss.test.ws.jaxws.jbws1809.Endpoint" +) +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) +public class EndpointImpl implements Endpoint +{ + public DocResponse processDocument(DocRequest req) + { + DocResponse res = new DocResponse(); + res.setValue(req.getValue()+"Response"); + return res; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1809; - -import junit.framework.Test; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLTypes; -import org.jboss.ws.metadata.wsdl.DOMTypes; -import org.jboss.ws.metadata.wsdl.XSModelTypes; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -import java.net.URL; -import java.net.MalformedURLException; -import java.util.Iterator; - -/** - * Test the JAXBIntroduction features. - * - * Check if the WSDL is generated correctly. - * The introduction should turn a property into a xsd:attribute declaration. - * - * @author heiko.braun(a)jboss.com - */ -public class JBWS1809TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1809TestCase.class, "jaxws-jbws1809.jar"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1809/EndpointImpl?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull("Unable to read WSDL definitions", wsdlDefinitions); - - XSModelTypes wsdlTypes = (XSModelTypes)wsdlDefinitions.getWsdlTypes(); - - // convert XSModelTypes to dom representation - // it's easier to consume... - - Element types = DOMUtils.parse(wsdlTypes.getSchemaModel().serialize()); - Iterator it = DOMUtils.getChildElements(types, "complexType"); - - boolean foundAttributeDeclaration = false; - while(it.hasNext()) - { - Element next = (Element)it.next(); - if(DOMUtils.getAttributeValue(next, "name").equals("docRequest")) - { - Iterator it2 = DOMUtils.getChildElements(next, "attribute"); - - while(it2.hasNext()) - { - Element next2 = (Element)it2.next(); - if(DOMUtils.getAttributeValue(next2, "name").equals("value")) - { - foundAttributeDeclaration = true; - } - } - } - } - - assertTrue("JAXBIntros should turn the 'docRequest.name' property into a XML attribute", foundAttributeDeclaration); - - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,92 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1809; + +import junit.framework.Test; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLTypes; +import org.jboss.ws.metadata.wsdl.DOMTypes; +import org.jboss.ws.metadata.wsdl.XSModelTypes; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import java.net.URL; +import java.net.MalformedURLException; +import java.util.Iterator; + +/** + * Test the JAXBIntroduction features. + * + * Check if the WSDL is generated correctly. + * The introduction should turn a property into a xsd:attribute declaration. + * + * @author heiko.braun(a)jboss.com + */ +public class JBWS1809TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1809TestCase.class, "jaxws-jbws1809.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1809/EndpointImpl?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull("Unable to read WSDL definitions", wsdlDefinitions); + + XSModelTypes wsdlTypes = (XSModelTypes)wsdlDefinitions.getWsdlTypes(); + + // convert XSModelTypes to dom representation + // it's easier to consume... + + Element types = DOMUtils.parse(wsdlTypes.getSchemaModel().serialize()); + Iterator it = DOMUtils.getChildElements(types, "complexType"); + + boolean foundAttributeDeclaration = false; + while(it.hasNext()) + { + Element next = (Element)it.next(); + if(DOMUtils.getAttributeValue(next, "name").equals("docRequest")) + { + Iterator it2 = DOMUtils.getChildElements(next, "attribute"); + + while(it2.hasNext()) + { + Element next2 = (Element)it2.next(); + if(DOMUtils.getAttributeValue(next2, "name").equals("value")) + { + foundAttributeDeclaration = true; + } + } + } + } + + assertTrue("JAXBIntros should turn the 'docRequest.name' property into a XML attribute", foundAttributeDeclaration); + + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1813; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - -@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jbws1813") -@SOAPBinding(style = Style.RPC) -public interface Endpoint -{ - - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jbws1813", partName = "return") - public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0); - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/Endpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1813; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jbws1813") +@SOAPBinding(style = Style.RPC) +public interface Endpoint +{ + + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jbws1813", partName = "return") + public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0); + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1813; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.annotation.WebContext; - -@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/jbws1813") -@Stateless(name = "Endpoint") -@SOAPBinding(style = Style.RPC) -@WebContext(urlPattern="/*") -public class EndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(EndpointImpl.class); - - @WebMethod - public String echo(String input) - { - log.info(input); - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1813; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.annotation.WebContext; + +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://org.jboss.ws/jbws1813") +@Stateless(name = "Endpoint") +@SOAPBinding(style = Style.RPC) +@WebContext(urlPattern="/*") +public class EndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info(input); + return input; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,66 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1813; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * context-root in jboss.xml is ignored - * - * http://jira.jboss.org/jira/browse/JBWS-1813 - * - * @author Thomas.Diesler(a)jboss.com - * @since 09-Oct-2007 - */ -public class JBWS1813TestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/test-context"; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1813TestCase.class, "jaxws-jbws1813.ear"); - } - - public void testPositive() throws Exception - { - if ( isTargetJBoss40() ) - { - System.out.println("FIXME [JBWS-1813] context-root in jboss.xml is ignored"); - return; - } - - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1813", "EndpointService"); - Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class); - - String retObj = port.echo("Hello"); - assertEquals("Hello", retObj); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1813/JBWS1813TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1813; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * context-root in jboss.xml is ignored + * + * http://jira.jboss.org/jira/browse/JBWS-1813 + * + * @author Thomas.Diesler(a)jboss.com + * @since 09-Oct-2007 + */ +public class JBWS1813TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/test-context"; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1813TestCase.class, "jaxws-jbws1813.ear"); + } + + public void testPositive() throws Exception + { + if ( isTargetJBoss40() ) + { + System.out.println("FIXME [JBWS-1813] context-root in jboss.xml is ignored"); + return; + } + + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1813", "EndpointService"); + Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class); + + String retObj = port.echo("Hello"); + assertEquals("Hello", retObj); + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,102 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1815; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.net.URL; - -import javax.xml.soap.Detail; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; - -import junit.framework.Test; - -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.common.DOMWriter; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.w3c.dom.Element; - -/** - * Test case for http://jira.jboss.org/jira/browse/JBWS-1815 - * - * @author alessio.soldano(a)jboss.com - * @since 11-Oct-2007 - */ -public class JBWS1815TestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1815/ProviderImpl"; - - private String msgString = - "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:my=\"http://www.my-company.it/ws/my-test\">" + - " <soapenv:Header/>" + - " <soapenv:Body>" + - " <my:performTest>" + - " <my:Code>43</my:Code>" + - " </my:performTest>" + - " </soapenv:Body>" + - "</soapenv:Envelope>"; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1815TestCase.class, "jaxws-jbws1815.jar"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - Element wsdl = DOMUtils.parse(wsdlURL.openStream()); - assertNotNull(wsdl); - } - - public void testProviderMessage() throws Exception - { - SOAPMessage reqMsg = getRequestMessage(); - URL epURL = new URL(TARGET_ENDPOINT_ADDRESS); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage resMsg = con.call(reqMsg, epURL); - SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - Detail detail = resEnv.getBody().getFault().getDetail(); - assertNotNull(detail); - SOAPElement exception = (SOAPElement)detail.getDetailEntries().next(); - assertNotNull(exception); - assertEquals(exception.getNodeName(), "MyWSException"); - SOAPElement message = (SOAPElement)exception.getChildElements().next(); - assertNotNull(message); - assertEquals(message.getNodeName(), "message"); - assertEquals(message.getValue(), "This is a faked error"); - } - - private SOAPMessage getRequestMessage() throws SOAPException, IOException - { - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(msgString.getBytes())); - return reqMsg; - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,102 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1815; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.URL; + +import javax.xml.soap.Detail; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; + +import junit.framework.Test; + +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.DOMWriter; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.w3c.dom.Element; + +/** + * Test case for http://jira.jboss.org/jira/browse/JBWS-1815 + * + * @author alessio.soldano(a)jboss.com + * @since 11-Oct-2007 + */ +public class JBWS1815TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1815/ProviderImpl"; + + private String msgString = + "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:my=\"http://www.my-company.it/ws/my-test\">" + + " <soapenv:Header/>" + + " <soapenv:Body>" + + " <my:performTest>" + + " <my:Code>43</my:Code>" + + " </my:performTest>" + + " </soapenv:Body>" + + "</soapenv:Envelope>"; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1815TestCase.class, "jaxws-jbws1815.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); + } + + public void testProviderMessage() throws Exception + { + SOAPMessage reqMsg = getRequestMessage(); + URL epURL = new URL(TARGET_ENDPOINT_ADDRESS); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage resMsg = con.call(reqMsg, epURL); + SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); + Detail detail = resEnv.getBody().getFault().getDetail(); + assertNotNull(detail); + SOAPElement exception = (SOAPElement)detail.getDetailEntries().next(); + assertNotNull(exception); + assertEquals(exception.getNodeName(), "MyWSException"); + SOAPElement message = (SOAPElement)exception.getChildElements().next(); + assertNotNull(message); + assertEquals(message.getNodeName(), "message"); + assertEquals(message.getValue(), "This is a faked error"); + } + + private SOAPMessage getRequestMessage() throws SOAPException, IOException + { + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(msgString.getBytes())); + return reqMsg; + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1815; - -import javax.ejb.Local; -import javax.ejb.Stateless; -import javax.xml.namespace.QName; -import javax.xml.soap.Detail; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPFault; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.Provider; -import javax.xml.ws.Service; -import javax.xml.ws.ServiceMode; -import javax.xml.ws.WebServiceProvider; -import javax.xml.ws.soap.SOAPFaultException; - -import org.jboss.wsf.spi.annotation.WebContext; - -/** - * Test impl for http://jira.jboss.org/jira/browse/JBWS-1815 - * - * @author alessio.soldano(a)jboss.com - * @since 11-Oct-2007 - */ -@Local -@Stateless -@WebServiceProvider(serviceName = "MyTestService", - portName = "MyTestPort", - targetNamespace = "http://www.my-company.it/ws/my-test", - wsdlLocation = "META-INF/wsdl/my-service.wsdl") -@WebContext(contextRoot = "/jaxws-jbws1815") -@ServiceMode(value = Service.Mode.MESSAGE) -public class ProviderImpl implements Provider<SOAPMessage> -{ - - public SOAPMessage invoke(SOAPMessage requestSoapMessage) - { - SOAPFault theSOAPFault; - try { - theSOAPFault = SOAPFactory.newInstance().createFault(); - Detail soapFaultDetail = theSOAPFault.addDetail(); - SOAPElement myFaultElement = soapFaultDetail.addChildElement(new QName("http://www.my-company.it/ws/my-test", "MyWSException")); - SOAPElement myMessageElement = myFaultElement.addChildElement(new QName("http://www.my-company.it/ws/my-test", "message")); -// myMessageElement.setNodeValue("This is a faked error"); //wrong: myMessageElement is not a text node - myMessageElement.setValue("This is a faked error"); //right: this creates a text node and gives it a text value - } catch (SOAPException se) { - se.printStackTrace(); - throw new RuntimeException("Something unexpected happened!"); - } - throw new SOAPFaultException(theSOAPFault); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1815; + +import javax.ejb.Local; +import javax.ejb.Stateless; +import javax.xml.namespace.QName; +import javax.xml.soap.Detail; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFactory; +import javax.xml.soap.SOAPFault; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.Provider; +import javax.xml.ws.Service; +import javax.xml.ws.ServiceMode; +import javax.xml.ws.WebServiceProvider; +import javax.xml.ws.soap.SOAPFaultException; + +import org.jboss.wsf.spi.annotation.WebContext; + +/** + * Test impl for http://jira.jboss.org/jira/browse/JBWS-1815 + * + * @author alessio.soldano(a)jboss.com + * @since 11-Oct-2007 + */ +@Local +@Stateless +@WebServiceProvider(serviceName = "MyTestService", + portName = "MyTestPort", + targetNamespace = "http://www.my-company.it/ws/my-test", + wsdlLocation = "META-INF/wsdl/my-service.wsdl") +@WebContext(contextRoot = "/jaxws-jbws1815") +@ServiceMode(value = Service.Mode.MESSAGE) +public class ProviderImpl implements Provider<SOAPMessage> +{ + + public SOAPMessage invoke(SOAPMessage requestSoapMessage) + { + SOAPFault theSOAPFault; + try { + theSOAPFault = SOAPFactory.newInstance().createFault(); + Detail soapFaultDetail = theSOAPFault.addDetail(); + SOAPElement myFaultElement = soapFaultDetail.addChildElement(new QName("http://www.my-company.it/ws/my-test", "MyWSException")); + SOAPElement myMessageElement = myFaultElement.addChildElement(new QName("http://www.my-company.it/ws/my-test", "message")); +// myMessageElement.setNodeValue("This is a faked error"); //wrong: myMessageElement is not a text node + myMessageElement.setValue("This is a faked error"); //right: this creates a text node and gives it a text value + } catch (SOAPException se) { + se.printStackTrace(); + throw new RuntimeException("Something unexpected happened!"); + } + throw new SOAPFaultException(theSOAPFault); + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,84 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1822; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1822] Cannot find service endpoint target - * - * @author richard.opalka(a)jboss.com - * - * @since Jan 8, 2008 - */ -public final class JBWS1822TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1822TestCase.class, ""); - } - - private EJB3RemoteIface getProxy() throws Exception - { - QName serviceName = new QName("http://jbossws.org/JBWS1822", "TestService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1822?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - return (EJB3RemoteIface)service.getPort(EJB3RemoteIface.class); - } - - public void testOneEjbModule() throws Exception - { - deploy("jaxws-jbws1822-one-ejb-module.ear"); - try - { - assertEquals(getProxy().getMessage(), "Injected hello message"); - } - finally - { - undeploy("jaxws-jbws1822-one-ejb-module.ear"); - } - } - - public void testTwoEjbModules() throws Exception - { - deploy("jaxws-jbws1822-two-ejb-modules.ear"); - try - { - assertEquals(getProxy().getMessage(), "Injected hello message"); - } - finally - { - undeploy("jaxws-jbws1822-two-ejb-modules.ear"); - } - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1822; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1822] Cannot find service endpoint target + * + * @author richard.opalka(a)jboss.com + * + * @since Jan 8, 2008 + */ +public final class JBWS1822TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1822TestCase.class, ""); + } + + private EJB3RemoteIface getProxy() throws Exception + { + QName serviceName = new QName("http://jbossws.org/JBWS1822", "TestService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1822?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + return (EJB3RemoteIface)service.getPort(EJB3RemoteIface.class); + } + + public void testOneEjbModule() throws Exception + { + deploy("jaxws-jbws1822-one-ejb-module.ear"); + try + { + assertEquals(getProxy().getMessage(), "Injected hello message"); + } + finally + { + undeploy("jaxws-jbws1822-one-ejb-module.ear"); + } + } + + public void testTwoEjbModules() throws Exception + { + deploy("jaxws-jbws1822-two-ejb-modules.ear"); + try + { + assertEquals(getProxy().getMessage(), "Injected hello message"); + } + finally + { + undeploy("jaxws-jbws1822-two-ejb-modules.ear"); + } + } + +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/shared) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1822/webservice) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,89 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1840; - -import java.net.URL; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceException; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Secure endpoint using @SecurityDomain - * - * http://jira.jboss.org/jira/browse/JBWS-1840 - * - * @author Thomas.Diesler(a)jboss.com - * @since 09-Oct-2007 - */ -public class JBWS1840TestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1840"; - - private static SecureEndpoint port; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1840TestCase.class, "jaxws-jbws1840.jar"); - } - - protected void setUp() throws Exception - { - if (port == null) - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1840", "SecureEndpointService"); - port = Service.create(wsdlURL, serviceName).getPort(SecureEndpoint.class); - } - } - - public void testNegative() - { - try - { - port.echo("Hello"); - fail("Expected: Invalid HTTP server response [401] - Unauthorized"); - } - catch (WebServiceException ex) - { - // all good - } - } - - public void testPositive() - { - Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); - reqContext.put(BindingProvider.USERNAME_PROPERTY, "kermit"); - reqContext.put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); - - String retObj = port.echo("Hello"); - assertEquals("Hello", retObj); - - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,89 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1840; + +import java.net.URL; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceException; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Secure endpoint using @SecurityDomain + * + * http://jira.jboss.org/jira/browse/JBWS-1840 + * + * @author Thomas.Diesler(a)jboss.com + * @since 09-Oct-2007 + */ +public class JBWS1840TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1840"; + + private static SecureEndpoint port; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1840TestCase.class, "jaxws-jbws1840.jar"); + } + + protected void setUp() throws Exception + { + if (port == null) + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1840", "SecureEndpointService"); + port = Service.create(wsdlURL, serviceName).getPort(SecureEndpoint.class); + } + } + + public void testNegative() + { + try + { + port.echo("Hello"); + fail("Expected: Invalid HTTP server response [401] - Unauthorized"); + } + catch (WebServiceException ex) + { + // all good + } + } + + public void testPositive() + { + Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); + reqContext.put(BindingProvider.USERNAME_PROPERTY, "kermit"); + reqContext.put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); + + String retObj = port.echo("Hello"); + assertEquals("Hello", retObj); + + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1840; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - -@WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/jbws1840") -@SOAPBinding(style = Style.RPC) -public interface SecureEndpoint -{ - - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/jbws1840", partName = "return") - public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0); - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1840; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +@WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/jbws1840") +@SOAPBinding(style = Style.RPC) +public interface SecureEndpoint +{ + + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/jbws1840", partName = "return") + public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0); + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1840; - -import javax.annotation.security.RolesAllowed; -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - -import org.jboss.annotation.security.SecurityDomain; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.annotation.WebContext; - -@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/jbws1840") -@Stateless(name = "SecureEndpoint") -@SOAPBinding(style = Style.RPC) - -@WebContext(contextRoot="/jaxws-jbws1840", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) -@SecurityDomain("JBossWS") -@RolesAllowed("friend") -public class SecureEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(SecureEndpointImpl.class); - - @WebMethod - public String echo(String input) - { - log.info(input); - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1840; + +import javax.annotation.security.RolesAllowed; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +import org.jboss.annotation.security.SecurityDomain; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.annotation.WebContext; + +@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/jbws1840") +@Stateless(name = "SecureEndpoint") +@SOAPBinding(style = Style.RPC) + +@WebContext(contextRoot="/jaxws-jbws1840", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) +@SecurityDomain("JBossWS") +@RolesAllowed("friend") +public class SecureEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(SecureEndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info(input); + return input; + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1841; - -import org.jboss.wsf.spi.annotation.WebContext; - -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a> - * @version $Revision$ - */ -@WebService( - name = "EndpointInterface", - targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", - serviceName = "TestService", - endpointInterface = "org.jboss.test.ws.jaxws.jbws1841.EndpointInterface" -) -@SOAPBinding(style = SOAPBinding.Style.RPC) -@Stateless -public class EJB3Bean implements EndpointInterface -{ - public String echo(String input) - { - System.out.println("Recv: " + input); - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EJB3Bean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1841; + +import org.jboss.wsf.spi.annotation.WebContext; + +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a> + * @version $Revision$ + */ +@WebService( + name = "EndpointInterface", + targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", + serviceName = "TestService", + endpointInterface = "org.jboss.test.ws.jaxws.jbws1841.EndpointInterface" +) +@SOAPBinding(style = SOAPBinding.Style.RPC) +@Stateless +public class EJB3Bean implements EndpointInterface +{ + public String echo(String input) + { + System.out.println("Recv: " + input); + return input; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1841; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.ejb.Remote; - -/** - * Test the JSR-181 javax.jws.WebService annotation on an SEI - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 - */ -@WebService( - name = "EndpointInterface", - targetNamespace = "http://www.openuri.org/2004/04/HelloWorld" -) -@SOAPBinding(style = SOAPBinding.Style.RPC) -@Remote -public interface EndpointInterface -{ - String echo(String input); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1841; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.ejb.Remote; + +/** + * Test the JSR-181 javax.jws.WebService annotation on an SEI + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Apr-2005 + */ +@WebService( + name = "EndpointInterface", + targetNamespace = "http://www.openuri.org/2004/04/HelloWorld" +) +@SOAPBinding(style = SOAPBinding.Style.RPC) +@Remote +public interface EndpointInterface +{ + String echo(String input); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,83 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws1841; - -import junit.framework.Test; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.naming.InitialContext; -import java.net.URL; - -/** - * Serviceref thorugh ejb3 deployment descriptor. - * - * http://jira.jboss.org/jira/browse/JBWS-1841 - * - * @author Heiko.Braun(a)jboss.com - * @since 09-Oct-2007 - */ -public class JBWS1841TestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1841/EJB3Bean"; - - private static EndpointInterface port; - private static StatelessRemote remote; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1841TestCase.class, "jaxws-jbws1841.jar"); - } - - protected void setUp() throws Exception - { - if (port == null) - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "TestService"); - port = Service.create(wsdlURL, serviceName).getPort(EndpointInterface.class); - - - InitialContext ctx = new InitialContext(); - remote = (StatelessRemote)ctx.lookup("/StatelessBean/remote"); - } - } - - /** - * Check if the servce was deploed correctly - * @throws Exception - */ - public void testDirectWSInvocation() throws Exception - { - String result = port.echo("DirectWSInvocation"); - assertEquals("DirectWSInvocation", result); - - } - - public void testEJBRelay1() throws Exception - { - String result = remote.echo1("Relay1"); - assertEquals("Relay1", result); - } - - public void testEJBRelay2() throws Exception - { - String result = remote.echo2("Relay2"); - assertEquals("Relay2", result); - } - - - public void testEJBRelay3() throws Exception - { - String result = remote.echo3("Relay3"); - assertEquals("Relay3", result); - } - - public void testEJBRelay4() throws Exception - { - String result = remote.echo4("Relay4"); - assertEquals("Relay4", result); - } - - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,83 @@ +package org.jboss.test.ws.jaxws.jbws1841; + +import junit.framework.Test; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.naming.InitialContext; +import java.net.URL; + +/** + * Serviceref thorugh ejb3 deployment descriptor. + * + * http://jira.jboss.org/jira/browse/JBWS-1841 + * + * @author Heiko.Braun(a)jboss.com + * @since 09-Oct-2007 + */ +public class JBWS1841TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1841/EJB3Bean"; + + private static EndpointInterface port; + private static StatelessRemote remote; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1841TestCase.class, "jaxws-jbws1841.jar"); + } + + protected void setUp() throws Exception + { + if (port == null) + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "TestService"); + port = Service.create(wsdlURL, serviceName).getPort(EndpointInterface.class); + + + InitialContext ctx = new InitialContext(); + remote = (StatelessRemote)ctx.lookup("/StatelessBean/remote"); + } + } + + /** + * Check if the servce was deploed correctly + * @throws Exception + */ + public void testDirectWSInvocation() throws Exception + { + String result = port.echo("DirectWSInvocation"); + assertEquals("DirectWSInvocation", result); + + } + + public void testEJBRelay1() throws Exception + { + String result = remote.echo1("Relay1"); + assertEquals("Relay1", result); + } + + public void testEJBRelay2() throws Exception + { + String result = remote.echo2("Relay2"); + assertEquals("Relay2", result); + } + + + public void testEJBRelay3() throws Exception + { + String result = remote.echo3("Relay3"); + assertEquals("Relay3", result); + } + + public void testEJBRelay4() throws Exception + { + String result = remote.echo4("Relay4"); + assertEquals("Relay4", result); + } + + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,97 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1841; - -import org.jboss.logging.Logger; - -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.xml.ws.WebServiceRef; - -/** - * A test bean that delegates to a web service provided through serviceref injection. - * - * @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a> - * @version $Revision$ - */ -@Stateless(name="StatelessBean") -(a)Remote(StatelessRemote.class) -public class StatelessBean implements StatelessRemote -{ - private static final Logger log = Logger.getLogger(StatelessBean.class); - - @WebServiceRef(mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl") - EndpointInterface endpoint1; - - EndpointInterface endpoint2; - - @WebServiceRef(mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl") - public void setEndpoint2(EndpointInterface endpoint2) - { - this.endpoint2 = endpoint2; - } - - // via XML - EndpointInterface endpoint3; - - // via XML - EndpointInterface endpoint4; - - public void setEndpoint4(EndpointInterface endpoint4) - { - this.endpoint4 = endpoint4; - } - - - public String echo1(String string) throws Exception - { - if(null==endpoint1) - throw new IllegalArgumentException("Serviceref for property 'endpoint1' not injected"); - - return endpoint1.echo(string); - } - - public String echo2(String string) throws Exception - { - if(null==endpoint2) - throw new IllegalArgumentException("Serviceref for property 'endpoint2' not injected"); - - return endpoint2.echo(string); - } - - public String echo3(String string) throws Exception - { - if(null==endpoint3) - throw new IllegalArgumentException("Serviceref for property 'endpoint3' not injected"); - - return endpoint3.echo(string); - } - - public String echo4(String string) throws Exception - { - if(null==endpoint4) - throw new IllegalArgumentException("Serviceref for property 'endpoint4' not injected"); - - return endpoint4.echo(string); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,97 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1841; + +import org.jboss.logging.Logger; + +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.xml.ws.WebServiceRef; + +/** + * A test bean that delegates to a web service provided through serviceref injection. + * + * @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a> + * @version $Revision$ + */ +@Stateless(name="StatelessBean") +(a)Remote(StatelessRemote.class) +public class StatelessBean implements StatelessRemote +{ + private static final Logger log = Logger.getLogger(StatelessBean.class); + + @WebServiceRef(mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl") + EndpointInterface endpoint1; + + EndpointInterface endpoint2; + + @WebServiceRef(mappedName="jbossws-client/service/TestService", wsdlLocation="META-INF/wsdl/TestService.wsdl") + public void setEndpoint2(EndpointInterface endpoint2) + { + this.endpoint2 = endpoint2; + } + + // via XML + EndpointInterface endpoint3; + + // via XML + EndpointInterface endpoint4; + + public void setEndpoint4(EndpointInterface endpoint4) + { + this.endpoint4 = endpoint4; + } + + + public String echo1(String string) throws Exception + { + if(null==endpoint1) + throw new IllegalArgumentException("Serviceref for property 'endpoint1' not injected"); + + return endpoint1.echo(string); + } + + public String echo2(String string) throws Exception + { + if(null==endpoint2) + throw new IllegalArgumentException("Serviceref for property 'endpoint2' not injected"); + + return endpoint2.echo(string); + } + + public String echo3(String string) throws Exception + { + if(null==endpoint3) + throw new IllegalArgumentException("Serviceref for property 'endpoint3' not injected"); + + return endpoint3.echo(string); + } + + public String echo4(String string) throws Exception + { + if(null==endpoint4) + throw new IllegalArgumentException("Serviceref for property 'endpoint4' not injected"); + + return endpoint4.echo(string); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1841; - -/** - * @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a> - * @version $Revision$ - */ -public interface StatelessRemote -{ - String echo1(String string) throws Exception; - - String echo2(String string) throws Exception; - - String echo3(String string) throws Exception; - - String echo4(String string) throws Exception; - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1841/StatelessRemote.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1841; + +/** + * @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a> + * @version $Revision$ + */ +public interface StatelessRemote +{ + String echo1(String string) throws Exception; + + String echo2(String string) throws Exception; + + String echo3(String string) throws Exception; + + String echo4(String string) throws Exception; + +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1843; - -import java.net.URL; -import java.util.List; - -import javax.xml.namespace.QName; - -import junit.framework.Test; - -import org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType; -import org.jboss.test.ws.jaxws.jbws1843.generated.CurrencyCodeType; -import org.jboss.test.ws.jaxws.jbws1843.generated.Service; -import org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1843] WSDL with custom schema imports causes - * <b>java.lang.OutOfMemoryError: Java heap space</b> - * when there are circular schema imports dependencies - * - * @author richard.opalka(a)jboss.com - * @since Oct 10, 2007 - */ -public class JBWS1843TestCase extends JBossWSTest -{ - private String targetNS = "http://jbws1843.jaxws.ws.test.jboss.org/"; - private Service proxy; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1843TestCase.class, "jaxws-jbws1843.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1843/Service?wsdl"); - - javax.xml.ws.Service service = javax.xml.ws.Service.create(wsdlURL, serviceName); - proxy = (Service)service.getPort(Service.class); - } - - public void testCountryCodes() throws Exception - { - Response response = proxy.getCountryCodes(); - List<CountryCodeType> countryCodes = response.getCountry(); - assertEquals(countryCodes.get(0), CountryCodeType.CZ); - assertEquals(countryCodes.get(1), CountryCodeType.DE); - } - - public void testCurrencyCodes() throws Exception - { - org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes(); - List<CurrencyCodeType> currencyCodes = response.getCurrency(); - assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK); - assertEquals(currencyCodes.get(1), CurrencyCodeType.EUR); - } - - public void test() throws Exception - { - assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ)); - assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE)); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1843; + +import java.net.URL; +import java.util.List; + +import javax.xml.namespace.QName; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType; +import org.jboss.test.ws.jaxws.jbws1843.generated.CurrencyCodeType; +import org.jboss.test.ws.jaxws.jbws1843.generated.Service; +import org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1843] WSDL with custom schema imports causes + * <b>java.lang.OutOfMemoryError: Java heap space</b> + * when there are circular schema imports dependencies + * + * @author richard.opalka(a)jboss.com + * @since Oct 10, 2007 + */ +public class JBWS1843TestCase extends JBossWSTest +{ + private String targetNS = "http://jbws1843.jaxws.ws.test.jboss.org/"; + private Service proxy; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1843TestCase.class, "jaxws-jbws1843.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1843/Service?wsdl"); + + javax.xml.ws.Service service = javax.xml.ws.Service.create(wsdlURL, serviceName); + proxy = (Service)service.getPort(Service.class); + } + + public void testCountryCodes() throws Exception + { + Response response = proxy.getCountryCodes(); + List<CountryCodeType> countryCodes = response.getCountry(); + assertEquals(countryCodes.get(0), CountryCodeType.CZ); + assertEquals(countryCodes.get(1), CountryCodeType.DE); + } + + public void testCurrencyCodes() throws Exception + { + org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes(); + List<CurrencyCodeType> currencyCodes = response.getCurrency(); + assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK); + assertEquals(currencyCodes.get(1), CurrencyCodeType.EUR); + } + + public void test() throws Exception + { + assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ)); + assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE)); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1843; - -import java.util.List; - -import javax.jws.WebService; - -import org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType; -import org.jboss.test.ws.jaxws.jbws1843.generated.CurrencyCodeType; -import org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response; -import org.jboss.test.ws.jaxws.jbws1843.generated.Service; - -/** - * Test service implementation - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 10, 2007 - */ -@WebService -( - name="Service", - portName="Service", - serviceName="Service", - wsdlLocation="WEB-INF/wsdl/TestService.wsdl", - targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", - endpointInterface = "org.jboss.test.ws.jaxws.jbws1843.generated.Service" -) -public class ServiceImpl implements Service -{ - - /* - * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCountryCodes() - */ - public Response getCountryCodes() - { - Response response = new Response(); - List<CountryCodeType> values = response.getCountry(); - values.add(CountryCodeType.CZ); - values.add(CountryCodeType.DE); - return response; - } - - /* - * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCurrency(org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType) - */ - public CurrencyCodeType getCurrency(CountryCodeType parameters) - { - if (parameters == CountryCodeType.CZ) - return CurrencyCodeType.CZK; - if (parameters == CountryCodeType.DE) - return CurrencyCodeType.EUR; - - throw new IllegalArgumentException(); - } - - /* - * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCurrencyCodes() - */ - public org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response getCurrencyCodes() - { - org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response response = - new org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response(); - List<CurrencyCodeType> values = response.getCurrency(); - values.add(CurrencyCodeType.CZK); - values.add(CurrencyCodeType.EUR); - return response; - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1843; + +import java.util.List; + +import javax.jws.WebService; + +import org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType; +import org.jboss.test.ws.jaxws.jbws1843.generated.CurrencyCodeType; +import org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response; +import org.jboss.test.ws.jaxws.jbws1843.generated.Service; + +/** + * Test service implementation + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 10, 2007 + */ +@WebService +( + name="Service", + portName="Service", + serviceName="Service", + wsdlLocation="WEB-INF/wsdl/TestService.wsdl", + targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", + endpointInterface = "org.jboss.test.ws.jaxws.jbws1843.generated.Service" +) +public class ServiceImpl implements Service +{ + + /* + * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCountryCodes() + */ + public Response getCountryCodes() + { + Response response = new Response(); + List<CountryCodeType> values = response.getCountry(); + values.add(CountryCodeType.CZ); + values.add(CountryCodeType.DE); + return response; + } + + /* + * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCurrency(org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType) + */ + public CurrencyCodeType getCurrency(CountryCodeType parameters) + { + if (parameters == CountryCodeType.CZ) + return CurrencyCodeType.CZK; + if (parameters == CountryCodeType.DE) + return CurrencyCodeType.EUR; + + throw new IllegalArgumentException(); + } + + /* + * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCurrencyCodes() + */ + public org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response getCurrencyCodes() + { + org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response response = + new org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response(); + List<CurrencyCodeType> values = response.getCurrency(); + values.add(CurrencyCodeType.CZK); + values.add(CurrencyCodeType.EUR); + return response; + } + +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1845; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1854] Use of @ResponseWrapper annotation cause generation of incorrect wsdl upon deployment - * - * @author richard.opalka(a)jboss.com - * - * @since Jan 9, 2008 - */ -public final class JBWS1845TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1845TestCase.class, "jaxws-jbws1845.jar"); - } - - public void testIssue() throws Exception - { - QName serviceName = new QName("http://service.responsys.com/rsystools/ws/SpamComplaintWS/1.0", "SpamService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1845/SpamService?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - SpamComplaintWSIface proxy = (SpamComplaintWSIface)service.getPort(SpamComplaintWSIface.class); - - String[] orig = { "email", "fromAddress", "mailDate", "complaintDate", "mailbox", "complainer", "xRext", "accountName"}; - String[] returned = proxy.processSpamComplaints(orig[0], orig[1], orig[2], orig[3], orig[4], orig[5], orig[6], orig[7]).get(); - for (int i = 0; i < orig.length; i++) - { - assertEquals(orig[i], returned[i]); - } - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/JBWS1845TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1845; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1854] Use of @ResponseWrapper annotation cause generation of incorrect wsdl upon deployment + * + * @author richard.opalka(a)jboss.com + * + * @since Jan 9, 2008 + */ +public final class JBWS1845TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1845TestCase.class, "jaxws-jbws1845.jar"); + } + + public void testIssue() throws Exception + { + QName serviceName = new QName("http://service.responsys.com/rsystools/ws/SpamComplaintWS/1.0", "SpamService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1845/SpamService?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + SpamComplaintWSIface proxy = (SpamComplaintWSIface)service.getPort(SpamComplaintWSIface.class); + + String[] orig = { "email", "fromAddress", "mailDate", "complaintDate", "mailbox", "complainer", "xRext", "accountName"}; + String[] returned = proxy.processSpamComplaints(orig[0], orig[1], orig[2], orig[3], orig[4], orig[5], orig[6], orig[7]).get(); + for (int i = 0; i < orig.length; i++) + { + assertEquals(orig[i], returned[i]); + } + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1845; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.xml.ws.ResponseWrapper; - -import org.jboss.wsf.spi.annotation.WebContext; - -/** - * Webservice impl - * - * @author richard.opalka(a)jboss.com - * - * @since Jan 9, 2008 - */ -@Stateless -@WebService -( - targetNamespace="http://service.responsys.com/rsystools/ws/SpamComplaintWS/1.0", - serviceName="SpamService" -) -@WebContext -( - transportGuarantee="NONE", - contextRoot="/jaxws-jbws1845", - urlPattern="/SpamService" -) -public final class SpamComplaintWS implements SpamComplaintWSIface -{ - @WebMethod(operationName="processSpamComplaints") - @WebResult(name="SpamResult") - @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1845.jaxws.SpamResult") - public SpamResult processSpamComplaints( - @WebParam(name = "email") String email, - @WebParam(name = "fromAddress") String fromAddress, - @WebParam(name = "mailDate") String mailDate, - @WebParam(name = "complaintDate") String complaintDate, - @WebParam(name = "mailbox") String mailbox, - @WebParam(name = "complainer") String complainer, - @WebParam(name = "xRext") String xRext, - @WebParam(name = "accountName") String accountName) - { - return new SpamResult(email, fromAddress, mailDate, complaintDate, mailbox, complainer, xRext, accountName); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWS.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1845; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.ResponseWrapper; + +import org.jboss.wsf.spi.annotation.WebContext; + +/** + * Webservice impl + * + * @author richard.opalka(a)jboss.com + * + * @since Jan 9, 2008 + */ +@Stateless +@WebService +( + targetNamespace="http://service.responsys.com/rsystools/ws/SpamComplaintWS/1.0", + serviceName="SpamService" +) +@WebContext +( + transportGuarantee="NONE", + contextRoot="/jaxws-jbws1845", + urlPattern="/SpamService" +) +public final class SpamComplaintWS implements SpamComplaintWSIface +{ + @WebMethod(operationName="processSpamComplaints") + @WebResult(name="SpamResult") + @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1845.jaxws.SpamResult") + public SpamResult processSpamComplaints( + @WebParam(name = "email") String email, + @WebParam(name = "fromAddress") String fromAddress, + @WebParam(name = "mailDate") String mailDate, + @WebParam(name = "complaintDate") String complaintDate, + @WebParam(name = "mailbox") String mailbox, + @WebParam(name = "complainer") String complainer, + @WebParam(name = "xRext") String xRext, + @WebParam(name = "accountName") String accountName) + { + return new SpamResult(email, fromAddress, mailDate, complaintDate, mailbox, complainer, xRext, accountName); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1845; - -import javax.ejb.Remote; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.xml.ws.ResponseWrapper; - -/** - * Webservice iface - * - * @author richard.opalka(a)jboss.com - * - * @since Jan 9, 2008 - */ -@Remote -@WebService -public interface SpamComplaintWSIface -{ - @WebMethod(operationName="processSpamComplaints") - @WebResult(name="SpamResult") - @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1845.jaxws.SpamResult") - public SpamResult processSpamComplaints( - @WebParam(name = "email") String email, - @WebParam(name = "fromAddress") String fromAddress, - @WebParam(name = "mailDate") String mailDate, - @WebParam(name = "complaintDate") String complaintDate, - @WebParam(name = "mailbox") String mailbox, - @WebParam(name = "complainer") String complainer, - @WebParam(name = "xRext") String xRext, - @WebParam(name = "accountName") String accountName - ); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamComplaintWSIface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1845; + +import javax.ejb.Remote; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.ResponseWrapper; + +/** + * Webservice iface + * + * @author richard.opalka(a)jboss.com + * + * @since Jan 9, 2008 + */ +@Remote +@WebService +public interface SpamComplaintWSIface +{ + @WebMethod(operationName="processSpamComplaints") + @WebResult(name="SpamResult") + @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1845.jaxws.SpamResult") + public SpamResult processSpamComplaints( + @WebParam(name = "email") String email, + @WebParam(name = "fromAddress") String fromAddress, + @WebParam(name = "mailDate") String mailDate, + @WebParam(name = "complaintDate") String complaintDate, + @WebParam(name = "mailbox") String mailbox, + @WebParam(name = "complainer") String complainer, + @WebParam(name = "xRext") String xRext, + @WebParam(name = "accountName") String accountName + ); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1845; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -/** - * Custom response object - * - * @author richard.opalka(a)jboss.com - * - * @since Jan 9, 2008 - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SpamResult", propOrder = { - "email", - "fromAddress", - "mailDate", - "complaintDate", - "mailbox", - "complainer", - "xRext", - "accountName" -}) -public final class SpamResult -{ - @XmlElement(required = true, nillable = true) - protected String email; - @XmlElement(required = true, nillable = true) - protected String fromAddress; - @XmlElement(required = true, nillable = true) - protected String mailDate; - @XmlElement(required = true, nillable = true) - protected String complaintDate; - @XmlElement(required = true, nillable = true) - protected String mailbox; - @XmlElement(required = true, nillable = true) - protected String complainer; - @XmlElement(required = true, nillable = true) - protected String xRext; - @XmlElement(required = true, nillable = true) - protected String accountName; - - public SpamResult() - { - } - - public SpamResult(String email, String fromAddress, String mailDate, String complaintDate, String mailbox, String complainer, String xRext, String accountName) - { - this.email = email; - this.fromAddress = fromAddress; - this.mailDate = mailDate; - this.complaintDate = complaintDate; - this.mailbox = mailbox; - this.complainer = complainer; - this.xRext = xRext; - this.accountName = accountName; - } - - public String[] get() - { - return new String[] { email, fromAddress, mailDate, complaintDate, mailbox, complainer, xRext, accountName }; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1845/SpamResult.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1845; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + * Custom response object + * + * @author richard.opalka(a)jboss.com + * + * @since Jan 9, 2008 + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SpamResult", propOrder = { + "email", + "fromAddress", + "mailDate", + "complaintDate", + "mailbox", + "complainer", + "xRext", + "accountName" +}) +public final class SpamResult +{ + @XmlElement(required = true, nillable = true) + protected String email; + @XmlElement(required = true, nillable = true) + protected String fromAddress; + @XmlElement(required = true, nillable = true) + protected String mailDate; + @XmlElement(required = true, nillable = true) + protected String complaintDate; + @XmlElement(required = true, nillable = true) + protected String mailbox; + @XmlElement(required = true, nillable = true) + protected String complainer; + @XmlElement(required = true, nillable = true) + protected String xRext; + @XmlElement(required = true, nillable = true) + protected String accountName; + + public SpamResult() + { + } + + public SpamResult(String email, String fromAddress, String mailDate, String complaintDate, String mailbox, String complainer, String xRext, String accountName) + { + this.email = email; + this.fromAddress = fromAddress; + this.mailDate = mailDate; + this.complaintDate = complaintDate; + this.mailbox = mailbox; + this.complainer = complainer; + this.xRext = xRext; + this.accountName = accountName; + } + + public String[] get() + { + return new String[] { email, fromAddress, mailDate, complaintDate, mailbox, complainer, xRext, accountName }; + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,59 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1854; - -import java.net.URL; - -import javax.jws.WebService; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1854] Cannot deploy nested JSE endpoint in SAR - * - * http://jira.jboss.org/jira/browse/JBWS-1854 - * - * @author Thomas.Diesler(a)jboss.com - * @since 13-Oct-2007 - */ -public class JBWS1854TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1854TestCase.class, "jaxws-jbws1854.sar"); - } - - public void testPortAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1854?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1854", "TestEndpointService" ); - Service service = Service.create(wsdlURL, serviceName); - TestEndpoint port = service.getPort(TestEndpoint.class); - String retStr = port.echo("hello"); - assertEquals("hello", retStr); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/JBWS1854TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1854; + +import java.net.URL; + +import javax.jws.WebService; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1854] Cannot deploy nested JSE endpoint in SAR + * + * http://jira.jboss.org/jira/browse/JBWS-1854 + * + * @author Thomas.Diesler(a)jboss.com + * @since 13-Oct-2007 + */ +public class JBWS1854TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1854TestCase.class, "jaxws-jbws1854.sar"); + } + + public void testPortAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1854?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1854", "TestEndpointService" ); + Service service = Service.create(wsdlURL, serviceName); + TestEndpoint port = service.getPort(TestEndpoint.class); + String retStr = port.echo("hello"); + assertEquals("hello", retStr); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1854; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1854") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint -{ - String echo(String input); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1854; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1854") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint +{ + String echo(String input); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1854; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1854") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class TestEndpointImpl -{ - @WebMethod - public String echo(String input) - { - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1854; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1854") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class TestEndpointImpl +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1872; - -import javax.jws.WebMethod; -import javax.jws.WebService; - -/** - * Interface used on client side - * - * @author richard.opalka(a)jboss.com - */ -@WebService -public interface ClientIface -{ - @WebMethod - String echo(String msg); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1872; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +/** + * Interface used on client side + * + * @author richard.opalka(a)jboss.com + */ +@WebService +public interface ClientIface +{ + @WebMethod + String echo(String msg); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1872; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.ejb.Stateless; -import javax.ejb.Local; -import javax.ejb.Remote; - -/** - * EJB3 bean implementing both Local and Remote interfaces - * - * @author richard.opalka(a)jboss.com - */ -@WebService(name = "Bean1", targetNamespace = "http://org.jboss.ws/jbws1872") -@Stateless -(a)Remote(RemoteIface.class) -(a)Local(LocalIface.class) -public final class EJB3Bean1 implements RemoteIface, LocalIface -{ - - @WebMethod - public String echo(String msg) - { - return "bean1-" + msg; - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1872; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.ejb.Stateless; +import javax.ejb.Local; +import javax.ejb.Remote; + +/** + * EJB3 bean implementing both Local and Remote interfaces + * + * @author richard.opalka(a)jboss.com + */ +@WebService(name = "Bean1", targetNamespace = "http://org.jboss.ws/jbws1872") +@Stateless +(a)Remote(RemoteIface.class) +(a)Local(LocalIface.class) +public final class EJB3Bean1 implements RemoteIface, LocalIface +{ + + @WebMethod + public String echo(String msg) + { + return "bean1-" + msg; + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1872; - -import javax.ejb.Local; -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; - -/** - * EJB3 bean implementing local interface only - * - * @author richard.opalka(a)jboss.com - */ -@WebService(name = "Bean2", targetNamespace = "http://org.jboss.ws/jbws1872") -@Stateless -(a)Local(LocalIface.class) -public final class EJB3Bean2 implements LocalIface -{ - - @WebMethod - public String echo(String msg) - { - return "bean2-" + msg; - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1872; + +import javax.ejb.Local; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; + +/** + * EJB3 bean implementing local interface only + * + * @author richard.opalka(a)jboss.com + */ +@WebService(name = "Bean2", targetNamespace = "http://org.jboss.ws/jbws1872") +@Stateless +(a)Local(LocalIface.class) +public final class EJB3Bean2 implements LocalIface +{ + + @WebMethod + public String echo(String msg) + { + return "bean2-" + msg; + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1872; - -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; - -/** - * EJB3 bean implementing remote interface only - * - * @author richard.opalka(a)jboss.com - */ -@WebService(name = "Bean3", targetNamespace = "http://org.jboss.ws/jbws1872") -@Stateless -(a)Remote(RemoteIface.class) -public final class EJB3Bean3 implements RemoteIface -{ - - @WebMethod - public String echo(String msg) - { - return "bean3-" + msg; - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1872; + +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; + +/** + * EJB3 bean implementing remote interface only + * + * @author richard.opalka(a)jboss.com + */ +@WebService(name = "Bean3", targetNamespace = "http://org.jboss.ws/jbws1872") +@Stateless +(a)Remote(RemoteIface.class) +public final class EJB3Bean3 implements RemoteIface +{ + + @WebMethod + public String echo(String msg) + { + return "bean3-" + msg; + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1872; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1872] EJB3 WebService implementation must have @Remote (instead of @Local) Business interface - * - * @author richard.opalka(a)jboss.com - */ -public class JBWS1872TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1872TestCase.class, "jaxws-jbws1872.jar"); - } - - public void testEJB1() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1872/EJB3Bean1?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1872", "EJB3Bean1Service"); - Service service = Service.create(wsdlURL, serviceName); - ClientIface port = service.getPort(ClientIface.class); - String retStr = port.echo("hello"); - assertEquals("bean1-hello", retStr); - } - - public void testEJB2() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1872/EJB3Bean2?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1872", "EJB3Bean2Service"); - Service service = Service.create(wsdlURL, serviceName); - ClientIface port = service.getPort(ClientIface.class); - String retStr = port.echo("hello"); - assertEquals("bean2-hello", retStr); - } - - public void testEJB3() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1872/EJB3Bean3?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1872", "EJB3Bean3Service"); - Service service = Service.create(wsdlURL, serviceName); - ClientIface port = service.getPort(ClientIface.class); - String retStr = port.echo("hello"); - assertEquals("bean3-hello", retStr); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1872; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1872] EJB3 WebService implementation must have @Remote (instead of @Local) Business interface + * + * @author richard.opalka(a)jboss.com + */ +public class JBWS1872TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1872TestCase.class, "jaxws-jbws1872.jar"); + } + + public void testEJB1() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1872/EJB3Bean1?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1872", "EJB3Bean1Service"); + Service service = Service.create(wsdlURL, serviceName); + ClientIface port = service.getPort(ClientIface.class); + String retStr = port.echo("hello"); + assertEquals("bean1-hello", retStr); + } + + public void testEJB2() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1872/EJB3Bean2?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1872", "EJB3Bean2Service"); + Service service = Service.create(wsdlURL, serviceName); + ClientIface port = service.getPort(ClientIface.class); + String retStr = port.echo("hello"); + assertEquals("bean2-hello", retStr); + } + + public void testEJB3() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1872/EJB3Bean3?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1872", "EJB3Bean3Service"); + Service service = Service.create(wsdlURL, serviceName); + ClientIface port = service.getPort(ClientIface.class); + String retStr = port.echo("hello"); + assertEquals("bean3-hello", retStr); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1872; - -/** - * EJB3 local interface - * - * @author richard.opalka(a)jboss.com - */ -public interface LocalIface -{ - String echo(String msg); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1872; + +/** + * EJB3 local interface + * + * @author richard.opalka(a)jboss.com + */ +public interface LocalIface +{ + String echo(String msg); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1872; - -/** - * EJB3 remote interface - * - * @author richard.opalka(a)jboss.com - */ -public interface RemoteIface -{ - String echo(String msg); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1872; + +/** + * EJB3 remote interface + * + * @author richard.opalka(a)jboss.com + */ +public interface RemoteIface +{ + String echo(String msg); +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1904; - -import java.net.URL; - -import junit.framework.Test; - -import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1904] Explicitly set the namespace of a WebFault - * - * http://jira.jboss.org/jira/browse/JBWS-1904 - * - * @author alessio.soldano(a)jboss.com - * @since 13-Dec-2007 - */ -public class JBWS1904TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1904TestCase.class, "jaxws-jbws1904.jar"); - } - - public void testWSDLSchema() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1904?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - JBossXSModel xsModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); - XSTypeDefinition typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904/exceptions"); - assertNotNull(typeDefinition); - typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904"); - assertNull(typeDefinition); - typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904/faults"); - assertNull(typeDefinition); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1904; + +import java.net.URL; + +import junit.framework.Test; + +import org.apache.xerces.xs.XSTypeDefinition; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLUtils; +import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1904] Explicitly set the namespace of a WebFault + * + * http://jira.jboss.org/jira/browse/JBWS-1904 + * + * @author alessio.soldano(a)jboss.com + * @since 13-Dec-2007 + */ +public class JBWS1904TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1904TestCase.class, "jaxws-jbws1904.jar"); + } + + public void testWSDLSchema() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1904?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + JBossXSModel xsModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); + XSTypeDefinition typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904/exceptions"); + assertNotNull(typeDefinition); + typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904"); + assertNull(typeDefinition); + typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904/faults"); + assertNull(typeDefinition); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1904; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1904") -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -public interface TestEndpoint -{ - String echo(String input) throws TestException; -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1904; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1904") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) +public interface TestEndpoint +{ + String echo(String input) throws TestException; +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1904; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.wsf.spi.annotation.WebContext; - -@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1904") -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -@Stateless -@WebContext(contextRoot="jaxws-jbws1904", urlPattern="/*") -public class TestEndpointImpl implements TestEndpoint -{ - @WebMethod - public String echo(String input) throws TestException - { - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1904; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.wsf.spi.annotation.WebContext; + +@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1904") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) +@Stateless +@WebContext(contextRoot="jaxws-jbws1904", urlPattern="/*") +public class TestEndpointImpl implements TestEndpoint +{ + @WebMethod + public String echo(String input) throws TestException + { + return input; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,21 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws1904; - -import javax.xml.bind.annotation.XmlType; -import javax.xml.ws.WebFault; - -@WebFault(name="TestExceptionFault", targetNamespace="http://org.jboss.ws/jbws1904/faults") -@XmlType(name = "TestException", namespace = "http://org.jboss.ws/jbws1904/exceptions", propOrder = {"message"}) -public class TestException extends Exception -{ - private String message; - - public String getMessage() - { - return message; - } - - public void setMessage(String message) - { - this.message = message; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,21 @@ +package org.jboss.test.ws.jaxws.jbws1904; + +import javax.xml.bind.annotation.XmlType; +import javax.xml.ws.WebFault; + +@WebFault(name="TestExceptionFault", targetNamespace="http://org.jboss.ws/jbws1904/faults") +@XmlType(name = "TestException", namespace = "http://org.jboss.ws/jbws1904/exceptions", propOrder = {"message"}) +public class TestException extends Exception +{ + private String message; + + public String getMessage() + { + return message; + } + + public void setMessage(String message) + { + this.message = message; + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,58 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1909; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1909] RequestHandler.handlerWSDLResquest has dependency on Servlet API - * - * http://jira.jboss.org/jira/browse/JBWS-1909 - * - * @author Thomas.Diesler(a)jboss.com - * @since 25-Feb-2007 - */ -public class JBWS1909TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1909TestCase.class, "jaxws-jbws1909.jar"); - } - - public void testWSDLSchema() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1909/TestEndpointImpl?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jbws1909", "TestEndpointService"); - Service service = Service.create(wsdlURL, serviceName); - TestEndpoint port = service.getPort(TestEndpoint.class); - String retStr = port.echo("hello"); - assertEquals("hello|TestEndpointService", retStr); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1909; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1909] RequestHandler.handlerWSDLResquest has dependency on Servlet API + * + * http://jira.jboss.org/jira/browse/JBWS-1909 + * + * @author Thomas.Diesler(a)jboss.com + * @since 25-Feb-2007 + */ +public class JBWS1909TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1909TestCase.class, "jaxws-jbws1909.jar"); + } + + public void testWSDLSchema() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1909/TestEndpointImpl?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jbws1909", "TestEndpointService"); + Service service = Service.create(wsdlURL, serviceName); + TestEndpoint port = service.getPort(TestEndpoint.class); + String retStr = port.echo("hello"); + assertEquals("hello|TestEndpointService", retStr); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1909; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1909") -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -public interface TestEndpoint -{ - String echo(String input); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1909; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1909") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) +public interface TestEndpoint +{ + String echo(String input); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,98 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1909; - -// $Id$ - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; - -import javax.annotation.Resource; -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.management.ObjectName; -import javax.xml.namespace.QName; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; - -import org.jboss.logging.Logger; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.common.ObjectNameFactory; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.w3c.dom.Element; - -@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1909") -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -@Stateless -public class TestEndpointImpl implements TestEndpoint -{ - // provide logging - private final static Logger log = Logger.getLogger(TestEndpointImpl.class); - - @Resource - WebServiceContext context; - - @WebMethod - public String echo(String input) - { - MessageContext msgContext = context.getMessageContext(); - for (String key : msgContext.keySet()) - { - log.info(key + "=" + msgContext.get(key)); - } - - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - EndpointRegistry registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - - ObjectName oname = ObjectNameFactory.create("jboss.ws:context=jaxws-jbws1909,endpoint=TestEndpointImpl"); - Endpoint endpoint = registry.getEndpoint(oname); - RequestHandler reqHandler = endpoint.getRequestHandler(); - - try - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - reqHandler.handleWSDLRequest(endpoint, baos, null); // The context is null - - ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - Element root = DOMUtils.parse(bais); - Element serviceEl = DOMUtils.getFirstChildElement(root, new QName("http://schemas.xmlsoap.org/wsdl/", "service")); - String serviceName = DOMUtils.getAttributeValue(serviceEl, "name"); - - input += "|" + serviceName; - } - catch (IOException ex) - { - throw new RuntimeException(ex); - } - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,98 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1909; + +// $Id$ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +import javax.annotation.Resource; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.management.ObjectName; +import javax.xml.namespace.QName; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.logging.Logger; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.w3c.dom.Element; + +@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1909") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) +@Stateless +public class TestEndpointImpl implements TestEndpoint +{ + // provide logging + private final static Logger log = Logger.getLogger(TestEndpointImpl.class); + + @Resource + WebServiceContext context; + + @WebMethod + public String echo(String input) + { + MessageContext msgContext = context.getMessageContext(); + for (String key : msgContext.keySet()) + { + log.info(key + "=" + msgContext.get(key)); + } + + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + EndpointRegistry registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); + + ObjectName oname = ObjectNameFactory.create("jboss.ws:context=jaxws-jbws1909,endpoint=TestEndpointImpl"); + Endpoint endpoint = registry.getEndpoint(oname); + RequestHandler reqHandler = endpoint.getRequestHandler(); + + try + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + reqHandler.handleWSDLRequest(endpoint, baos, null); // The context is null + + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + Element root = DOMUtils.parse(bais); + Element serviceEl = DOMUtils.getFirstChildElement(root, new QName("http://schemas.xmlsoap.org/wsdl/", "service")); + String serviceName = DOMUtils.getAttributeValue(serviceEl, "name"); + + input += "|" + serviceName; + } + catch (IOException ex) + { + throw new RuntimeException(ex); + } + return input; + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1969; - -import java.net.URL; - -import junit.framework.Test; - -import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Testcase for load/import of resources under nested directory - * other than toplevel "META-INF/wsdl" directory - * - * http://jira.jboss.org/jira/browse/JBWS-1969 - * - * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> - * @since 21-Feb-2008 - */ -public class JBWS1969TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1969TestCase.class, "jaxws-jbws1969.jar"); - } - - public void testSubDirectory() throws Exception - { - //wsdl and schema loaded from META-INF/wsdl/echo - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1969?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1969; + +import java.net.URL; + +import junit.framework.Test; + +import org.apache.xerces.xs.XSTypeDefinition; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLUtils; +import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Testcase for load/import of resources under nested directory + * other than toplevel "META-INF/wsdl" directory + * + * http://jira.jboss.org/jira/browse/JBWS-1969 + * + * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> + * @since 21-Feb-2008 + */ +public class JBWS1969TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1969TestCase.class, "jaxws-jbws1969.jar"); + } + + public void testSubDirectory() throws Exception + { + //wsdl and schema loaded from META-INF/wsdl/echo + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1969?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1969; - -import javax.jws.WebService; - -/** - * The SEI - * - * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> - * @since 21-Feb-2008 - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1969") -public interface TestEndpoint -{ - String echo(String input); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1969; + +import javax.jws.WebService; + +/** + * The SEI + * + * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> + * @since 21-Feb-2008 + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1969") +public interface TestEndpoint +{ + String echo(String input); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws1969; - -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.wsf.spi.annotation.WebContext; - -/** - * The SEI implementation used by the JBWS1969TestCase - * - * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> - * @since 21-Feb-2008 - */ -@WebService(serviceName = "TestEndpointService", - name = "TestEndpoint", - targetNamespace = "http://org.jboss.ws/jbws1969", - wsdlLocation = "/META-INF/wsdl/echo/TestService.wsdl") -@Stateless -@WebContext(contextRoot="jaxws-jbws1969", urlPattern="/*") -public class TestEndpointImpl implements TestEndpoint -{ - @WebMethod - public String echo(String input) - { - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1969/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws1969; + +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.wsf.spi.annotation.WebContext; + +/** + * The SEI implementation used by the JBWS1969TestCase + * + * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar B</a> + * @since 21-Feb-2008 + */ +@WebService(serviceName = "TestEndpointService", + name = "TestEndpoint", + targetNamespace = "http://org.jboss.ws/jbws1969", + wsdlLocation = "/META-INF/wsdl/echo/TestService.wsdl") +@Stateless +@WebContext(contextRoot="jaxws-jbws1969", urlPattern="/*") +public class TestEndpointImpl implements TestEndpoint +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,19 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws2000; - - -import javax.activation.DataHandler; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.xml.ws.BindingType; -import javax.xml.bind.annotation.XmlMimeType; - -@WebService(name = "FileTransferService", targetNamespace = "http://service.mtom.test.net/") -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) -@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") -public interface FileTransferService -{ - @WebMethod - boolean transferFile(String fileName, @XmlMimeType("application/octet-stream") DataHandler contents); - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,19 @@ +package org.jboss.test.ws.jaxws.jbws2000; + + +import javax.activation.DataHandler; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.ws.BindingType; +import javax.xml.bind.annotation.XmlMimeType; + +@WebService(name = "FileTransferService", targetNamespace = "http://service.mtom.test.net/") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) +@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") +public interface FileTransferService +{ + @WebMethod + boolean transferFile(String fileName, @XmlMimeType("application/octet-stream") DataHandler contents); + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,50 +0,0 @@ -package org.jboss.test.ws.jaxws.jbws2000; - -import java.io.File; -import java.io.FileOutputStream; -import java.util.ArrayList; -import java.util.List; - -import javax.activation.DataHandler; -import javax.ejb.Stateless; -import javax.jws.WebService; - -@Stateless -@WebService( - endpointInterface = "org.jboss.test.ws.jaxws.jbws2000.FileTransferService", - name = "FileTransfer", - targetNamespace = "http://service.mtom.test.net/" -) -public class FileTransferServiceImpl implements FileTransferService { - - public boolean transferFile(String fileName, DataHandler contents) { - final List<File> tempFiles = new ArrayList<File>(); - final File deploymentTempDirectory = getTempDirectory(); - try { - FileOutputStream fileOutputStream = null; - try { - final File outputFile = new File(deploymentTempDirectory, fileName); - - System.out.println("Write file '"+fileName+"' to dir " + deploymentTempDirectory); - - fileOutputStream = new FileOutputStream(outputFile); - contents.writeTo(fileOutputStream); - tempFiles.add(outputFile); - } finally { - if (fileOutputStream != null) { - fileOutputStream.close(); - } - } - - return true; - } catch (Exception e) { - throw new RuntimeException("Failed to schedule deployment", e); - } - } - - private File getTempDirectory() { - final File deploymentTempDirectory = new File(System.getProperty("java.io.tmpdir"), Long.toString(System.currentTimeMillis())); - deploymentTempDirectory.mkdir(); - return deploymentTempDirectory; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/FileTransferServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,50 @@ +package org.jboss.test.ws.jaxws.jbws2000; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.ArrayList; +import java.util.List; + +import javax.activation.DataHandler; +import javax.ejb.Stateless; +import javax.jws.WebService; + +@Stateless +@WebService( + endpointInterface = "org.jboss.test.ws.jaxws.jbws2000.FileTransferService", + name = "FileTransfer", + targetNamespace = "http://service.mtom.test.net/" +) +public class FileTransferServiceImpl implements FileTransferService { + + public boolean transferFile(String fileName, DataHandler contents) { + final List<File> tempFiles = new ArrayList<File>(); + final File deploymentTempDirectory = getTempDirectory(); + try { + FileOutputStream fileOutputStream = null; + try { + final File outputFile = new File(deploymentTempDirectory, fileName); + + System.out.println("Write file '"+fileName+"' to dir " + deploymentTempDirectory); + + fileOutputStream = new FileOutputStream(outputFile); + contents.writeTo(fileOutputStream); + tempFiles.add(outputFile); + } finally { + if (fileOutputStream != null) { + fileOutputStream.close(); + } + } + + return true; + } catch (Exception e) { + throw new RuntimeException("Failed to schedule deployment", e); + } + } + + private File getTempDirectory() { + final File deploymentTempDirectory = new File(System.getProperty("java.io.tmpdir"), Long.toString(System.currentTimeMillis())); + deploymentTempDirectory.mkdir(); + return deploymentTempDirectory; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws2000; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.soap.SOAPBinding; -import javax.activation.DataHandler; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.test.ws.jaxws.samples.xop.doclit.GeneratorDataSource; - -/** - * - */ -public class JBWS2000TestCase extends JBossWSTest -{ - - private static FileTransferService port; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS2000TestCase.class, "jaxws-jbws2000.jar"); - } - - protected void setUp() throws Exception - { - if (port == null) - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2000/FileTransferServiceImpl?wsdl"); - QName serviceName = new QName("http://service.mtom.test.net/", "FileTransferServiceImplService"); - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(FileTransferService.class); - - SOAPBinding binding = (SOAPBinding)((BindingProvider)port).getBinding(); - binding.setMTOMEnabled(true); - } - } - - public void testFileTransfer() throws Exception - { - GeneratorDataSource source = new GeneratorDataSource(1024 * 1204 * 150); - DataHandler dh = new DataHandler(source); - - boolean success = port.transferFile("JBWS2000.data", dh); - assertTrue("Failed to transfer file", success); - } - -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2000; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.soap.SOAPBinding; +import javax.activation.DataHandler; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.test.ws.jaxws.samples.xop.doclit.GeneratorDataSource; + +/** + * + */ +public class JBWS2000TestCase extends JBossWSTest +{ + + private static FileTransferService port; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS2000TestCase.class, "jaxws-jbws2000.jar"); + } + + protected void setUp() throws Exception + { + if (port == null) + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2000/FileTransferServiceImpl?wsdl"); + QName serviceName = new QName("http://service.mtom.test.net/", "FileTransferServiceImplService"); + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(FileTransferService.class); + + SOAPBinding binding = (SOAPBinding)((BindingProvider)port).getBinding(); + binding.setMTOMEnabled(true); + } + } + + public void testFileTransfer() throws Exception + { + GeneratorDataSource source = new GeneratorDataSource(1024 * 1204 * 150); + DataHandler dh = new DataHandler(source); + + boolean success = port.transferFile("JBWS2000.data", dh); + assertTrue("Failed to transfer file", success); + } + +} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws2009; - -// $Id$ - -import java.net.URL; -import java.util.List; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.jaxws.jbws2009.generated.CountryCodeType; -import org.jboss.test.ws.jaxws.jbws2009.generated.CurrencyCodeType; -import org.jboss.test.ws.jaxws.jbws2009.generated.ServiceType; -import org.jboss.test.ws.jaxws.jbws2009.generated.GetCountryCodesResponse.Response; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-2009] JBossWS cannot find local schema with relative urls - * - * @author thomas.diesler(a)jboss.com - * @since 16-Oct-2007 - */ -public class JBWS2009TestCase extends JBossWSTest -{ - private String targetNS = "http://jbws2009.jaxws.ws.test.jboss.org/"; - private ServiceType proxy; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS2009TestCase.class, "jaxws-jbws2009.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2009/Service?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - proxy = service.getPort(ServiceType.class); - } - - public void testCountryCodes() throws Exception - { - Response response = proxy.getCountryCodes(); - List<CountryCodeType> countryCodes = response.getCountry(); - assertEquals(countryCodes.get(0), CountryCodeType.CZ); - assertEquals(countryCodes.get(1), CountryCodeType.DE); - } - - public void testCurrencyCodes() throws Exception - { - org.jboss.test.ws.jaxws.jbws2009.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes(); - List<CurrencyCodeType> currencyCodes = response.getCurrency(); - assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK); - assertEquals(currencyCodes.get(1), CurrencyCodeType.EUR); - } - - public void test() throws Exception - { - assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ)); - assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE)); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/JBWS2009TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,91 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2009; + +// $Id$ + +import java.net.URL; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxws.jbws2009.generated.CountryCodeType; +import org.jboss.test.ws.jaxws.jbws2009.generated.CurrencyCodeType; +import org.jboss.test.ws.jaxws.jbws2009.generated.ServiceType; +import org.jboss.test.ws.jaxws.jbws2009.generated.GetCountryCodesResponse.Response; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-2009] JBossWS cannot find local schema with relative urls + * + * @author thomas.diesler(a)jboss.com + * @since 16-Oct-2007 + */ +public class JBWS2009TestCase extends JBossWSTest +{ + private String targetNS = "http://jbws2009.jaxws.ws.test.jboss.org/"; + private ServiceType proxy; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS2009TestCase.class, "jaxws-jbws2009.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2009/Service?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + proxy = service.getPort(ServiceType.class); + } + + public void testCountryCodes() throws Exception + { + Response response = proxy.getCountryCodes(); + List<CountryCodeType> countryCodes = response.getCountry(); + assertEquals(countryCodes.get(0), CountryCodeType.CZ); + assertEquals(countryCodes.get(1), CountryCodeType.DE); + } + + public void testCurrencyCodes() throws Exception + { + org.jboss.test.ws.jaxws.jbws2009.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes(); + List<CurrencyCodeType> currencyCodes = response.getCurrency(); + assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK); + assertEquals(currencyCodes.get(1), CurrencyCodeType.EUR); + } + + public void test() throws Exception + { + assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ)); + assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE)); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws2009; - -// $Id$ - -import java.util.List; - -import javax.jws.WebService; - -import org.jboss.test.ws.jaxws.jbws2009.generated.CountryCodeType; -import org.jboss.test.ws.jaxws.jbws2009.generated.CurrencyCodeType; -import org.jboss.test.ws.jaxws.jbws2009.generated.GetCurrencyCodesResponse; -import org.jboss.test.ws.jaxws.jbws2009.generated.ServiceType; -import org.jboss.test.ws.jaxws.jbws2009.generated.GetCountryCodesResponse.Response; - -@WebService(portName = "ServicePort", serviceName = "Service", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl", targetNamespace = "http://jbws2009.jaxws.ws.test.jboss.org/", endpointInterface = "org.jboss.test.ws.jaxws.jbws2009.generated.ServiceType") -public class ServiceImpl implements ServiceType -{ - - public Response getCountryCodes() - { - Response response = new Response(); - List<CountryCodeType> values = response.getCountry(); - values.add(CountryCodeType.CZ); - values.add(CountryCodeType.DE); - return response; - } - - public CurrencyCodeType getCurrency(CountryCodeType parameters) - { - if (parameters == CountryCodeType.CZ) - return CurrencyCodeType.CZK; - if (parameters == CountryCodeType.DE) - return CurrencyCodeType.EUR; - - throw new IllegalArgumentException(); - } - - public GetCurrencyCodesResponse.Response getCurrencyCodes() - { - GetCurrencyCodesResponse.Response response = new GetCurrencyCodesResponse.Response(); - List<CurrencyCodeType> values = response.getCurrency(); - values.add(CurrencyCodeType.CZK); - values.add(CurrencyCodeType.EUR); - return response; - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/ServiceImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws2009; + +// $Id$ + +import java.util.List; + +import javax.jws.WebService; + +import org.jboss.test.ws.jaxws.jbws2009.generated.CountryCodeType; +import org.jboss.test.ws.jaxws.jbws2009.generated.CurrencyCodeType; +import org.jboss.test.ws.jaxws.jbws2009.generated.GetCurrencyCodesResponse; +import org.jboss.test.ws.jaxws.jbws2009.generated.ServiceType; +import org.jboss.test.ws.jaxws.jbws2009.generated.GetCountryCodesResponse.Response; + +@WebService(portName = "ServicePort", serviceName = "Service", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl", targetNamespace = "http://jbws2009.jaxws.ws.test.jboss.org/", endpointInterface = "org.jboss.test.ws.jaxws.jbws2009.generated.ServiceType") +public class ServiceImpl implements ServiceType +{ + + public Response getCountryCodes() + { + Response response = new Response(); + List<CountryCodeType> values = response.getCountry(); + values.add(CountryCodeType.CZ); + values.add(CountryCodeType.DE); + return response; + } + + public CurrencyCodeType getCurrency(CountryCodeType parameters) + { + if (parameters == CountryCodeType.CZ) + return CurrencyCodeType.CZK; + if (parameters == CountryCodeType.DE) + return CurrencyCodeType.EUR; + + throw new IllegalArgumentException(); + } + + public GetCurrencyCodesResponse.Response getCurrencyCodes() + { + GetCurrencyCodesResponse.Response response = new GetCurrencyCodesResponse.Response(); + List<CurrencyCodeType> values = response.getCurrency(); + values.add(CurrencyCodeType.CZK); + values.add(CurrencyCodeType.EUR); + return response; + } + +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/generated (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2009/generated) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws860; - -// $Id$ - -import javax.jws.WebMethod; -import javax.jws.WebService; - -import org.jboss.logging.Logger; - -/** - * @author mcantrell - */ -@WebService -public class InventoryWebService -{ - // Provide logging - private static Logger log = Logger.getLogger(InventoryWebService.class); - - @WebMethod - public String echo(String message) - { - log.info("echo:" + message); - return "Echo: " + message; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/InventoryWebService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws860; + +// $Id$ + +import javax.jws.WebMethod; +import javax.jws.WebService; + +import org.jboss.logging.Logger; + +/** + * @author mcantrell + */ +@WebService +public class InventoryWebService +{ + // Provide logging + private static Logger log = Logger.getLogger(InventoryWebService.class); + + @WebMethod + public String echo(String message) + { + log.info("echo:" + message); + return "Echo: " + message; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,66 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws860; - -// $Id$ - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -import junit.framework.Test; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Investigate "Is Not A Servlet" error with multiple servlets in the web.xml - * - * http://jira.jboss.com/jira/browse/JBWS-860 - * - * @author Thomas.Diesler(a)jboss.org - * @since 26-Apr-2006 - */ -public class JBWS860TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS860TestCase.class, "jaxws-jbws860.war"); - } - - public void testAccessInventoryServiceWsdl() throws Exception - { - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDef = factory.parse(new URL("http://" + getServerHost() + ":8080/test/InventoryWebService?wsdl")); - assertNotNull(wsdlDef); - } - - public void testServletAccess() throws Exception - { - HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/test/TestServlet").openConnection(); - BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); - assertEquals("Hello", isr.readLine()); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws860; + +// $Id$ + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; + +import junit.framework.Test; + +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Investigate "Is Not A Servlet" error with multiple servlets in the web.xml + * + * http://jira.jboss.com/jira/browse/JBWS-860 + * + * @author Thomas.Diesler(a)jboss.org + * @since 26-Apr-2006 + */ +public class JBWS860TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS860TestCase.class, "jaxws-jbws860.war"); + } + + public void testAccessInventoryServiceWsdl() throws Exception + { + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDef = factory.parse(new URL("http://" + getServerHost() + ":8080/test/InventoryWebService?wsdl")); + assertNotNull(wsdlDef); + } + + public void testServletAccess() throws Exception + { + HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/test/TestServlet").openConnection(); + BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); + assertEquals("Hello", isr.readLine()); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws860; - -// $Id$ - -import java.io.IOException; - -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.logging.Logger; - -/** - * @author mcantrell - */ -public class TestServlet extends HttpServlet -{ - // Provide logging - private static Logger log = Logger.getLogger(InventoryWebService.class); - - public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException - { - log.info("doGet"); - res.getWriter().println("Hello"); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws860/TestServlet.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws860; + +// $Id$ + +import java.io.IOException; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.jboss.logging.Logger; + +/** + * @author mcantrell + */ +public class TestServlet extends HttpServlet +{ + // Provide logging + private static Logger log = Logger.getLogger(InventoryWebService.class); + + public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException + { + log.info("doGet"); + res.getWriter().println("Hello"); + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws944; - -import javax.ejb.Remote; -import javax.ejb.RemoteHome; -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.wsf.spi.annotation.WebContext; - -@WebService(name = "EJB3Bean", serviceName = "EJB3BeanService", targetNamespace = "http://org.jboss.ws/jbws944") -@WebContext(contextRoot = "/jaxws-jbws944", urlPattern = "/FooBean01") -@SOAPBinding(style = SOAPBinding.Style.RPC) -(a)Remote({EJB3RemoteBusinessInterface.class,EJB3RemoteInterface.class}) -(a)RemoteHome(EJB3RemoteHome.class) -@Stateless(name = "FooBean01") -public class EJB3Bean01 implements EJB3RemoteBusinessInterface -{ - @WebMethod - public String echo(String input) - { - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws944; + +import javax.ejb.Remote; +import javax.ejb.RemoteHome; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.wsf.spi.annotation.WebContext; + +@WebService(name = "EJB3Bean", serviceName = "EJB3BeanService", targetNamespace = "http://org.jboss.ws/jbws944") +@WebContext(contextRoot = "/jaxws-jbws944", urlPattern = "/FooBean01") +@SOAPBinding(style = SOAPBinding.Style.RPC) +(a)Remote({EJB3RemoteBusinessInterface.class,EJB3RemoteInterface.class}) +(a)RemoteHome(EJB3RemoteHome.class) +@Stateless(name = "FooBean01") +public class EJB3Bean01 implements EJB3RemoteBusinessInterface +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws944; - -/** - * An EJB3 remote business interface - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2005 - */ -public interface EJB3RemoteBusinessInterface -{ - String echo(String input); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws944; + +/** + * An EJB3 remote business interface + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2005 + */ +public interface EJB3RemoteBusinessInterface +{ + String echo(String input); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws944; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -public interface EJB3RemoteHome extends EJBHome -{ - EJB3RemoteInterface create() throws RemoteException, CreateException; -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws944; + +import java.rmi.RemoteException; + +import javax.ejb.CreateException; +import javax.ejb.EJBHome; + +public interface EJB3RemoteHome extends EJBHome +{ + EJB3RemoteInterface create() throws RemoteException, CreateException; +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws944; - -import javax.ejb.EJBObject; - -/** - * EJB2.1 Remote Interface - * - * @author <mailto:andrew.rubinger@redhat.com>ALR</a> - * @version $Revision$ - */ -public interface EJB3RemoteInterface extends EJBObject -{ - String echo(String input); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws944; + +import javax.ejb.EJBObject; + +/** + * EJB2.1 Remote Interface + * + * @author <mailto:andrew.rubinger@redhat.com>ALR</a> + * @version $Revision$ + */ +public interface EJB3RemoteInterface extends EJBObject +{ + String echo(String input); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws944; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface EndpointInterface -{ - @WebMethod - String echo(String input); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws944; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface EndpointInterface +{ + @WebMethod + String echo(String input); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,107 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws944; - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * EJB3 jmx name is incorrectly derrived - * - * http://jira.jboss.org/jira/browse/JBWS-944 - * - * @author Thomas.Diesler(a)jboss.org - * @author Jason.Greene(a)jboss.com - * @since 29-Apr-2005 - */ -public class JBWS944TestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws944/FooBean01"; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS944TestCase.class, "jaxws-jbws944.jar"); - } - - public void testRemoteAccess() throws Exception - { - InitialContext iniCtx = getInitialContext(); - EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup("/FooBean01/remote"); - - String helloWorld = "Hello world!"; - Object retObj = ejb3Remote.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - // This tests whether the remote proxy also implements - // the home interface and that it can be narrowed to it. - public void testNarrowedRemoteAccess() throws Exception - { - if (true) - { - System.out.println("FIXME [JBCTS-540] EJB3 proxy does not implement the Home interface"); - return; - } - - InitialContext iniCtx = getInitialContext(); - Object obj = iniCtx.lookup("/FooBean01/remote"); - EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class); - EJB3RemoteInterface ejb3Remote = ejb3Home.create(); - - String helloWorld = "Hello world!"; - Object retObj = ejb3Remote.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testWebService() throws Exception - { - assertWSDLAccess(); - - String helloWorld = "Hello world!"; - QName serviceName = new QName("http://org.jboss.ws/jbws944", "EJB3BeanService"); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - Service service = Service.create(wsdlURL, serviceName); - EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); - String retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - private void assertWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,107 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws944; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.naming.InitialContext; +import javax.rmi.PortableRemoteObject; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * EJB3 jmx name is incorrectly derrived + * + * http://jira.jboss.org/jira/browse/JBWS-944 + * + * @author Thomas.Diesler(a)jboss.org + * @author Jason.Greene(a)jboss.com + * @since 29-Apr-2005 + */ +public class JBWS944TestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws944/FooBean01"; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS944TestCase.class, "jaxws-jbws944.jar"); + } + + public void testRemoteAccess() throws Exception + { + InitialContext iniCtx = getInitialContext(); + EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup("/FooBean01/remote"); + + String helloWorld = "Hello world!"; + Object retObj = ejb3Remote.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + // This tests whether the remote proxy also implements + // the home interface and that it can be narrowed to it. + public void testNarrowedRemoteAccess() throws Exception + { + if (true) + { + System.out.println("FIXME [JBCTS-540] EJB3 proxy does not implement the Home interface"); + return; + } + + InitialContext iniCtx = getInitialContext(); + Object obj = iniCtx.lookup("/FooBean01/remote"); + EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class); + EJB3RemoteInterface ejb3Remote = ejb3Home.create(); + + String helloWorld = "Hello world!"; + Object retObj = ejb3Remote.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testWebService() throws Exception + { + assertWSDLAccess(); + + String helloWorld = "Hello world!"; + QName serviceName = new QName("http://org.jboss.ws/jbws944", "EJB3BeanService"); + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); + String retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + private void assertWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981 (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws981; - -import javax.ejb.Stateless; -import javax.jws.WebService; -import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.ObjectName; - -import org.jboss.logging.Logger; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -@Stateless -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws981.EndpointInterface", targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981", serviceName = "TestService") -public class EJB3Bean implements EJB3RemoteInterface -{ - - private static final Logger log = Logger.getLogger(EJB3Bean.class); - - public String hello(final String message) - { - try - { - MBeanServer mbeanServer = (MBeanServer)MBeanServerFactory.findMBeanServer("jboss").get(0); - ObjectName on = new ObjectName("jboss.web:J2EEApplication=none,J2EEServer=none,WebModule=//www.jboss.org/..."); - mbeanServer.getMBeanInfo(on); - } - catch (Exception e) - { - log.error(e); - return "Unable to get WebModule MBean for virtual host - virtual-host not handled from @WebContext"; - } - - return message; - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws981; + +import javax.ejb.Stateless; +import javax.jws.WebService; +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; +import javax.management.ObjectName; + +import org.jboss.logging.Logger; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 2, 2006 + */ +@Stateless +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws981.EndpointInterface", targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981", serviceName = "TestService") +public class EJB3Bean implements EJB3RemoteInterface +{ + + private static final Logger log = Logger.getLogger(EJB3Bean.class); + + public String hello(final String message) + { + try + { + MBeanServer mbeanServer = (MBeanServer)MBeanServerFactory.findMBeanServer("jboss").get(0); + ObjectName on = new ObjectName("jboss.web:J2EEApplication=none,J2EEServer=none,WebModule=//www.jboss.org/..."); + mbeanServer.getMBeanInfo(on); + } + catch (Exception e) + { + log.error(e); + return "Unable to get WebModule MBean for virtual host - virtual-host not handled from @WebContext"; + } + + return message; + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws981; - - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -public interface EJB3RemoteInterface -{ - - public String hello(final String message); - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws981; + + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 2, 2006 + */ +public interface EJB3RemoteInterface +{ + + public String hello(final String message); + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,23 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Nov 02 21:17:37 CET 2006 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jaxws.jbws981; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.wsf.spi.annotation.WebContext; - -@WebService(targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981") -@SOAPBinding(style = SOAPBinding.Style.RPC) -@WebContext(virtualHosts = { "localhost", "www.jboss.org" }) -public interface EndpointInterface -{ - String hello(String msg); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,23 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Nov 02 21:17:37 CET 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jaxws.jbws981; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.wsf.spi.annotation.WebContext; + +@WebService(targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@WebContext(virtualHosts = { "localhost", "www.jboss.org" }) +public interface EndpointInterface +{ + String hello(String msg); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,72 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbws981; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-981] Virtual host configuration for EJB endpoints - * - * @author darran.lofthouse(a)jboss.com - * @since Nov 2, 2006 - */ -public class JBWS981TestCase extends JBossWSTest -{ - - private static EndpointInterface port; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS981TestCase.class, "jaxws-jbws981.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (true) return; - if (port == null) - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EJB3Bean?wsdl"); - QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981", "TestService"); - Service.create(wsdlURL, serviceName); - Service service = Service.create(wsdlURL, serviceName); - port = (EndpointInterface)service.getPort(EndpointInterface.class); - } - } - - public void testCall() throws Exception - { - System.out.println("FIXME [JBWS-981] Virtual host configuration for EJB endpoints"); - if (true) return; - - String message = "hello"; - assertEquals("Web service mapped to virtual host.", port.hello(message)); - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbws981; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-981] Virtual host configuration for EJB endpoints + * + * @author darran.lofthouse(a)jboss.com + * @since Nov 2, 2006 + */ +public class JBWS981TestCase extends JBossWSTest +{ + + private static EndpointInterface port; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS981TestCase.class, "jaxws-jbws981.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + if (true) return; + if (port == null) + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EJB3Bean?wsdl"); + QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981", "TestService"); + Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName); + port = (EndpointInterface)service.getPort(EndpointInterface.class); + } + } + + public void testCall() throws Exception + { + System.out.println("FIXME [JBWS-981] Virtual host configuration for EJB endpoints"); + if (true) return; + + String message = "hello"; + assertEquals("Web service mapped to virtual host.", port.hello(message)); + } +} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.namespace; - -import javax.annotation.Resource; -import javax.jws.WebService; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPException; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -import org.jboss.logging.Logger; -import org.jboss.wsf.common.DOMWriter; - -/** - * Test namespace differences at service and portType levels - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 - */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.namespace.EndpointInterface", targetNamespace = "http://example.org/impl") -public class EndpointBean implements EndpointInterface -{ - private static final Logger log = Logger.getLogger(EndpointBean.class); - - @Resource - WebServiceContext context; - - public String echo(String message) - { - log.info("echo:" + message); - - try - { - SOAPMessageContext msgContext = (SOAPMessageContext)context.getMessageContext(); - SOAPBody body = msgContext.getMessage().getSOAPBody(); - String bodyStr = DOMWriter.printNode(body, false); - if (bodyStr.indexOf("http://example.org/sei") < 0) - throw new WebServiceException("Invalid body: " + bodyStr); - } - catch (SOAPException ex) - { - throw new WebServiceException(ex); - } - - return message; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointBean.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.namespace; + +import javax.annotation.Resource; +import javax.jws.WebService; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPException; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; +import org.jboss.wsf.common.DOMWriter; + +/** + * Test namespace differences at service and portType levels + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Apr-2005 + */ +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.namespace.EndpointInterface", targetNamespace = "http://example.org/impl") +public class EndpointBean implements EndpointInterface +{ + private static final Logger log = Logger.getLogger(EndpointBean.class); + + @Resource + WebServiceContext context; + + public String echo(String message) + { + log.info("echo:" + message); + + try + { + SOAPMessageContext msgContext = (SOAPMessageContext)context.getMessageContext(); + SOAPBody body = msgContext.getMessage().getSOAPBody(); + String bodyStr = DOMWriter.printNode(body, false); + if (bodyStr.indexOf("http://example.org/sei") < 0) + throw new WebServiceException("Invalid body: " + bodyStr); + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + + return message; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.namespace; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * This interface is only uses a namespace different from the impl bean. - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 - */ -@WebService(targetNamespace = "http://example.org/sei") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface EndpointInterface -{ - @WebMethod - @WebResult(name = "return") - String echo(@WebParam(name = "message") String message); -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/EndpointInterface.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.namespace; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * This interface is only uses a namespace different from the impl bean. + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Apr-2005 + */ +@WebService(targetNamespace = "http://example.org/sei") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface EndpointInterface +{ + @WebMethod + @WebResult(name = "return") + String echo(@WebParam(name = "message") String message); +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,72 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.namespace; - -// $Id: $ - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test the JAX-WS metadata builder. - * - * @author Heiko.Braun(a)jboss.org - * @since 23.01.2007 - */ -public class MultipleNamespacesTestCase extends JBossWSTest -{ - - public static Test suite() - { - return new JBossWSTestSetup(MultipleNamespacesTestCase.class, "jaxws-namespace.war"); - } - - /** - * If the @WebService.targetNamespace annotation is on a service implementation bean that does NOT reference a service - * endpoint interface (through the endpointInterface annotation element), the targetNamespace is used for both the - * wsdl:portType and the wsdl:service (and associated XML elements). - * - * If the @WebService.targetNamespace annotation is on a service implementation bean that does reference a service endpoint - * interface (through the endpointInterface annotation element), the targetNamespace is used for only the wsdl:service (and - * associated XML elements). - */ - public void testSEIDerivedNamespaces() throws Exception - { - // Create the port - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-namespace?wsdl"); - QName qname = new QName("http://example.org/impl", "EndpointBeanService"); - Service service = Service.create(wsdlURL, qname); - EndpointInterface port = service.getPort(EndpointInterface.class); - - String helloWorld = "Hello world!"; - String response = port.echo(helloWorld); - assertEquals(helloWorld, response); - - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.namespace; + +// $Id: $ + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test the JAX-WS metadata builder. + * + * @author Heiko.Braun(a)jboss.org + * @since 23.01.2007 + */ +public class MultipleNamespacesTestCase extends JBossWSTest +{ + + public static Test suite() + { + return new JBossWSTestSetup(MultipleNamespacesTestCase.class, "jaxws-namespace.war"); + } + + /** + * If the @WebService.targetNamespace annotation is on a service implementation bean that does NOT reference a service + * endpoint interface (through the endpointInterface annotation element), the targetNamespace is used for both the + * wsdl:portType and the wsdl:service (and associated XML elements). + * + * If the @WebService.targetNamespace annotation is on a service implementation bean that does reference a service endpoint + * interface (through the endpointInterface annotation element), the targetNamespace is used for only the wsdl:service (and + * associated XML elements). + */ + public void testSEIDerivedNamespaces() throws Exception + { + // Create the port + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-namespace?wsdl"); + QName qname = new QName("http://example.org/impl", "EndpointBeanService"); + Service service = Service.create(wsdlURL, qname); + EndpointInterface port = service.getPort(EndpointInterface.class); + + String helloWorld = "Hello world!"; + String response = port.echo(helloWorld); + assertEquals(helloWorld, response); + + } +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webfault; - -import javax.xml.ws.WebFault; - -/** - * A custom exception - * - * @author alessio.soldano(a)jboss.com - * @since 21-Feb-2008 - */ -@WebFault(name = "myCustomFault", targetNamespace= "org.jboss.test.ws.jaxws.webfault.exceptions") -public class CustomException extends Exception -{ - private Integer number; - - public CustomException(String message, Integer number) - { - super(message); - this.number = number; - } - - public Integer getNumber() - { - return number; - } - - public void setNumber(Integer number) - { - this.number = number; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/CustomException.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webfault; + +import javax.xml.ws.WebFault; + +/** + * A custom exception + * + * @author alessio.soldano(a)jboss.com + * @since 21-Feb-2008 + */ +@WebFault(name = "myCustomFault", targetNamespace= "org.jboss.test.ws.jaxws.webfault.exceptions") +public class CustomException extends Exception +{ + private Integer number; + + public CustomException(String message, Integer number) + { + super(message); + this.number = number; + } + + public Integer getNumber() + { + return number; + } + + public void setNumber(Integer number) + { + this.number = number; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webfault; - -import javax.xml.ws.WebFault; - -/** - * A simple exception using @WebFault defaults - * - * @author alessio.soldano(a)jboss.com - * @since 21-Feb-2008 - */ -@WebFault -public class SimpleException extends Exception -{ - private Integer number; - - public SimpleException(String message, Integer number) - { - super(message); - this.number = number; - } - - public Integer getNumber() - { - return number; - } - - public void setNumber(Integer number) - { - this.number = number; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/SimpleException.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webfault; + +import javax.xml.ws.WebFault; + +/** + * A simple exception using @WebFault defaults + * + * @author alessio.soldano(a)jboss.com + * @since 21-Feb-2008 + */ +@WebFault +public class SimpleException extends Exception +{ + private Integer number; + + public SimpleException(String message, Integer number) + { + super(message); + this.number = number; + } + + public Integer getNumber() + { + return number; + } + + public void setNumber(Integer number) + { + this.number = number; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webfault; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService (name="TestEndpoint") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint -{ - public void throwCustomException(String input) throws CustomException; - - public void throwSimpleException(String input) throws SimpleException; -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webfault; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService (name="TestEndpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint +{ + public void throwCustomException(String input) throws CustomException; + + public void throwSimpleException(String input) throws SimpleException; +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webfault; - -import javax.jws.WebService; - -import org.jboss.logging.Logger; - -/** - * Test the JSR-181 annotation: javax.jws.WebFault - * - * @author alessio.soldano(a)jboss.org - * @since 21-Feb-2008 - */ -@WebService(name="TestEndpoint", serviceName="TestEndpointService", endpointInterface = "org.jboss.test.ws.jaxws.webfault.TestEndpoint") -public class TestEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(TestEndpointImpl.class); - - public void throwCustomException(String input) throws CustomException - { - log.info("throwCustomException: " + input); - throw new CustomException("This is a @WebFault test", (input != null ? input.length() : 0)); - } - - public void throwSimpleException(String input) throws SimpleException - { - log.info("throwSimpleException: " + input); - throw new SimpleException("This is a @WebFault test", (input != null ? input.length() : 0)); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webfault; + +import javax.jws.WebService; + +import org.jboss.logging.Logger; + +/** + * Test the JSR-181 annotation: javax.jws.WebFault + * + * @author alessio.soldano(a)jboss.org + * @since 21-Feb-2008 + */ +@WebService(name="TestEndpoint", serviceName="TestEndpointService", endpointInterface = "org.jboss.test.ws.jaxws.webfault.TestEndpoint") +public class TestEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(TestEndpointImpl.class); + + public void throwCustomException(String input) throws CustomException + { + log.info("throwCustomException: " + input); + throw new CustomException("This is a @WebFault test", (input != null ? input.length() : 0)); + } + + public void throwSimpleException(String input) throws SimpleException + { + log.info("throwSimpleException: " + input); + throw new SimpleException("This is a @WebFault test", (input != null ? input.length() : 0)); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,118 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webfault; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.apache.xerces.xs.XSElementDeclaration; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test the JSR-181 annotation: javax.jws.WebFault - * - * @author alessio.soldano(a)jboss.org - * @since 21-Feb-2008 - */ -public class WebFaultTestCase extends JBossWSTest -{ - private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-webfault"; - private static final String TARGET_NS = "http://webfault.jaxws.ws.test.jboss.org/"; - private static final String CUSTOM_FAULT_NS = "org.jboss.test.ws.jaxws.webfault.exceptions"; - - public static Test suite() - { - return new JBossWSTestSetup(WebFaultTestCase.class, "jaxws-webfault.war"); - } - - /** - * Tests whether the @WebFault annotation correctly sets the fault element's name and namespace - * (the type doesn't depend on @WebFault, see [JBWS-1904] about this) - * - * @throws Exception - */ - public void testWebFaultElement() throws Exception - { - JBossXSModel xsModel = getSchemaModel(); - XSElementDeclaration myCustomFaultElement = xsModel.getElementDeclaration("myCustomFault", CUSTOM_FAULT_NS); - assertNotNull(myCustomFaultElement); - myCustomFaultElement = xsModel.getElementDeclaration("myCustomFault", TARGET_NS); - assertNull(myCustomFaultElement); - myCustomFaultElement = xsModel.getElementDeclaration("CustomException", CUSTOM_FAULT_NS); - assertNull(myCustomFaultElement); - XSElementDeclaration simpleExceptiontElement = xsModel.getElementDeclaration("SimpleException", TARGET_NS); //default to exception simple class name - assertNotNull(simpleExceptiontElement); - } - - private JBossXSModel getSchemaModel() throws Exception - { - URL wsdlURL = new URL(endpointURL + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - return WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); - } - - public void testInvocation() throws Exception - { - URL wsdlURL = new URL(endpointURL + "?wsdl"); - QName serviceName = new QName(TARGET_NS, "TestEndpointService"); - - Service service = Service.create(wsdlURL, serviceName); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - try - { - port.throwCustomException("Hello"); - fail("Exception expected!"); - } - catch (CustomException e) - { - assertEquals(new Integer(5), e.getNumber()); - } - catch (Exception e) - { - fail("Wrong exception catched!"); - } - try - { - port.throwSimpleException("World"); - fail("Exception expected!"); - } - catch (SimpleException e) - { - assertEquals(new Integer(5), e.getNumber()); - } - catch (Exception e) - { - fail("Wrong exception catched!"); - } - } -} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,118 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webfault; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.apache.xerces.xs.XSElementDeclaration; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLUtils; +import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test the JSR-181 annotation: javax.jws.WebFault + * + * @author alessio.soldano(a)jboss.org + * @since 21-Feb-2008 + */ +public class WebFaultTestCase extends JBossWSTest +{ + private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-webfault"; + private static final String TARGET_NS = "http://webfault.jaxws.ws.test.jboss.org/"; + private static final String CUSTOM_FAULT_NS = "org.jboss.test.ws.jaxws.webfault.exceptions"; + + public static Test suite() + { + return new JBossWSTestSetup(WebFaultTestCase.class, "jaxws-webfault.war"); + } + + /** + * Tests whether the @WebFault annotation correctly sets the fault element's name and namespace + * (the type doesn't depend on @WebFault, see [JBWS-1904] about this) + * + * @throws Exception + */ + public void testWebFaultElement() throws Exception + { + JBossXSModel xsModel = getSchemaModel(); + XSElementDeclaration myCustomFaultElement = xsModel.getElementDeclaration("myCustomFault", CUSTOM_FAULT_NS); + assertNotNull(myCustomFaultElement); + myCustomFaultElement = xsModel.getElementDeclaration("myCustomFault", TARGET_NS); + assertNull(myCustomFaultElement); + myCustomFaultElement = xsModel.getElementDeclaration("CustomException", CUSTOM_FAULT_NS); + assertNull(myCustomFaultElement); + XSElementDeclaration simpleExceptiontElement = xsModel.getElementDeclaration("SimpleException", TARGET_NS); //default to exception simple class name + assertNotNull(simpleExceptiontElement); + } + + private JBossXSModel getSchemaModel() throws Exception + { + URL wsdlURL = new URL(endpointURL + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + return WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); + } + + public void testInvocation() throws Exception + { + URL wsdlURL = new URL(endpointURL + "?wsdl"); + QName serviceName = new QName(TARGET_NS, "TestEndpointService"); + + Service service = Service.create(wsdlURL, serviceName); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + try + { + port.throwCustomException("Hello"); + fail("Exception expected!"); + } + catch (CustomException e) + { + assertEquals(new Integer(5), e.getNumber()); + } + catch (Exception e) + { + fail("Wrong exception catched!"); + } + try + { + port.throwSimpleException("World"); + fail("Exception expected!"); + } + catch (SimpleException e) + { + assertEquals(new Integer(5), e.getNumber()); + } + catch (Exception e) + { + fail("Wrong exception catched!"); + } + } +} \ No newline at end of file Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref) Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,35 +0,0 @@ - -package org.jboss.test.ws.jaxws.webserviceref; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-webserviceref-secure/SecureEndpoi...") -@SOAPBinding(style = Style.RPC) -public interface SecureEndpoint { - - - /** - * - * @param arg0 - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") - public String echo( - @WebParam(name = "arg0", partName = "arg0") - String arg0); - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,35 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-webserviceref-secure/SecureEndpoi...") +@SOAPBinding(style = Style.RPC) +public interface SecureEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webserviceref; - -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceRef; - -import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService; - -public class SecureEndpointClient -{ - // Provide logging - private static Logger log = Logger.getLogger(SecureEndpointClient.class); - - @WebServiceRef(name = "SecureService1") - static SecureEndpointService secureService1; - - @WebServiceRef(name = "SecureService2") - static Service secureService2; - - @WebServiceRef(name = "SecurePort1") - static SecureEndpoint securePort1; - - static String retStr; - - public static void main(String[] args) - { - String reqMsg = args[0]; - log.info("echo: " + reqMsg); - - String username = null; - if (args.length > 1) - username = args[1]; - - String password = null; - if (args.length > 2) - password = args[2]; - - if (reqMsg.equals("SecureService1")) - { - SecureEndpoint port = secureService1.getSecureEndpointPort(); - retStr = invokeEndpoint(port, reqMsg, username, password); - } - else if (reqMsg.equals("SecureService2")) - { - SecureEndpoint port = secureService2.getPort(SecureEndpoint.class); - retStr = invokeEndpoint(port, reqMsg, username, password); - } - else if (reqMsg.equals("SecurePort1")) - { - SecureEndpoint port = securePort1; - retStr = invokeEndpoint(port, reqMsg, username, password); - } - else - { - throw new IllegalArgumentException("Invalid req messge: " + reqMsg); - } - } - - private static String invokeEndpoint(SecureEndpoint port, String inStr, String username, String password) - { - if (username != null && password != null) - { - BindingProvider bindingProvider = (BindingProvider)port; - bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, username); - bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, password); - } - - return port.echo(inStr); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,92 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webserviceref; + +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService; + +public class SecureEndpointClient +{ + // Provide logging + private static Logger log = Logger.getLogger(SecureEndpointClient.class); + + @WebServiceRef(name = "SecureService1") + static SecureEndpointService secureService1; + + @WebServiceRef(name = "SecureService2") + static Service secureService2; + + @WebServiceRef(name = "SecurePort1") + static SecureEndpoint securePort1; + + static String retStr; + + public static void main(String[] args) + { + String reqMsg = args[0]; + log.info("echo: " + reqMsg); + + String username = null; + if (args.length > 1) + username = args[1]; + + String password = null; + if (args.length > 2) + password = args[2]; + + if (reqMsg.equals("SecureService1")) + { + SecureEndpoint port = secureService1.getSecureEndpointPort(); + retStr = invokeEndpoint(port, reqMsg, username, password); + } + else if (reqMsg.equals("SecureService2")) + { + SecureEndpoint port = secureService2.getPort(SecureEndpoint.class); + retStr = invokeEndpoint(port, reqMsg, username, password); + } + else if (reqMsg.equals("SecurePort1")) + { + SecureEndpoint port = securePort1; + retStr = invokeEndpoint(port, reqMsg, username, password); + } + else + { + throw new IllegalArgumentException("Invalid req messge: " + reqMsg); + } + } + + private static String invokeEndpoint(SecureEndpoint port, String inStr, String username, String password) + { + if (username != null && password != null) + { + BindingProvider bindingProvider = (BindingProvider)port; + bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, username); + bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, password); + } + + return port.echo(inStr); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webserviceref; - -import javax.annotation.security.RolesAllowed; -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - -import org.jboss.annotation.security.SecurityDomain; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.annotation.WebContext; - -@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref") -@Stateless(name = "SecureEndpoint") -@SOAPBinding(style = Style.RPC) - -@WebContext(contextRoot="/jaxws-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) -@SecurityDomain("JBossWS") -@RolesAllowed("friend") -public class SecureEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(SecureEndpointImpl.class); - - @WebMethod - public String echo(String input) - { - log.info(input); - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webserviceref; + +import javax.annotation.security.RolesAllowed; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +import org.jboss.annotation.security.SecurityDomain; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.annotation.WebContext; + +@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref") +@Stateless(name = "SecureEndpoint") +@SOAPBinding(style = Style.RPC) + +@WebContext(contextRoot="/jaxws-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) +@SecurityDomain("JBossWS") +@RolesAllowed("friend") +public class SecureEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(SecureEndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info(input); + return input; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,55 +0,0 @@ - -package org.jboss.test.ws.jaxws.webserviceref; - -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; - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebServiceClient(name = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-webserviceref-secure/SecureEndpoi...") -public class SecureEndpointService - extends Service -{ - - private final static URL WSDL_LOCATION; - private final static QName SECUREENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); - private final static QName SECUREENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "SecureEndpointPort"); - - static { - URL url = null; - try { - url = new URL("http://localhost.localdomain:8080/jaxws-webserviceref-secure/SecureEndpoi..."); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - WSDL_LOCATION = url; - } - - public SecureEndpointService(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - public SecureEndpointService() { - super(WSDL_LOCATION, SECUREENDPOINTSERVICE); - } - - /** - * - * @return - * returns SecureEndpoint - */ - @WebEndpoint(name = "SecureEndpointPort") - public SecureEndpoint getSecureEndpointPort() { - return (SecureEndpoint)super.getPort(SECUREENDPOINTPORT, SecureEndpoint.class); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,55 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +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; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-webserviceref-secure/SecureEndpoi...") +public class SecureEndpointService + extends Service +{ + + private final static URL WSDL_LOCATION; + private final static QName SECUREENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); + private final static QName SECUREENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "SecureEndpointPort"); + + static { + URL url = null; + try { + url = new URL("http://localhost.localdomain:8080/jaxws-webserviceref-secure/SecureEndpoi..."); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public SecureEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public SecureEndpointService() { + super(WSDL_LOCATION, SECUREENDPOINTSERVICE); + } + + /** + * + * @return + * returns SecureEndpoint + */ + @WebEndpoint(name = "SecureEndpointPort") + public SecureEndpoint getSecureEndpointPort() { + return (SecureEndpoint)super.getPort(SECUREENDPOINTPORT, SecureEndpoint.class); + } + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,100 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webserviceref; - -import junit.framework.Test; - -import org.jboss.ejb3.client.ClientLauncher; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test @WebServiceRef overrides in jboss-client.xml - * - * @author Thomas.Diesler(a)jboss.com - * @since 18-Jan-2007 - */ -public class ServiceRefOverridesTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-webserviceref"; - - public static Test suite() - { - return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-override-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - - if (TestEndpointClientTwo.iniCtx == null) - TestEndpointClientTwo.iniCtx = getInitialContext(); - } - - public void testService1() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName(), resStr); - } - - public void testService2() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName(), resStr); - } - - public void testService3() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - public void testService4() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - public void testPort1() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName(), resStr); - } - - public void testPort2() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - public void testPort3() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - private String invokeTest(String reqStr) throws Throwable - { - new ClientLauncher().launch(TestEndpointClientTwo.class.getName(), "jbossws-client", new String[] { reqStr }); - return TestEndpointClientTwo.testResult.get(reqStr); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webserviceref; + +import junit.framework.Test; + +import org.jboss.ejb3.client.ClientLauncher; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test @WebServiceRef overrides in jboss-client.xml + * + * @author Thomas.Diesler(a)jboss.com + * @since 18-Jan-2007 + */ +public class ServiceRefOverridesTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-webserviceref"; + + public static Test suite() + { + return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-override-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + + if (TestEndpointClientTwo.iniCtx == null) + TestEndpointClientTwo.iniCtx = getInitialContext(); + } + + public void testService1() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testService2() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testService3() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testService4() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testPort1() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testPort2() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testPort3() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + private String invokeTest(String reqStr) throws Throwable + { + new ClientLauncher().launch(TestEndpointClientTwo.class.getName(), "jbossws-client", new String[] { reqStr }); + return TestEndpointClientTwo.testResult.get(reqStr); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,117 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webserviceref; - -import java.net.URL; -import java.io.InputStream; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.ejb3.client.ClientLauncher; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test the JAXWS annotation: javax.xml.ws.WebServiceRef - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class StubPropertyTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-webserviceref-secure"; - - public static Test suite() - { - return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-webserviceref-secure.jar, jaxws-webserviceref-secure-client.jar"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - InputStream inputStream = wsdlURL.openStream(); - assertNotNull(inputStream); - inputStream.close(); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName qname = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); - Service service = Service.create(wsdlURL, qname); - SecureEndpoint port = (SecureEndpoint)service.getPort(SecureEndpoint.class); - - BindingProvider bindingProvider = (BindingProvider)port; - bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); - bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); - - String helloWorld = "Hello World"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testExplicitSecureService1() throws Throwable - { - String reqMsg = "SecureService1"; - new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); - assertEquals(reqMsg, SecureEndpointClient.retStr); - } - - public void testExplicitSecureService2() throws Throwable - { - String reqMsg = "SecureService2"; - new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); - assertEquals(reqMsg, SecureEndpointClient.retStr); - } - - public void testExplicitSecurePort1() throws Throwable - { - String reqMsg = "SecurePort1"; - new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); - assertEquals(reqMsg, SecureEndpointClient.retStr); - } - - public void testImplicitSecureService1() throws Throwable - { - String reqMsg = "SecureService1"; - new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); - assertEquals(reqMsg, SecureEndpointClient.retStr); - } - - public void testImplicitSecureService2() throws Throwable - { - String reqMsg = "SecureService2"; - new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); - assertEquals(reqMsg, SecureEndpointClient.retStr); - } - - public void testImplicitSecurePort1() throws Throwable - { - String reqMsg = "SecurePort1"; - new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); - assertEquals(reqMsg, SecureEndpointClient.retStr); - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,117 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webserviceref; + +import java.net.URL; +import java.io.InputStream; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.ejb3.client.ClientLauncher; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test the JAXWS annotation: javax.xml.ws.WebServiceRef + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class StubPropertyTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-webserviceref-secure"; + + public static Test suite() + { + return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-webserviceref-secure.jar, jaxws-webserviceref-secure-client.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + InputStream inputStream = wsdlURL.openStream(); + assertNotNull(inputStream); + inputStream.close(); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName qname = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); + Service service = Service.create(wsdlURL, qname); + SecureEndpoint port = (SecureEndpoint)service.getPort(SecureEndpoint.class); + + BindingProvider bindingProvider = (BindingProvider)port; + bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); + bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); + + String helloWorld = "Hello World"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testExplicitSecureService1() throws Throwable + { + String reqMsg = "SecureService1"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } + + public void testExplicitSecureService2() throws Throwable + { + String reqMsg = "SecureService2"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } + + public void testExplicitSecurePort1() throws Throwable + { + String reqMsg = "SecurePort1"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } + + public void testImplicitSecureService1() throws Throwable + { + String reqMsg = "SecureService1"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } + + public void testImplicitSecureService2() throws Throwable + { + String reqMsg = "SecureService2"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } + + public void testImplicitSecurePort1() throws Throwable + { + String reqMsg = "SecurePort1"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webserviceref; - -import javax.jws.WebService; -import javax.jws.WebMethod; -import javax.jws.WebResult; -import javax.jws.WebParam; -import javax.jws.soap.SOAPBinding; - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-webserviceref?wsdl") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint { - - - /** - * - * @param arg0 - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") - public String echo( - @WebParam(name = "arg0", partName = "arg0") - String arg0); - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webserviceref; + +import javax.jws.WebService; +import javax.jws.WebMethod; +import javax.jws.WebResult; +import javax.jws.WebParam; +import javax.jws.soap.SOAPBinding; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-webserviceref?wsdl") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,127 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webserviceref; - -import org.jboss.logging.Logger; - -import javax.naming.InitialContext; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; -import java.util.ArrayList; - -@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") - -// Test multiple on type -@WebServiceRefs( { - @WebServiceRef(name = "service2", value = TestEndpointService.class), - @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) }) -public class TestEndpointClientOne -{ - // Provide logging - private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class); - - // Test on field with name - @WebServiceRef(name = "TestEndpointService3") - static TestEndpointService service3; - - // Test on field without name - @WebServiceRef - static TestEndpointService service4; - - // Test on method with name - @WebServiceRef(name = "TestEndpointService5") - static void setService5(TestEndpointService service) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5 = service; - } - private static TestEndpointService service5; - - // Test on method without name - @WebServiceRef - static void setService6(TestEndpointService service) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6 = service; - } - private static TestEndpointService service6; - - // Test on field with name and value - @WebServiceRef(name = "Port2", value = TestEndpointService.class) - static TestEndpoint port2; - - // Test on field with value - @WebServiceRef(value = TestEndpointService.class) - static TestEndpoint port3; - - // Test on field - @WebServiceRef - static TestEndpoint port4; - - // Test on field with name - @WebServiceRef (name = "Port5") - static TestEndpoint port5; - - static InitialContext iniCtx; - static String retStr; - - public static void main(String[] args) - { - String inStr = args[0]; - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.info("echo: " + inStr); - - ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); - try - { - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort()); - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service3.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service4.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service4")).getTestEndpointPort()); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service6")).getTestEndpointPort()); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/port1")); - ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port2); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/Port2")); - ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port3); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/port3")); - ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port4); - ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port5); - } - catch (Exception ex) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.error("Cannot add port", ex); - throw new WebServiceException(ex); - } - - for (TestEndpoint port : ports) - { - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new WebServiceException("Invalid echo return: " + inStr); - } - - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.retStr = inStr; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,127 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webserviceref; + +import org.jboss.logging.Logger; + +import javax.naming.InitialContext; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; +import java.util.ArrayList; + +@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") + +// Test multiple on type +@WebServiceRefs( { + @WebServiceRef(name = "service2", value = TestEndpointService.class), + @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) }) +public class TestEndpointClientOne +{ + // Provide logging + private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class); + + // Test on field with name + @WebServiceRef(name = "TestEndpointService3") + static TestEndpointService service3; + + // Test on field without name + @WebServiceRef + static TestEndpointService service4; + + // Test on method with name + @WebServiceRef(name = "TestEndpointService5") + static void setService5(TestEndpointService service) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5 = service; + } + private static TestEndpointService service5; + + // Test on method without name + @WebServiceRef + static void setService6(TestEndpointService service) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6 = service; + } + private static TestEndpointService service6; + + // Test on field with name and value + @WebServiceRef(name = "Port2", value = TestEndpointService.class) + static TestEndpoint port2; + + // Test on field with value + @WebServiceRef(value = TestEndpointService.class) + static TestEndpoint port3; + + // Test on field + @WebServiceRef + static TestEndpoint port4; + + // Test on field with name + @WebServiceRef (name = "Port5") + static TestEndpoint port5; + + static InitialContext iniCtx; + static String retStr; + + public static void main(String[] args) + { + String inStr = args[0]; + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.info("echo: " + inStr); + + ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); + try + { + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort()); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service3.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service4.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service4")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service6")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/port1")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port2); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/Port2")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port3); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/port3")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port4); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port5); + } + catch (Exception ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.error("Cannot add port", ex); + throw new WebServiceException(ex); + } + + for (TestEndpoint port : ports) + { + String outStr = port.echo(inStr); + if (inStr.equals(outStr) == false) + throw new WebServiceException("Invalid echo return: " + inStr); + } + + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.retStr = inStr; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,206 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webserviceref; - -import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.webserviceref.TestEndpoint; -import org.jboss.test.ws.jaxws.webserviceref.TestEndpointService; - -import javax.naming.InitialContext; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - -@WebServiceRef(name = "Service1") -// Test multiple on type -@WebServiceRefs( { @WebServiceRef(name = "Service2"), @WebServiceRef(name = "Port1", type = TestEndpoint.class) }) -public class TestEndpointClientTwo -{ - // provide logging - private static final Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class); - - // Test on field - @WebServiceRef(name = "Service3") - static Service service3; - - // Test on field - @WebServiceRef(name = "Service4") - static TestEndpointService service4; - - // Test on field - @WebServiceRef(name = "Port2") - static TestEndpoint port2; - - // Test on field - @WebServiceRef(name = "Port3") - static TestEndpoint port3; - - static InitialContext iniCtx; - static Map<String, String> testResult = new HashMap<String, String>(); - - public static void main(String[] args) throws Exception - { - String testName = args[0]; - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo client = new org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo(); - Method method = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class.getMethod(testName, new Class[] { String.class }); - try - { - String retStr = (String)method.invoke(client, testName); - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, retStr); - } - catch (InvocationTargetException ex) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Invocation error", ex); - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.getTargetException().toString()); - } - catch (Exception ex) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Error", ex); - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.toString()); - } - } - - /** - * Customize service-class-name, service-qname - */ - public String testService1(String reqStr) throws Exception - { - TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service1"); - TestEndpoint port = service.getTestEndpointPort(); - return port.echo(reqStr); - } - - /** - * Customize config-name, config-file - */ - public String testService2(String reqStr) throws Exception - { - Service service = (Service)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service2"); - - TestEndpoint port = service.getPort(TestEndpoint.class); - //verifyConfig((ConfigProvider)port); - - return port.echo(reqStr); - } - - /** - * Customize service-class-name, service-qname - */ - public String testService3(String reqStr) throws Exception - { - TestEndpoint port = ((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service3).getTestEndpointPort(); - String resStr1 = port.echo(reqStr); - - TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service3"); - port = service.getTestEndpointPort(); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize config-name, config-file - */ - public String testService4(String reqStr) throws Exception - { - TestEndpoint port = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service4.getTestEndpointPort(); - String resStr1 = port.echo(reqStr); - //verifyConfig((ConfigProvider)port); - - TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service4"); - port = service.getTestEndpointPort(); - //verifyConfig((ConfigProvider)port); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize port-info: port-qname, config-name, config-file - */ - public String testPort1(String reqStr) throws Exception - { - TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port1"); - //verifyConfig((ConfigProvider)port); - - return port.echo(reqStr); - } - - /** - * Customize port-info: service-endpoint-interface, config-name, config-file - */ - public String testPort2(String reqStr) throws Exception - { - //verifyConfig((ConfigProvider)port2); - String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port2.echo(reqStr); - - TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port2"); - //verifyConfig((ConfigProvider)port); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize port-info: service-endpoint-interface, port-qname, stub-property - */ - public String testPort3(String reqStr) throws Exception - { - String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3.echo(reqStr); - - BindingProvider bp = (BindingProvider)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3; - verifyProperties(bp.getRequestContext()); - - TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port3"); - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - private void verifyProperties(Map<String, Object> ctx) - { - String username = (String)ctx.get(BindingProvider.USERNAME_PROPERTY); - if ("kermit".equals(username) == false) - throw new RuntimeException("Invalid username: " + username); - - String password = (String)ctx.get(BindingProvider.PASSWORD_PROPERTY); - if ("thefrog".equals(password) == false) - throw new RuntimeException("Invalid password: " + password); - } - - /*private void verifyConfig(ConfigProvider cp) - { - if ("Custom Client".equals(cp.getConfigName()) == false) - throw new RuntimeException("Invalid config name: " + cp.getConfigName()); - - if ("META-INF/jbossws-client-config.xml".equals(cp.getConfigFile()) == false) - throw new RuntimeException("Invalid config file: " + cp.getConfigFile()); - } */ -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,206 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webserviceref; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.webserviceref.TestEndpoint; +import org.jboss.test.ws.jaxws.webserviceref.TestEndpointService; + +import javax.naming.InitialContext; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +@WebServiceRef(name = "Service1") +// Test multiple on type +@WebServiceRefs( { @WebServiceRef(name = "Service2"), @WebServiceRef(name = "Port1", type = TestEndpoint.class) }) +public class TestEndpointClientTwo +{ + // provide logging + private static final Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class); + + // Test on field + @WebServiceRef(name = "Service3") + static Service service3; + + // Test on field + @WebServiceRef(name = "Service4") + static TestEndpointService service4; + + // Test on field + @WebServiceRef(name = "Port2") + static TestEndpoint port2; + + // Test on field + @WebServiceRef(name = "Port3") + static TestEndpoint port3; + + static InitialContext iniCtx; + static Map<String, String> testResult = new HashMap<String, String>(); + + public static void main(String[] args) throws Exception + { + String testName = args[0]; + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo client = new org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo(); + Method method = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class.getMethod(testName, new Class[] { String.class }); + try + { + String retStr = (String)method.invoke(client, testName); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, retStr); + } + catch (InvocationTargetException ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Invocation error", ex); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.getTargetException().toString()); + } + catch (Exception ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Error", ex); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.toString()); + } + } + + /** + * Customize service-class-name, service-qname + */ + public String testService1(String reqStr) throws Exception + { + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service1"); + TestEndpoint port = service.getTestEndpointPort(); + return port.echo(reqStr); + } + + /** + * Customize config-name, config-file + */ + public String testService2(String reqStr) throws Exception + { + Service service = (Service)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service2"); + + TestEndpoint port = service.getPort(TestEndpoint.class); + //verifyConfig((ConfigProvider)port); + + return port.echo(reqStr); + } + + /** + * Customize service-class-name, service-qname + */ + public String testService3(String reqStr) throws Exception + { + TestEndpoint port = ((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service3).getTestEndpointPort(); + String resStr1 = port.echo(reqStr); + + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service3"); + port = service.getTestEndpointPort(); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize config-name, config-file + */ + public String testService4(String reqStr) throws Exception + { + TestEndpoint port = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service4.getTestEndpointPort(); + String resStr1 = port.echo(reqStr); + //verifyConfig((ConfigProvider)port); + + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service4"); + port = service.getTestEndpointPort(); + //verifyConfig((ConfigProvider)port); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize port-info: port-qname, config-name, config-file + */ + public String testPort1(String reqStr) throws Exception + { + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port1"); + //verifyConfig((ConfigProvider)port); + + return port.echo(reqStr); + } + + /** + * Customize port-info: service-endpoint-interface, config-name, config-file + */ + public String testPort2(String reqStr) throws Exception + { + //verifyConfig((ConfigProvider)port2); + String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port2.echo(reqStr); + + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port2"); + //verifyConfig((ConfigProvider)port); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize port-info: service-endpoint-interface, port-qname, stub-property + */ + public String testPort3(String reqStr) throws Exception + { + String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3.echo(reqStr); + + BindingProvider bp = (BindingProvider)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3; + verifyProperties(bp.getRequestContext()); + + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port3"); + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + private void verifyProperties(Map<String, Object> ctx) + { + String username = (String)ctx.get(BindingProvider.USERNAME_PROPERTY); + if ("kermit".equals(username) == false) + throw new RuntimeException("Invalid username: " + username); + + String password = (String)ctx.get(BindingProvider.PASSWORD_PROPERTY); + if ("thefrog".equals(password) == false) + throw new RuntimeException("Invalid password: " + password); + } + + /*private void verifyConfig(ConfigProvider cp) + { + if ("Custom Client".equals(cp.getConfigName()) == false) + throw new RuntimeException("Invalid config name: " + cp.getConfigName()); + + if ("META-INF/jbossws-client-config.xml".equals(cp.getConfigFile()) == false) + throw new RuntimeException("Invalid config file: " + cp.getConfigFile()); + } */ +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webserviceref; - -import org.jboss.logging.Logger; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class TestEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.class); - - @WebMethod - public String echo(String input) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.log.info(input); - return input; - } -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webserviceref; + +import org.jboss.logging.Logger; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class TestEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.class); + + @WebMethod + public String echo(String input) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.log.info(input); + return input; + } +} Deleted: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.webserviceref; - - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; -import java.net.MalformedURLException; -import java.net.URL; - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "file://bogus-location/jaxws-webserviceref?wsdl") -public class TestEndpointService - extends Service -{ - - private final static URL WSDL_LOCATION; - private final static QName TESTENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - private final static QName TESTENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "TestEndpointPort"); - - static { - URL url = null; - try { - url = new URL("file://bogus-location/jaxws-webserviceref?wsdl"); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - WSDL_LOCATION = url; - } - - public TestEndpointService(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - public TestEndpointService() { - super(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.WSDL_LOCATION, org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTSERVICE); - } - - /** - * - * @return - * returns TestEndpoint - */ - @WebEndpoint(name = "TestEndpointPort") - public org.jboss.test.ws.jaxws.webserviceref.TestEndpoint getTestEndpointPort() { - return (TestEndpoint)super.getPort(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTPORT, TestEndpoint.class); - } - -} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java) =================================================================== --- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java (rev 0) +++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.webserviceref; + + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import java.net.MalformedURLException; +import java.net.URL; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "file://bogus-location/jaxws-webserviceref?wsdl") +public class TestEndpointService + extends Service +{ + + private final static URL WSDL_LOCATION; + private final static QName TESTENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + private final static QName TESTENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "TestEndpointPort"); + + static { + URL url = null; + try { + url = new URL("file://bogus-location/jaxws-webserviceref?wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public TestEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public TestEndpointService() { + super(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.WSDL_LOCATION, org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTSERVICE); + } + + /** + * + * @return + * returns TestEndpoint + */ + @WebEndpoint(name = "TestEndpointPort") + public org.jboss.test.ws.jaxws.webserviceref.TestEndpoint getTestEndpointPort() { + return (TestEndpoint)super.getPort(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTPORT, TestEndpoint.class); + } + +} Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped) Copied: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor (from rev 6227, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor) Copied: framework/trunk/src/test/resources/anonymous (from rev 6221, stack/native/trunk/src/test/resources/jaxws/anonymous) Copied: framework/trunk/src/test/resources/anonymous/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/anonymous/WEB-INF) Copied: framework/trunk/src/test/resources/binding (from rev 6221, stack/native/trunk/src/test/resources/jaxws/binding) Copied: framework/trunk/src/test/resources/binding/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/binding/WEB-INF) Copied: framework/trunk/src/test/resources/complex (from rev 6221, stack/native/trunk/src/test/resources/jaxws/complex) Copied: framework/trunk/src/test/resources/complex/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/complex/META-INF) Copied: framework/trunk/src/test/resources/complex/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/complex/WEB-INF) Copied: framework/trunk/src/test/resources/endpoint (from rev 6221, stack/native/trunk/src/test/resources/jaxws/endpoint) Copied: framework/trunk/src/test/resources/endpoint/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/endpoint/WEB-INF) Copied: framework/trunk/src/test/resources/handlerscope (from rev 6221, stack/native/trunk/src/test/resources/jaxws/handlerscope) Copied: framework/trunk/src/test/resources/handlerscope/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/handlerscope/WEB-INF) Copied: framework/trunk/src/test/resources/holder (from rev 6221, stack/native/trunk/src/test/resources/jaxws/holder) Copied: framework/trunk/src/test/resources/holder/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/holder/META-INF) Copied: framework/trunk/src/test/resources/holder/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/holder/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1190 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1190) Copied: framework/trunk/src/test/resources/jbws1190/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1190/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1357 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1357) Copied: framework/trunk/src/test/resources/jbws1357/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1357/WEB-INF) Deleted: framework/trunk/src/test/resources/jbws1357/hello.jsp =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1357/hello.jsp 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/resources/jbws1357/hello.jsp 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,5 +0,0 @@ -<html> -<body> -<% System.out.println("Hello"); %> -</body> -</html> Copied: framework/trunk/src/test/resources/jbws1357/hello.jsp (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1357/hello.jsp) =================================================================== --- framework/trunk/src/test/resources/jbws1357/hello.jsp (rev 0) +++ framework/trunk/src/test/resources/jbws1357/hello.jsp 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,5 @@ +<html> +<body> +<% System.out.println("Hello"); %> +</body> +</html> Copied: framework/trunk/src/test/resources/jbws1529 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1529) Copied: framework/trunk/src/test/resources/jbws1529/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1529/META-INF) Copied: framework/trunk/src/test/resources/jbws1529/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1529/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1556 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1556) Copied: framework/trunk/src/test/resources/jbws1556/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1556/META-INF) Copied: framework/trunk/src/test/resources/jbws1581 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1581) Copied: framework/trunk/src/test/resources/jbws1581/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1581/META-INF) Copied: framework/trunk/src/test/resources/jbws1581/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1581/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1611 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1611) Copied: framework/trunk/src/test/resources/jbws1611/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1611/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1666 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1666) Copied: framework/trunk/src/test/resources/jbws1666/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1666/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1702 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1702) Copied: framework/trunk/src/test/resources/jbws1702/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1702/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1733 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1733) Copied: framework/trunk/src/test/resources/jbws1733/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1733/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1762 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1762) Copied: framework/trunk/src/test/resources/jbws1762/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1762/META-INF) Copied: framework/trunk/src/test/resources/jbws1762/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1762/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1797 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1797) Copied: framework/trunk/src/test/resources/jbws1797/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1797/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1798 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1798) Copied: framework/trunk/src/test/resources/jbws1798/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1807 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1807) Copied: framework/trunk/src/test/resources/jbws1807/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1807/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1809 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1809) Copied: framework/trunk/src/test/resources/jbws1809/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1809/META-INF) Copied: framework/trunk/src/test/resources/jbws1813 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1813) Copied: framework/trunk/src/test/resources/jbws1813/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1813/META-INF) Copied: framework/trunk/src/test/resources/jbws1815 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1815) Copied: framework/trunk/src/test/resources/jbws1815/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1815/META-INF) Copied: framework/trunk/src/test/resources/jbws1822 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1822) Copied: framework/trunk/src/test/resources/jbws1822/one-ejb-module (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1822/one-ejb-module) Copied: framework/trunk/src/test/resources/jbws1822/two-ejb-modules (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1822/two-ejb-modules) Copied: framework/trunk/src/test/resources/jbws1841 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1841) Copied: framework/trunk/src/test/resources/jbws1841/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1841/META-INF) Deleted: framework/trunk/src/test/resources/jbws1841/application.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1841/application.xml 2008-04-03 18:17:05 UTC (rev 6221) +++ framework/trunk/src/test/resources/jbws1841/application.xml 2008-04-04 10:54:10 UTC (rev 6228) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'> - -<application> - <module> - <ejb>jsr181.jar</ejb> - </module> - - <module> - <ejb>jsr181-client.jar</ejb> - </module> -</application> - - Copied: framework/trunk/src/test/resources/jbws1841/application.xml (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1841/application.xml) =================================================================== --- framework/trunk/src/test/resources/jbws1841/application.xml (rev 0) +++ framework/trunk/src/test/resources/jbws1841/application.xml 2008-04-04 10:54:10 UTC (rev 6228) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'> + +<application> + <module> + <ejb>jsr181.jar</ejb> + </module> + + <module> + <ejb>jsr181-client.jar</ejb> + </module> +</application> + + Copied: framework/trunk/src/test/resources/jbws1843 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1843) Copied: framework/trunk/src/test/resources/jbws1843/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1843/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1854 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1854) Copied: framework/trunk/src/test/resources/jbws1854/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1854/META-INF) Copied: framework/trunk/src/test/resources/jbws1854/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1854/WEB-INF) Copied: framework/trunk/src/test/resources/jbws1969 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws1969) Copied: framework/trunk/src/test/resources/jbws1969/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws1969/META-INF) Copied: framework/trunk/src/test/resources/jbws2009 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws2009) Copied: framework/trunk/src/test/resources/jbws2009/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws2009/WEB-INF) Copied: framework/trunk/src/test/resources/jbws860 (from rev 6221, stack/native/trunk/src/test/resources/jaxws/jbws860) Copied: framework/trunk/src/test/resources/jbws860/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/jbws860/WEB-INF) Copied: framework/trunk/src/test/resources/namespace (from rev 6221, stack/native/trunk/src/test/resources/jaxws/namespace) Copied: framework/trunk/src/test/resources/namespace/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/namespace/WEB-INF) Copied: framework/trunk/src/test/resources/webfault (from rev 6221, stack/native/trunk/src/test/resources/jaxws/webfault) Copied: framework/trunk/src/test/resources/webfault/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/webfault/WEB-INF) Copied: framework/trunk/src/test/resources/webserviceref (from rev 6221, stack/native/trunk/src/test/resources/jaxws/webserviceref) Copied: framework/trunk/src/test/resources/webserviceref/META-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF) Copied: framework/trunk/src/test/resources/webserviceref/META-INF-override (from rev 6227, stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override) Copied: framework/trunk/src/test/resources/webserviceref/META-INF-secure (from rev 6227, stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure) Copied: framework/trunk/src/test/resources/webserviceref/WEB-INF (from rev 6227, stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF) Copied: framework/trunk/src/test/resources/webserviceref/WEB-INF-client (from rev 6227, stack/native/trunk/src/test/resources/jaxws/webserviceref/WEB-INF-client) Copied: framework/trunk/src/test/resources/wrapped (from rev 6221, stack/native/trunk/src/test/resources/jaxws/wrapped) Copied: framework/trunk/src/test/resources/wrapped/accessor (from rev 6227, stack/native/trunk/src/test/resources/jaxws/wrapped/accessor)

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6227 - framework/trunk/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 06:48:45 -0400 (Fri, 04 Apr 2008) New Revision: 6227 Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml Log: [JBWS-2096] Migrate common jax-ws tests to framework (WIP) Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-04 09:59:55 UTC (rev 6226) +++ framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-04 10:48:45 UTC (rev 6227) @@ -20,6 +20,537 @@ <mkdir dir="${tests.output.dir}/libs"/> +  + <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/> + <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/> + <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/> + <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/> + </classes> + </war> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-classloading-service.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.class"/> + </fileset> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-classloading-types.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Message.class"/> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Echo.class"/> + <include name="org/jboss/test/ws/jaxws/smoke/tools/service/EchoResponse.class"/> + </fileset> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/complex/*.class"/> + <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/> + <include name="org/jboss/test/ws/jaxws/complex/types/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/complex/*TestCase.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/> + <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/> + <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.class"/> + </fileset> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/> + </fileset> + </jar> + +  + <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/> + </classes> + </war> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1283.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1283/*.*"/> + </fileset> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/> + </classes> + <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357"> + <include name="hello.jsp"/> + </fileset> + </war> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1422.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1422/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1422/*TestCase.class"/> + </fileset> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1446.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.class"/> + </fileset> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1505.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1505/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1505/*TestCase.class"/> + </fileset> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/> + </classes> + </war> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1556/UserType.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.ear"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-jbws1556.jar"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1556/META-INF"> + <include name="application.xml"/> + <include name="jboss-app.xml"/> + </metainf> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/> + </fileset> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.ear"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-jbws1581.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <include name="application.xml"/> + <include name="jboss-app.xml"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jaxws/jbws1611/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.class"/> + </classes> + </war> + +  + <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jaxws/jbws1666/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/> + </classes> + </war> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1694.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1694/**/*.class"/> + </fileset> + </jar> + +  + <war destfile="${tests.output.dir}/libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1702/**/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF"/> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/resources/jaxws/jbws1733/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.class"/> + </classes> + </war> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1762/services/EJB3Bean.class"/> + </fileset> + </jar> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> + <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> + <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.war"/> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.sar"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-jbws1762-packaged.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> + <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> + <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-jbws1762-packaged.jar"/> + <include name="jaxws-jbws1762-packaged.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged"> + <include name="application.xml"/> + </metainf> + </jar> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/> + <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> + <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> + <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/> + <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/> + +  + <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jaxws/jbws1797/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1797/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1797/*TestCase.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1798/**/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1798/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1799.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1799/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1799/*TestCase.class"/> + </fileset> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1809.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1809/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1809/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1809/META-INF"/> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1813.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> + <include name="jboss.xml"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1813.ear"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-jbws1813.jar"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> + <include name="application.xml"/> + </metainf> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1815.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1815/META-INF"> + <include name="wsdl/my-service.wsdl"/> + </metainf> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> + </fileset> + </jar> + <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml" + earfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb-modules.ear"> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF"> + <include name="jboss-app.xml"/> + </metainf> + <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar" /> + <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar" /> + </ear> + <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml" + earfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb-module.ear"> + <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar" /> + </ear> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1840.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.class"/> + </fileset> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1841.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1841/META-INF"> + <include name="wsdl/*"/> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1843/**/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1843/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1845.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1845/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1845/*TestCase.class"/> + </fileset> + </jar> + +  + <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1854.sar"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-jbws1854.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1854/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1872.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1872/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1872/*TestCase*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1872/ClientIface.class"/> + </fileset> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1904.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1904/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1904/*TestCase.class"/> + </fileset> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1909.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1909/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1909/*TestCase.class"/> + </fileset> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1969.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1969/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1969/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1969/META-INF"> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws2000.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws2000/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2000/*TestCase.class"/> + </fileset> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws2009/**/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws2009/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF"> + <include name="wsdl/**"/> + <include name="schema/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -349,6 +880,16 @@ </fileset> </jar> +  + <war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/jaxws/webfault/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webfault/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/webfault/CustomException.class"/> + <include name="org/jboss/test/ws/jaxws/webfault/SimpleException.class"/> + </classes> + </war> +  <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -414,20 +955,141 @@ </classes> </war> - <jar destfile="${tests.output.dir}/libs/jaxws-classloading-service.jar"> +  + <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> + </manifest> </jar> - - <jar destfile="${tests.output.dir}/libs/jaxws-classloading-types.jar"> + <war destfile="${tests.output.dir}/libs/jaxws-webserviceref-servlet-client.war" + webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-ejb3-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Message.class"/> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/Echo.class"/> - <include name="org/jboss/test/ws/jaxws/smoke/tools/service/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Client.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Remote.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <include name="jboss.xml"/> + <include name="wsdl/**"/> + </metainf> </jar> - + <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/> + </fileset> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/> + </manifest> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-override-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> + <include name="jbossws-client-config.xml"/> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/> + </manifest> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/> + </fileset> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-secure-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/> + </manifest> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-webserviceref-override-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> + <include name="jbossws-client-config.xml"/> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/> + </manifest> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/> + </classes> + </war> +  </target>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6226 - in stack/native/trunk: ant-import and 18 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 05:59:55 -0400 (Fri, 04 Apr 2008) New Revision: 6226 Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java Removed: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java stack/native/trunk/src/main/java/org/jboss/ws/core/utils/UUIDGenerator.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java Modified: stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java stack/native/trunk/version.properties Log: Add generic handlers to common Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-04 09:59:55 UTC (rev 6226) @@ -143,7 +143,10 @@  <path id="thirdparty.classpath"> -  +  <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> Deleted: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.handler; - -// $Id$ - -import javax.xml.ws.handler.Handler; -import javax.xml.ws.handler.MessageContext; - -/** - * A generic jaxws handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public abstract class GenericHandler implements Handler -{ - private String handlerName; - - public String getHandlerName() - { - return handlerName; - } - - public void setHandlerName(String handlerName) - { - this.handlerName = handlerName; - } - - public boolean handleMessage(MessageContext msgContext) - { - Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); - if (outbound == null) - throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY); - - return outbound ? handleOutbound(msgContext) : handleInbound(msgContext); - } - - protected boolean handleOutbound(MessageContext msgContext) - { - return true; - } - - protected boolean handleInbound(MessageContext msgContext) - { - return true; - } - - public boolean handleFault(MessageContext messagecontext) - { - return true; - } - - public void close(MessageContext messageContext) - { - } - - public String toString() - { - return (handlerName != null ? handlerName : super.toString()); - } -} Deleted: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericLogicalHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.handler; - -// $Id$ - -import javax.xml.ws.handler.LogicalHandler; -import javax.xml.ws.handler.LogicalMessageContext; - -/** - * A generic jaxws logical handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public class GenericLogicalHandler<C extends LogicalMessageContext> extends GenericHandler implements LogicalHandler -{ -} Deleted: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/GenericSOAPHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -1,58 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws.handler; - -// $Id$ - -import java.util.HashSet; -import java.util.Set; - -import javax.xml.namespace.QName; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; - - -/** - * A generic jaxws soap handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Aug-2006 - */ -public abstract class GenericSOAPHandler<C extends LogicalMessageContext> extends GenericHandler implements SOAPHandler -{ - // The header blocks that can be processed by this Handler instance - private Set<QName> headers = new HashSet<QName>(); - - /** Gets the header blocks that can be processed by this Handler instance. - */ - public Set<QName> getHeaders() - { - return headers; - } - - /** Sets the header blocks that can be processed by this Handler instance. - */ - public void setHeaders(Set<QName> headers) - { - this.headers = headers; - } -} Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -49,6 +49,8 @@ import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; import org.jboss.ws.metadata.umdm.ServiceMetaData; +import org.jboss.wsf.common.handler.GenericHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -27,7 +27,7 @@ import java.net.URLEncoder; import org.jboss.logging.Logger; -import org.jboss.ws.core.utils.UUIDGenerator; +import org.jboss.wsf.common.utils.UUIDGenerator; /** * A common CID generator Deleted: stack/native/trunk/src/main/java/org/jboss/ws/core/utils/UUIDGenerator.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/utils/UUIDGenerator.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/utils/UUIDGenerator.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -1,121 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.core.utils; - -import java.security.SecureRandom; - -/** - * Generates the string form of IETF variant UUIDs. - * - * See <a href="http://www.ietf.org/internet-drafts/draft-mealling-uuid-urn-05.txt"> - * the latest IETF draft</a> for more information about UUID generation. - * - * Currently only pseudo random (type 4) UUIDs are supported. - * - * @author <a href="mailto:jason@stacksmash.com">Jason T. Greene</a> - */ -public class UUIDGenerator -{ - private static SecureRandom rand; - - private static String bytesToHex(byte[] buffer, int offset, int length) - { - long value = 0; - for (int i = 0, countDown = 8 * length; i < length; i++) - { - value |= (buffer[offset + i] & 0xffL) << (countDown -= 8); - } - - return Long.toHexString(value); - } - - /** - * Generates a pseudo random UUID and returns it in byte array form. - * - * @return a UUID byte array in network order - */ - public static byte[] generateRandomUUIDBytes() - { - if (rand == null) - rand = new SecureRandom(); - - byte[] buffer = new byte[16]; - rand.nextBytes(buffer); - - // Set version to 3 (Random) - buffer[6] = (byte) ((buffer[6] & 0x0f) | 0x40); - // Set variant to 2 (IETF) - buffer[8] = (byte) ((buffer[8] & 0x3f) | 0x80); - - return buffer; - } - - /** - * Generates a pseudo random UUID and returns it the IETF specified - * String form. See {@link #convertToString(byte[])} for a description - * of the format. - * - * @return a UUID in IETF string form. - */ - public static String generateRandomUUIDString() - { - return convertToString(generateRandomUUIDBytes()); - } - - /** - * Converts a UUID in byte array form to the IETF string format. - * - * <p>The BNF follows: - * <pre> - * UUID = <time_low> "-" <time_mid> "-" - * <time_high_and_version> "-" - * <variant_and_sequence> "-" - * <node> - * time_low = 4*<hexOctet> - * time_mid = 2*<hexOctet> - * time_high_and_version = 2*<hexOctet> - * variant_and_sequence = 2*<hexOctet> - * node = 6*<hexOctet> - * hexOctet = <hexDigit><hexDigit> - * hexDigit = - * "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" - * | "a" | "b" | "c" | "d" | "e" | "f" - * | "A" | "B" | "C" | "D" | "E" | "F" - * </pre> - * - * @param uuid a 16 byte - * @return the IETF string form of the passed UUID - */ - public static String convertToString(byte[] uuid) - { - if (uuid.length != 16) - throw new IllegalArgumentException("A UUID must be 16 bytes!"); - - String string = bytesToHex(uuid, 0, 4) + "-" - + bytesToHex(uuid, 4, 2) + "-" - + bytesToHex(uuid, 6, 2) + "-" - + bytesToHex(uuid, 8, 2) + "-" - + bytesToHex(uuid, 10, 6); - - return string; - } -} \ No newline at end of file Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/AddressingClientUtil.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -9,7 +9,7 @@ import javax.xml.ws.addressing.AddressingProperties; import javax.xml.ws.addressing.AttributedURI; -import org.jboss.ws.core.utils.UUIDGenerator; +import org.jboss.wsf.common.utils.UUIDGenerator; /** * @author Heiko Braun, <heiko(a)openj.net> Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -26,7 +26,7 @@ import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; import javax.xml.namespace.QName; import javax.xml.soap.SOAPException; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -23,10 +23,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.wsf.common.handler.GenericSOAPHandler; import javax.xml.namespace.QName; import javax.xml.soap.SOAPMessage; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -54,7 +54,6 @@ import org.jboss.logging.Logger; import org.jboss.util.naming.Util; import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.UUIDGenerator; import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType; @@ -62,6 +61,7 @@ import org.jboss.ws.extensions.eventing.jaxws.ReferenceParametersType; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.DOMWriter; +import org.jboss.wsf.common.utils.UUIDGenerator; import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.SAXException; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -36,7 +36,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; @@ -44,6 +43,7 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; +import org.jboss.wsf.common.handler.GenericSOAPHandler; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -43,7 +43,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.client.ClientImpl; -import org.jboss.ws.core.utils.UUIDGenerator; import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.api.RMException; @@ -51,6 +50,7 @@ import org.jboss.ws.extensions.wsrm.protocol.RMProvider; import org.jboss.ws.extensions.wsrm.protocol.spi.RMIncompleteSequenceBehavior; import org.jboss.ws.extensions.wsrm.transport.RMUnassignedMessageListener; +import org.jboss.wsf.common.utils.UUIDGenerator; /** * Client side implementation of the RM sequence Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -29,12 +29,12 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.wsrm.RMFault; import org.jboss.ws.extensions.wsrm.RMSequence; import org.jboss.ws.extensions.wsrm.api.RMException; import org.jboss.ws.extensions.wsrm.protocol.spi.RMSerializable; +import org.jboss.wsf.common.handler.GenericSOAPHandler; /** * RM generic JAX-WS handler Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -1,96 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.binding; - -import junit.framework.TestCase; - -import org.jboss.ws.core.jaxws.JAXBBindingCustomization; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.binding.BindingCustomization; -import org.jboss.wsf.spi.deployment.DeploymentModelFactory; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Endpoint.EndpointState; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jun 28, 2007 - */ -public class BindingCustomizationTestCase extends TestCase { - - DeploymentModelFactory deploymentModelFactory; - - protected void setUp() throws Exception - { - super.setUp(); - - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - } - - public void testCustomizationWriteAccess() throws Exception - { - Endpoint endpoint = deploymentModelFactory.newEndpoint(null); - JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); - jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - - // a started endpoint should deny customizations - try - { - endpoint.setState(EndpointState.STARTED); - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - - fail("It should not be possible to change bindinig customizations on a started endpoint"); - } - catch (Exception e) - { - // all fine, this should happen - } - } - - public void testCustomizationReadAccess() throws Exception - { - Endpoint endpoint = deploymentModelFactory.newEndpoint(null); - JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); - jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - endpoint.setState(EndpointState.STARTED); - - // read a single customization - BindingCustomization knownCustomization = endpoint.getAttachment(BindingCustomization.class); - assertNotNull(knownCustomization); - - // however the iteratoion should be unmodifiable - try - { - endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); - fail("Started Endpoints should only axpose read acccess to their binding customizations"); - } - catch (Exception e) - { - // all fine, we'd expect this - } - - - } -} Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -29,7 +29,7 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; /** * A client side handler Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -30,7 +30,7 @@ import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; /** * A client side handler Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -28,7 +28,7 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; public class ProtocolHandler extends GenericSOAPHandler { Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java (from rev 6221, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -0,0 +1,96 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxbcust; + +import junit.framework.TestCase; + +import org.jboss.ws.core.jaxws.JAXBBindingCustomization; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.binding.BindingCustomization; +import org.jboss.wsf.spi.deployment.DeploymentModelFactory; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointState; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jun 28, 2007 + */ +public class BindingCustomizationTestCase extends TestCase { + + DeploymentModelFactory deploymentModelFactory; + + protected void setUp() throws Exception + { + super.setUp(); + + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + } + + public void testCustomizationWriteAccess() throws Exception + { + Endpoint endpoint = deploymentModelFactory.newEndpoint(null); + JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); + jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); + + // a started endpoint should deny customizations + try + { + endpoint.setState(EndpointState.STARTED); + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); + + fail("It should not be possible to change bindinig customizations on a started endpoint"); + } + catch (Exception e) + { + // all fine, this should happen + } + } + + public void testCustomizationReadAccess() throws Exception + { + Endpoint endpoint = deploymentModelFactory.newEndpoint(null); + JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); + jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); + endpoint.setState(EndpointState.STARTED); + + // read a single customization + BindingCustomization knownCustomization = endpoint.getAttachment(BindingCustomization.class); + assertNotNull(knownCustomization); + + // however the iteratoion should be unmodifiable + try + { + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); + fail("Started Endpoints should only axpose read acccess to their binding customizations"); + } + catch (Exception e) + { + // all fine, we'd expect this + } + + + } +} Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.jbws1283; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; import javax.activation.DataHandler; import javax.xml.soap.AttachmentPart; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -22,7 +22,8 @@ package org.jboss.test.ws.jaxws.jbws1283; import junit.framework.Test; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; + +import org.jboss.wsf.common.handler.GenericSOAPHandler; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -36,9 +36,9 @@ import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; -import org.jboss.ws.core.utils.UUIDGenerator; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.utils.UUIDGenerator; +import org.jboss.wsf.common.handler.GenericSOAPHandler; /** * A client side handler for the ws-addressing Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -34,8 +34,8 @@ import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.handler.GenericSOAPHandler; /** * A server side handler for the ws-addressing Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -31,7 +31,7 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericHandler; +import org.jboss.wsf.common.handler.GenericHandler; /** * A client side handler that disables mustUnderstand processing Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -29,7 +29,7 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.ws.core.jaxws.handler.GenericHandler; +import org.jboss.wsf.common.handler.GenericHandler; /** * A client side handler for the ws-addressing Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -33,7 +33,7 @@ import org.jboss.logging.Logger; import org.jboss.test.ws.jaxws.wsaddressing.AddressingHandler; -import org.jboss.ws.core.utils.UUIDGenerator; +import org.jboss.wsf.common.utils.UUIDGenerator; /** * A client side handler for the ws-addressing Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2008-04-04 09:59:55 UTC (rev 6226) @@ -23,7 +23,7 @@ import org.jboss.ws.core.soap.TextImpl; import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; +import org.jboss.wsf.common.handler.GenericSOAPHandler; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-04-04 09:55:44 UTC (rev 6225) +++ stack/native/trunk/version.properties 2008-04-04 09:59:55 UTC (rev 6226) @@ -25,8 +25,8 @@ # Dependend integration projects jbossws-spi=1.0.2.GA -jbossws-common=1.0.4.GA -jbossws-framework=3.0.1.GA +jbossws-common=snapshot +jbossws-framework=snapshot jbossws-jboss42=4.2.1.GA # JBossAS-5.0

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6225 - in common/trunk/src/main/java/org/jboss/wsf/common: handler and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 05:55:44 -0400 (Fri, 04 Apr 2008) New Revision: 6225 Added: common/trunk/src/main/java/org/jboss/wsf/common/handler/ common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericHandler.java common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericLogicalHandler.java common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericSOAPHandler.java Log: Add generic handlers to common Copied: common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericHandler.java (from rev 6222, framework/trunk/src/main/java/org/jboss/wsf/framework/handler/GenericHandler.java) =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericHandler.java (rev 0) +++ common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericHandler.java 2008-04-04 09:55:44 UTC (rev 6225) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.common.handler; + +// $Id$ + +import javax.xml.ws.handler.Handler; +import javax.xml.ws.handler.MessageContext; + +/** + * A generic jaxws handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 13-Aug-2006 + */ +public abstract class GenericHandler implements Handler +{ + private String handlerName; + + public String getHandlerName() + { + return handlerName; + } + + public void setHandlerName(String handlerName) + { + this.handlerName = handlerName; + } + + public boolean handleMessage(MessageContext msgContext) + { + Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); + if (outbound == null) + throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY); + + return outbound ? handleOutbound(msgContext) : handleInbound(msgContext); + } + + protected boolean handleOutbound(MessageContext msgContext) + { + return true; + } + + protected boolean handleInbound(MessageContext msgContext) + { + return true; + } + + public boolean handleFault(MessageContext messagecontext) + { + return true; + } + + public void close(MessageContext messageContext) + { + } + + public String toString() + { + return (handlerName != null ? handlerName : super.toString()); + } +} Copied: common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericLogicalHandler.java (from rev 6222, framework/trunk/src/main/java/org/jboss/wsf/framework/handler/GenericLogicalHandler.java) =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericLogicalHandler.java (rev 0) +++ common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericLogicalHandler.java 2008-04-04 09:55:44 UTC (rev 6225) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.common.handler; + +// $Id$ + +import javax.xml.ws.handler.LogicalHandler; +import javax.xml.ws.handler.LogicalMessageContext; + + + +/** + * A generic jaxws logical handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 13-Aug-2006 + */ +public class GenericLogicalHandler<C extends LogicalMessageContext> extends GenericHandler implements LogicalHandler +{ +} Copied: common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericSOAPHandler.java (from rev 6222, framework/trunk/src/main/java/org/jboss/wsf/framework/handler/GenericSOAPHandler.java) =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericSOAPHandler.java (rev 0) +++ common/trunk/src/main/java/org/jboss/wsf/common/handler/GenericSOAPHandler.java 2008-04-04 09:55:44 UTC (rev 6225) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.common.handler; + +// $Id$ + +import java.util.HashSet; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.ws.handler.LogicalMessageContext; +import javax.xml.ws.handler.soap.SOAPHandler; + + +/** + * A generic jaxws soap handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 13-Aug-2006 + */ +public abstract class GenericSOAPHandler<C extends LogicalMessageContext> extends GenericHandler implements SOAPHandler +{ + // The header blocks that can be processed by this Handler instance + private Set<QName> headers = new HashSet<QName>(); + + /** Gets the header blocks that can be processed by this Handler instance. + */ + public Set<QName> getHeaders() + { + return headers; + } + + /** Sets the header blocks that can be processed by this Handler instance. + */ + public void setHeaders(Set<QName> headers) + { + this.headers = headers; + } +}

16 years, 9 months

1
0
0 / 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2008