February 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15792 - in stack/native/branches/jbossws-native-4.0.x: modules/testsuite and 23 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-29 10:23:28 -0500 (Wed, 29 Feb 2012) New Revision: 15792 Added: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml Removed: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15787-15789,15791 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15787 | ropalka | 2012-02-29 11:01:09 +0100 (Wed, 29 Feb 2012) | 1 line [JBWS-3444] enable appclient tests (WIP) ....... r15788 | ropalka | 2012-02-29 13:54:42 +0100 (Wed, 29 Feb 2012) | 1 line [JBWS-3444] enable appclient tests (WIP) ....... r15789 | ropalka | 2012-02-29 14:43:01 +0100 (Wed, 29 Feb 2012) | 1 line [JBWS-3444] enable appclient tests (WIP) ....... r15791 | ropalka | 2012-02-29 16:13:39 +0100 (Wed, 29 Feb 2012) | 1 line [AS7-3444] enabling appclient tests (WIP) ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791 Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -1033,10 +1033,14 @@ <include name="wsdl/**"/> </metainf> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws358/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1044,15 +1048,17 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws358-appclient.jar"/> + </fileset> + </jar> <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar"/> <unjar dest="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar" src="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar"/> <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear"> <fileset dir="${tests.output.dir}/test-resources/jaxrpc/jbws358"> <include name="META-INF/application.xml"/> </fileset> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws358-client.jar"/> - </fileset> </copy>  @@ -1554,12 +1560,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663b-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663b-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663b/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1569,6 +1579,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663b-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws663b-appclient.jar"/> + </fileset> + </jar> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663bb.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663bb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> @@ -1581,12 +1596,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663bb-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663bb-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663bb/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1596,6 +1615,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663bb-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws663bb-appclient.jar"/> + </fileset> + </jar> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663w.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663w/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> @@ -1608,12 +1632,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663w-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663w-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663w/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1623,6 +1651,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663w-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws663w-appclient.jar"/> + </fileset> + </jar> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663wb.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663wb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> @@ -1635,12 +1668,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663wb-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663wb-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663wb/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1650,6 +1687,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663wb-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws663wb-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws706.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws706/WEB-INF/web.xml"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -859,19 +859,6 @@ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class" /> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial-cl.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/Initial-META-INF"> - <include name="application-client.xml" /> - <include name="jboss-client.xml" /> - <include name="jaxws-jbossws-client-config.xml" /> - <include name="jaxrpc-mapping.xml" /> - </metainf> - </jar> <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class" /> @@ -880,26 +867,38 @@ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class" /> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto-cl.jar"> + <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> + </classes> + </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.class" /> </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF"> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.wsaddressing.replyto.ApplicationClient" /> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core,org.jboss.ws.common" /> + </manifest> + <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/appclient/META-INF"> <include name="application-client.xml" /> <include name="jboss-client.xml" /> - <include name="jbossws-client-config.xml" /> <include name="jaxrpc-mapping.xml" /> </metainf> </jar> - <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> - </classes> - </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-wsaddressing-appclient.jar"/> + </fileset> + </jar> </target> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -108,11 +108,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-dynamichandler-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-dynamichandler-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/dynamichandler/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -122,6 +126,11 @@ <include name="jboss-client.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-dynamichandler-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-dynamichandler-appclient.jar"/> + </fileset> + </jar>  <war destfile="${tests.output.dir}/test-libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/exception/WEB-INF/web.xml"> @@ -584,21 +593,6 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-store-pass-encrypt-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml"> @@ -626,14 +620,18 @@ <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -647,6 +645,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-wsaddr-hello-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> @@ -668,11 +671,15 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-sign/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -683,6 +690,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-wssecurity-sign-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt.war" @@ -705,11 +717,15 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -720,6 +736,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-wssecurity-encrypt-appclient.jar"/> + </fileset> + </jar>  Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -26,7 +26,10 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; +import junit.framework.Test; + import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; @@ -40,19 +43,34 @@ */ public class JBWS358TestCase extends JBossWSTest { + public static Test suite() + { + return new JBossWSTestSetup(JBWS358TestCase.class, "jaxrpc-jbws358-appclient.ear#jaxrpc-jbws358-appclient.jar"); + } + public void testClientAccess() throws Exception { Hello endpoint = null; try { deploy("jaxrpc-jbws358.ear"); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + endpoint = (Hello)service.getPort(Hello.class); - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - endpoint = (Hello)service.getPort(Hello.class); - - String retStr = endpoint.hello("Hello Server"); - assertEquals("Hello Server", retStr); + String retStr = endpoint.hello("Hello Server"); + assertEquals("Hello Server", retStr); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } finally { Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -42,11 +42,12 @@ public class JBWS663BareBoundTestCase extends JBossWSTest { private static SMSTextMessagingSoapBareBound port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663BareBoundTestCase.class, "jaxrpc-jbws663bb.war, jaxrpc-jbws663bb-client.jar"); + return new JBossWSTestSetup(JBWS663BareBoundTestCase.class, "jaxrpc-jbws663bb.war, jaxrpc-jbws663bb-appclient.ear#jaxrpc-jbws663bb-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/SMSService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/SMSService"); port = (SMSTextMessagingSoapBareBound)service.getPort(SMSTextMessagingSoapBareBound.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCreateService() throws Exception { assertNotNull("port not null", port); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -42,11 +42,12 @@ public class JBWS663BareUnboundTestCase extends JBossWSTest { private static SMSTextMessagingSoapBare port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663BareUnboundTestCase.class, "jaxrpc-jbws663b.war, jaxrpc-jbws663b-client.jar"); + return new JBossWSTestSetup(JBWS663BareUnboundTestCase.class, "jaxrpc-jbws663b.war, jaxrpc-jbws663b-appclient.ear#jaxrpc-jbws663b-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/SMSService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/SMSService"); port = (SMSTextMessagingSoapBare)service.getPort(SMSTextMessagingSoapBare.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCreateService() throws Exception { assertNotNull("port not null", port); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -42,11 +42,12 @@ public class JBWS663WrappedBoundTestCase extends JBossWSTest { private static SMSTextMessagingSoapWrappedBound port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663WrappedBoundTestCase.class, "jaxrpc-jbws663wb.war, jaxrpc-jbws663wb-client.jar"); + return new JBossWSTestSetup(JBWS663WrappedBoundTestCase.class, "jaxrpc-jbws663wb.war, jaxrpc-jbws663wb-appclient.ear#jaxrpc-jbws663wb-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/SMSService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/SMSService"); port = (SMSTextMessagingSoapWrappedBound)service.getPort(SMSTextMessagingSoapWrappedBound.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCreateService() throws Exception { assertNotNull("port not null", port); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -42,11 +42,12 @@ public class JBWS663WrappedUnboundTestCase extends JBossWSTest { private static SMSTextMessagingSoapWrapped port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663WrappedUnboundTestCase.class, "jaxrpc-jbws663w.war, jaxrpc-jbws663w-client.jar"); + return new JBossWSTestSetup(JBWS663WrappedUnboundTestCase.class, "jaxrpc-jbws663w.war, jaxrpc-jbws663w-appclient.ear#jaxrpc-jbws663w-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/SMSService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/SMSService"); port = (SMSTextMessagingSoapWrapped)service.getPort(SMSTextMessagingSoapWrapped.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCreateService() throws Exception { assertNotNull("port not null", port); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -48,24 +48,34 @@ private static ServiceExt service; private static HandlerTestService endpoint; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(DynamicHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-client.jar"); + return new JBossWSTestSetup(DynamicHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-appclient.ear#jaxrpc-samples-dynamichandler-appclient.jar"); } protected void setUp() throws Exception { super.setUp(); - if (endpoint == null) { - InitialContext iniCtx = getInitialContext(); - service = (ServiceExt)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + service = (ServiceExt)iniCtx.lookup("java:service/TestService"); endpoint = (HandlerTestService)service.getPort(HandlerTestService.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testStaticHandlers() throws Exception { String res = endpoint.testHandlers("InitalMessage"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -40,10 +40,11 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-dynamichandler"; private static HandlerTestService endpoint; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(StaticHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-client.jar"); + return new JBossWSTestSetup(StaticHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-appclient.ear#jaxrpc-samples-dynamichandler-appclient.jar"); } protected void setUp() throws Exception @@ -52,12 +53,22 @@ if (endpoint == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); endpoint = (HandlerTestService)service.getPort(HandlerTestService.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testHandlers() throws Exception { String res = endpoint.testHandlers("InitalMessage"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -24,7 +24,7 @@ import java.io.ByteArrayInputStream; import java.net.URL; -import javax.xml.namespace.QName; +import javax.naming.InitialContext; import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPConnection; @@ -46,12 +46,13 @@ { private static Hello initial; private static ReplyTo replyto; + private static InitialContext iniCtx; public static Test suite() { return new JBossWSTestSetup(AddressingReplyToTestCase.class, "jaxrpc-samples-wsaddr-hello.war, jaxrpc-samples-wsaddr-replyto.war," + - "jaxrpc-samples-wsaddr-hello-client.jar"); + "jaxrpc-samples-wsaddr-hello-appclient.jar#jaxrpc-samples-wsaddr-hello-appclient.jar"); } protected void setUp() throws Exception @@ -60,13 +61,24 @@ if (initial == null) { - Service replytoService = (Service)getInitialContext("jaxrpc-addressing-replyto-client").lookup("java:comp/env/service/ReplyToService"); + iniCtx = getAppclientInitialContext(); + Service replytoService = (Service)iniCtx.lookup("java:service/ReplyToService"); replyto = (ReplyTo)replytoService.getPort(ReplyTo.class); - Service initialService = (Service)getInitialContext("jaxrpc-addressing-replyto-client").lookup("java:comp/env/service/HelloService"); + Service initialService = (Service)iniCtx.lookup("java:service/HelloService"); initial = (Hello)initialService.getPort(Hello.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again. */ public void testReplyToMessage() throws Exception Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -42,7 +42,8 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(SimpleEncryptTestCase.class, "jaxrpc-samples-wssecurity-encrypt.war, jaxrpc-samples-wssecurity-encrypt-client.jar"); + return new JBossWSTestSetup(SimpleEncryptTestCase.class, "jaxrpc-samples-wssecurity-encrypt.war, " + + "jaxrpc-samples-wssecurity-encrypt-appclient.ear#jaxrpc-samples-wssecurity-encrypt-appclient.jar"); } /** @@ -59,9 +60,20 @@ private Hello getPort() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello port = (Hello)service.getPort(Hello.class); - return port; + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello port = (Hello)service.getPort(Hello.class); + return port; + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -42,7 +42,8 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(SimpleSignTestCase.class, "jaxrpc-samples-wssecurity-sign.war, jaxrpc-samples-wssecurity-sign-client.jar"); + return new JBossWSTestSetup(SimpleSignTestCase.class, "jaxrpc-samples-wssecurity-sign.war, " + + "jaxrpc-samples-wssecurity-sign-appclient.ear#jaxrpc-samples-wssecurity-sign-appclient.jar"); } /** @@ -59,9 +60,20 @@ private Hello getPort() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello port = (Hello)service.getPort(Hello.class); - return port; + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello port = (Hello)service.getPort(Hello.class); + return port; + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -44,7 +44,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(StorePassEncryptTestCase.class, "jaxrpc-samples-store-pass-encrypt.war, jaxrpc-samples-store-pass-encrypt-client.jar"); + return new JBossWSTestSetup(StorePassEncryptTestCase.class, "jaxrpc-samples-store-pass-encrypt.war"); } public void setUp() throws Exception Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -21,19 +21,13 @@ */ package org.jboss.test.ws.jaxws.wsaddressing.replyto; -import java.io.ByteArrayInputStream; -import java.net.URL; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPMessage; - import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -46,122 +40,30 @@ */ public class AddressingReplyToTestCase extends JBossWSTest { - private static InitialEndpoint initial; - private static ReplyToEndpoint replyto; - private static FaultToEndpoint faultto; public static Test suite() { return new JBossWSTestSetup(AddressingReplyToTestCase.class, - "jaxws-wsaddressing-initial.war,jaxws-wsaddressing-initial-cl.jar," + - "jaxws-wsaddressing-replyto.war,jaxws-wsaddressing-replyto-cl.jar," + + "jaxws-wsaddressing-initial.war," + + "jaxws-wsaddressing-replyto.war," + "jaxws-wsaddressing-faultto.war"); } - protected void setUp() throws Exception + public void testApplicationClient() throws Exception { - super.setUp(); - - if (initial == null) - { - Service initialService = (Service)getInitialContext("initial-client").lookup("java:comp/env/service/InitialService"); - initial = (InitialEndpoint)initialService.getPort(InitialEndpoint.class); - Service replytoService = (Service)getInitialContext("replyto-client").lookup("java:comp/env/service/ReplyToService"); - replyto = (ReplyToEndpoint)replytoService.getPort(ReplyToEndpoint.class); - - String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-wsaddressing-faultto/FaultToService"; - QName serviceName = new QName("http://org.jboss.ws/addressing/replyto", "FaultToEndpointService"); - javax.xml.ws.Service service = javax.xml.ws.Service.create(new URL(endpointAddress + "?wsdl"), serviceName); - faultto = (FaultToEndpoint) service.getPort(FaultToEndpoint.class); + final String appclientArg = getServerHost();; + final OutputStream appclientOS = new ByteArrayOutputStream(); + JBossWSTestHelper.deployAppclient("jaxws-wsaddressing-appclient.ear#jaxws-wsaddressing-appclient.jar", appclientOS, appclientArg); + // wait till appclient stops + String appclientLog = appclientOS.toString(); + while (!appclientLog.contains("stopped in")) { + Thread.sleep(100); + appclientLog = appclientOS.toString(); } + // assert appclient logs + assertTrue(!appclientLog.contains("APPCLIENT TEST FAILURE")); + assertTrue(appclientLog.contains("TEST START")); + assertTrue(appclientLog.contains("TEST END")); } - public void testScenario() throws Exception - { - _testReplyToMessage(); - _testFaultToMessage(); - _testInital(); - _testReplyTo(); - _testFaultTo(); - } - - /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again. - */ - public void _testReplyToMessage() throws Exception - { - String reqEnv = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + - " <ns1:addItemResponse xmlns:ns1='http://org.jboss.ws/addressing/replyto'>" + - " <result>Mars Bar</result>" + - " </ns1:addItemResponse>" + - " </env:Body>" + - "</env:Envelope>"; - - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); - - URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-wsaddressing-replyto/ReplyToService"); - con.call(reqMsg, epURL); - - assertEquals("Mars Bar", replyto.getLastItem()); - } - - /** This sends a fault message to the FaultTo endpoint and verfies whether we can read it of again. - */ - public void _testFaultToMessage() throws Exception - { - String reqEnv = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + - " <env:Fault>" + - " <faultcode>env:Client</faultcode>" + - " <faultstring>java.lang.IllegalArgumentException: Mars Bar</faultstring>" + - " </env:Fault>" + - " </env:Body>" + - "</env:Envelope>"; - - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); - - URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-wsaddressing-faultto/FaultToService"); - con.call(reqMsg, epURL); - - assertEquals("java.lang.IllegalArgumentException: Mars Bar", faultto.getLastFault()); - } - - public void _testInital() throws Exception - { - String item = initial.addItem("Ice Cream"); - assertNull("Expected null, but was: " + item, item); - - item = initial.addItem("Invalid Value"); - assertNull("Expected null, but was: " + item, item); - } - - public void _testReplyTo() throws Exception - { - String item = replyto.getLastItem(); - assertEquals("Ice Cream", item); - } - - public void _testFaultTo() throws Exception - { - String lastFault = faultto.getLastFault(); - - /* JAX-WS 10.2.2.3: the fields of the fault message are populated according to - * the following rules of precedence: - * - * faultstring - * 1. SOAPFaultException.getFault().getFaultString() - * 2. Exception.getMessage() - * 3. Exception.toString() - * - * this test used to expect the value returned by toString() */ - assertEquals("Invalid Value", lastFault); - } } Copied: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java (from rev 15791, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java) =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java (rev 0) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java 2012-02-29 15:23:28 UTC (rev 15792) @@ -0,0 +1,162 @@ +/* + * 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.wsaddressing.replyto; + +import java.io.ByteArrayInputStream; +import java.net.URL; + +import javax.naming.InitialContext; +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; + + +/** + * Test endpoint using ws-addressing + * + * NOTE: This test uses a JAX-RPC client against a JAX-WS endpoint. + * + * @author Thomas.Diesler(a)jboss.org + */ +public class ApplicationClient +{ + private static InitialEndpoint initial; + private static ReplyToEndpoint replyto; + private static FaultToEndpoint faultto; + + protected static void init(final String serverHost) throws Exception + { + InitialContext iniCtx = new InitialContext(); + Service initialService = (Service)iniCtx.lookup("java:comp/env/service/InitialService"); + initial = (InitialEndpoint)initialService.getPort(InitialEndpoint.class); + Service replytoService = (Service)iniCtx.lookup("java:comp/env/service/ReplyToService"); + replyto = (ReplyToEndpoint)replytoService.getPort(ReplyToEndpoint.class); + + String endpointAddress = "http://" + serverHost + ":8080/jaxws-wsaddressing-faultto/FaultToService"; + QName serviceName = new QName("http://org.jboss.ws/addressing/replyto", "FaultToEndpointService"); + javax.xml.ws.Service service = javax.xml.ws.Service.create(new URL(endpointAddress + "?wsdl"), serviceName); + faultto = (FaultToEndpoint) service.getPort(FaultToEndpoint.class); + } + + public static void main(String[] args) throws Exception + { + System.out.println("TEST START"); + final String serverHost = args[0]; + init(serverHost); + _testReplyToMessage(serverHost); + _testFaultToMessage(serverHost); + _testInitial(); + _testReplyTo(); + _testFaultTo(); + System.out.println("TEST END"); + } + + /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again. + */ + private static void _testReplyToMessage(final String serverHost) throws Exception + { + String reqEnv = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header/>" + + " <env:Body>" + + " <ns1:addItemResponse xmlns:ns1='http://org.jboss.ws/addressing/replyto'>" + + " <result>Mars Bar</result>" + + " </ns1:addItemResponse>" + + " </env:Body>" + + "</env:Envelope>"; + + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); + + URL epURL = new URL("http://" + serverHost + ":8080/jaxws-wsaddressing-replyto/ReplyToService"); + con.call(reqMsg, epURL); + if (!"Mars Bar".equals(replyto.getLastItem())) + throw new WebServiceException("APPCLIENT TEST FAILURE"); + } + + /** This sends a fault message to the FaultTo endpoint and verfies whether we can read it of again. + */ + private static void _testFaultToMessage(final String serverHost) throws Exception + { + String reqEnv = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header/>" + + " <env:Body>" + + " <env:Fault>" + + " <faultcode>env:Client</faultcode>" + + " <faultstring>java.lang.IllegalArgumentException: Mars Bar</faultstring>" + + " </env:Fault>" + + " </env:Body>" + + "</env:Envelope>"; + + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); + + URL epURL = new URL("http://" + serverHost + ":8080/jaxws-wsaddressing-faultto/FaultToService"); + con.call(reqMsg, epURL); + + if (!"java.lang.IllegalArgumentException: Mars Bar".equals(faultto.getLastFault())) + throw new WebServiceException("APPCLIENT TEST FAILURE"); + } + + private static void _testInitial() throws Exception + { + String item = initial.addItem("Ice Cream"); + if (item != null) + throw new WebServiceException("APPCLIENT TEST FAILURE: Expected null, but was: " + item); + + item = initial.addItem("Invalid Value"); + if (item != null) + throw new WebServiceException("APPCLIENT TEST FAILURE: Expected null, but was: " + item); + } + + private static void _testReplyTo() throws Exception + { + String item = replyto.getLastItem(); + + if (!"Ice Cream".equals(item)) + throw new WebServiceException("APPCLIENT TEST FAILURE: Expected null, but was: " + item); + } + + private static void _testFaultTo() throws Exception + { + String lastFault = faultto.getLastFault(); + + /* JAX-WS 10.2.2.3: the fields of the fault message are populated according to + * the following rules of precedence: + * + * faultstring + * 1. SOAPFaultException.getFault().getFaultString() + * 2. Exception.getMessage() + * 3. Exception.toString() + * + * this test used to expect the value returned by toString() */ + if (!"Invalid Value".equals(lastFault)) + throw new WebServiceException("APPCLIENT TEST FAILURE"); + } +} Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -5,14 +5,13 @@ <display-name>Test Service</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws358.Hello</service-endpoint-interface> </port-component-ref> - </service-ref> </application-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -10,9 +10,6 @@ <module> <java>jaxrpc-jbws358.jar</java> </module> - <module> - <java>jaxrpc-jbws358-client.jar</java> - </module> </application> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/HelloService</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws358/HelloBean?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl 2012-02-29 15:23:28 UTC (rev 15792) @@ -27,7 +27,7 @@ </binding> <service name='HelloService'> <port binding='tns:HelloBinding' name='HelloPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + <soap:address location='http://@jboss.bind.address@:8080/jaxrpc-jbws358/HelloBean?wsdl'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/globalsmspro.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -5,11 +5,10 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws663?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/globalsmspro.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -5,11 +5,10 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws663b?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/globalsmspro.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -5,11 +5,10 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws663bb?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/globalsmspro.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -8,8 +8,8 @@ <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws663w?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/globalsmspro.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -5,11 +5,10 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws663wb?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -8,7 +8,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-dynamichandler?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> @@ -26,7 +26,7 @@ </service-ref> <service-ref> - <service-ref-name>service/ReplyToService</service-ref-name> + <service-ref-name>java:jboss/exported/service/ReplyToService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/ReplyToService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/replyto-jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -3,16 +3,16 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jaxrpc-addressing-replyto-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> - <config-name>Standard WSAddressing Client</config-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> + <config-name>Standard WSAddressing Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-wsaddr-hello?wsdl</wsdl-override> </service-ref> <service-ref> - <service-ref-name>service/ReplyToService</service-ref-name> + <service-ref-name>java:jboss/exported/service/ReplyToService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-wsaddr-replyto?wsdl</wsdl-override> </service-ref> + </jboss-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -3,11 +3,10 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> - <config-name>Standard WSSecurity Client</config-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> + <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-wssecurity-encrypt?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -3,11 +3,10 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> - <config-name>Standard WSSecurity Client</config-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> + <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-wssecurity-sign?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-store-pass-encrypt?wsdl</wsdl-override> </service-ref> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <service-ref> - <service-ref-name>service/InitialService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpoint</service-endpoint-interface> - </port-component-ref> - <handler> - <handler-name>ClientHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ClientHandler</handler-class> - </handler> - </service-ref> - - <service-ref> - <service-ref-name>service/ReplyToService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface> - </port-component-ref> - <handler> - <handler-name>ClientHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ClientHandler</handler-class> - </handler> - </service-ref> - -</application-client> - Copied: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml (from rev 15791, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml) =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml (rev 0) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <service-ref> + <service-ref-name>service/InitialService</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpoint</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>ClientHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ClientHandler</handler-class> + </handler> + </service-ref> + + <service-ref> + <service-ref-name>service/ReplyToService</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>ClientHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ClientHandler</handler-class> + </handler> + </service-ref> + +</application-client> + Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -1,72 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxws.wsaddressing.replyto</package-type> - <namespaceURI>http://org.jboss.ws/addressing/replyto</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpointService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/addressing/replyto'>serviceNS:ReplyToEndpointService</wsdl-service-name> - <port-mapping> - <port-name>ReplyToEndpointPort</port-name> - <java-port-name>ReplyToEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpointService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/addressing/replyto'>serviceNS:InitialEndpointService</wsdl-service-name> - <port-mapping> - <port-name>InitialEndpointPort</port-name> - <java-port-name>InitialEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/addressing/replyto'>portTypeNS:ReplyToEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/addressing/replyto'>bindingNS:ReplyToEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>addItemResponse</java-method-name> - <wsdl-operation>addItemResponse</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:ReplyToEndpoint_addItemResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - </service-endpoint-method-mapping> - <service-endpoint-method-mapping> - <java-method-name>getLastItem</java-method-name> - <wsdl-operation>getLastItem</wsdl-operation> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:ReplyToEndpoint_getLastItemResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/addressing/replyto'>portTypeNS:InitialEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/addressing/replyto'>bindingNS:InitialEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>addItem</java-method-name> - <wsdl-operation>addItem</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:InitialEndpoint_addItem</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:InitialEndpoint_addItemResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml (from rev 15791, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml) =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml (rev 0) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -0,0 +1,72 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxws.wsaddressing.replyto</package-type> + <namespaceURI>http://org.jboss.ws/addressing/replyto</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpointService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/addressing/replyto'>serviceNS:ReplyToEndpointService</wsdl-service-name> + <port-mapping> + <port-name>ReplyToEndpointPort</port-name> + <java-port-name>ReplyToEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpointService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/addressing/replyto'>serviceNS:InitialEndpointService</wsdl-service-name> + <port-mapping> + <port-name>InitialEndpointPort</port-name> + <java-port-name>InitialEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/addressing/replyto'>portTypeNS:ReplyToEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/addressing/replyto'>bindingNS:ReplyToEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>addItemResponse</java-method-name> + <wsdl-operation>addItemResponse</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:ReplyToEndpoint_addItemResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>getLastItem</java-method-name> + <wsdl-operation>getLastItem</wsdl-operation> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:ReplyToEndpoint_getLastItemResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/addressing/replyto'>portTypeNS:InitialEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/addressing/replyto'>bindingNS:InitialEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>addItem</java-method-name> + <wsdl-operation>addItem</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:InitialEndpoint_addItem</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:InitialEndpoint_addItemResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <service-ref> - <service-ref-name>service/InitialService</service-ref-name> - <config-name>Standard WSAddressing Client</config-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxws-wsaddressing-initial/InitialService?wsdl</wsdl-override> - </service-ref> - <service-ref> - <service-ref-name>service/ReplyToService</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl</wsdl-override> - </service-ref> -</jboss-client> Copied: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml (from rev 15791, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml) =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml (rev 0) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <service-ref> + <service-ref-name>service/InitialService</service-ref-name> + <config-name>Standard WSAddressing Client</config-name> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-wsaddressing-initial/InitialService?wsdl</wsdl-override> + </service-ref> + <service-ref> + <service-ref-name>service/ReplyToService</service-ref-name> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl</wsdl-override> + </service-ref> +</jboss-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-29 15:13:39 UTC (rev 15791) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-29 15:23:28 UTC (rev 15792) @@ -1156,12 +1156,12 @@ <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> +  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude> -  <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase*</exclude> <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase*</exclude> @@ -1216,10 +1216,6 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase*</exclude> @@ -1240,11 +1236,6 @@ <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude> @@ -1252,7 +1243,6 @@ <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude>  <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude> @@ -1265,11 +1255,12 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude> </excludes> </configuration> </plugin>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15791 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-29 10:13:39 -0500 (Wed, 29 Feb 2012) New Revision: 15791 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/pom.xml Log: [AS7-3444] enabling appclient tests (WIP) Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -1560,12 +1560,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663b-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663b-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663b/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1575,6 +1579,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663b-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws663b-appclient.jar"/> + </fileset> + </jar> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663bb.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663bb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> @@ -1587,12 +1596,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663bb-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663bb-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663bb/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1602,6 +1615,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663bb-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws663bb-appclient.jar"/> + </fileset> + </jar> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663w.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663w/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> @@ -1614,12 +1632,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663w-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663w-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663w/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1629,6 +1651,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663w-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws663w-appclient.jar"/> + </fileset> + </jar> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663wb.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663wb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> @@ -1641,12 +1668,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663wb-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663wb-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws663wb/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1656,6 +1687,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws663wb-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws663wb-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws706.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws706/WEB-INF/web.xml"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) @@ -42,11 +42,12 @@ public class JBWS663BareBoundTestCase extends JBossWSTest { private static SMSTextMessagingSoapBareBound port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663BareBoundTestCase.class, "jaxrpc-jbws663bb.war, jaxrpc-jbws663bb-client.jar"); + return new JBossWSTestSetup(JBWS663BareBoundTestCase.class, "jaxrpc-jbws663bb.war, jaxrpc-jbws663bb-appclient.ear#jaxrpc-jbws663bb-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/SMSService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/SMSService"); port = (SMSTextMessagingSoapBareBound)service.getPort(SMSTextMessagingSoapBareBound.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCreateService() throws Exception { assertNotNull("port not null", port); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) @@ -42,11 +42,12 @@ public class JBWS663BareUnboundTestCase extends JBossWSTest { private static SMSTextMessagingSoapBare port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663BareUnboundTestCase.class, "jaxrpc-jbws663b.war, jaxrpc-jbws663b-client.jar"); + return new JBossWSTestSetup(JBWS663BareUnboundTestCase.class, "jaxrpc-jbws663b.war, jaxrpc-jbws663b-appclient.ear#jaxrpc-jbws663b-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/SMSService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/SMSService"); port = (SMSTextMessagingSoapBare)service.getPort(SMSTextMessagingSoapBare.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCreateService() throws Exception { assertNotNull("port not null", port); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) @@ -42,11 +42,12 @@ public class JBWS663WrappedBoundTestCase extends JBossWSTest { private static SMSTextMessagingSoapWrappedBound port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663WrappedBoundTestCase.class, "jaxrpc-jbws663wb.war, jaxrpc-jbws663wb-client.jar"); + return new JBossWSTestSetup(JBWS663WrappedBoundTestCase.class, "jaxrpc-jbws663wb.war, jaxrpc-jbws663wb-appclient.ear#jaxrpc-jbws663wb-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/SMSService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/SMSService"); port = (SMSTextMessagingSoapWrappedBound)service.getPort(SMSTextMessagingSoapWrappedBound.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCreateService() throws Exception { assertNotNull("port not null", port); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2012-02-29 15:13:39 UTC (rev 15791) @@ -42,11 +42,12 @@ public class JBWS663WrappedUnboundTestCase extends JBossWSTest { private static SMSTextMessagingSoapWrapped port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS663WrappedUnboundTestCase.class, "jaxrpc-jbws663w.war, jaxrpc-jbws663w-client.jar"); + return new JBossWSTestSetup(JBWS663WrappedUnboundTestCase.class, "jaxrpc-jbws663w.war, jaxrpc-jbws663w-appclient.ear#jaxrpc-jbws663w-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/SMSService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/SMSService"); port = (SMSTextMessagingSoapWrapped)service.getPort(SMSTextMessagingSoapWrapped.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testCreateService() throws Exception { assertNotNull("port not null", port); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/application-client.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/globalsmspro.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/jboss-client.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -5,11 +5,10 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws663?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/application-client.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/globalsmspro.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/jboss-client.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663b/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -5,11 +5,10 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws663b?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/application-client.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/globalsmspro.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/jboss-client.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663bb/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -5,11 +5,10 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws663bb?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/application-client.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/globalsmspro.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/jboss-client.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663w/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -8,8 +8,8 @@ <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws663w?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/application-client.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/application-client.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/globalsmspro.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/jboss-client.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws663wb/META-INF/jboss-client.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -5,11 +5,10 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/SMSService</service-ref-name> + <service-ref-name>java:jboss/exported/service/SMSService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws663wb?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 15:11:24 UTC (rev 15790) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 15:13:39 UTC (rev 15791) @@ -1216,10 +1216,6 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase*</exclude>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15790 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-29 10:11:24 -0500 (Wed, 29 Feb 2012) New Revision: 15790 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: [JBWS-3435] resuscitate Process.waitFor() call for now Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-02-29 13:43:01 UTC (rev 15789) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-02-29 15:11:24 UTC (rev 15790) @@ -80,6 +80,7 @@ private static String testArchiveDir; private static String testResourcesDir; private static Process appclientProcess; + private static OutputStream appclientOutput; private static synchronized Deployer getDeployer() { @@ -127,7 +128,7 @@ final String appclientName = archive.substring(sharpIndex + 1); final String appclientFullName = getArchiveFile(earName).getParent() + FS + archive; final String touchFile = JBOSS_HOME + FS + "bin" + FS + appclientName + ".kill"; - final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + appclientOutput = new ByteArrayOutputStream(); if (appclientOS == null) { appclientProcess = new ProcessBuilder().command(appclientScript, appclientFullName, touchFile).start(); @@ -145,7 +146,7 @@ appclientProcess = new ProcessBuilder().command(args).start(); } final CopyJob inputStreamJob = new CopyJob(appclientProcess.getInputStream(), - appclientOS == null ? new TeeOutputStream(baos, System.out) : new TeeOutputStream(baos, System.out, appclientOS)); + appclientOS == null ? new TeeOutputStream(appclientOutput, System.out) : new TeeOutputStream(appclientOutput, System.out, appclientOS)); final CopyJob errorStreamJob = new CopyJob(appclientProcess.getErrorStream(), System.err); // unfortunately the following threads are needed because of Windows behavior System.out.println("Appclient output stream:"); @@ -153,7 +154,7 @@ new Thread(errorStreamJob).start(); int countOfAttempts = 0; final int maxCountOfAttempts = 30; // max wait time: 30 seconds - while (!baos.toString().contains("Deployed \"" + earName + "\"")) + while (!appclientOutput.toString().contains("Deployed \"" + earName + "\"")) { Thread.sleep(1000); if (countOfAttempts++ == maxCountOfAttempts) @@ -176,7 +177,19 @@ final int sharpIndex = archive.indexOf('#'); final File touchFile = new File(JBOSS_HOME + FS + "bin" + FS + archive.substring(sharpIndex + 1) + ".kill"); touchFile.createNewFile(); - Thread.sleep(200); + appclientProcess.waitFor(); + /* + int countOfAttempts = 0; + final int maxCountOfAttempts = 30; // max wait time: 30 seconds + while (!appclientOutput.toString().contains("stopped in")) + { + Thread.sleep(1000); + if (countOfAttempts++ == maxCountOfAttempts) + { + throw new RuntimeException("Cannot stop appclient"); + } + } + */ appclientProcess = null; touchFile.delete(); System.out.println("appclient stopped");

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15789 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-29 08:43:01 -0500 (Wed, 29 Feb 2012) New Revision: 15789 Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3444] enable appclient tests (WIP) Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-02-29 13:43:01 UTC (rev 15789) @@ -1033,10 +1033,14 @@ <include name="wsdl/**"/> </metainf> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws358/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1044,15 +1048,17 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws358-appclient.jar"/> + </fileset> + </jar> <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar"/> <unjar dest="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar" src="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar"/> <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear"> <fileset dir="${tests.output.dir}/test-resources/jaxrpc/jbws358"> <include name="META-INF/application.xml"/> </fileset> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws358-client.jar"/> - </fileset> </copy>  Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java 2012-02-29 13:43:01 UTC (rev 15789) @@ -26,7 +26,10 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; +import junit.framework.Test; + import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; @@ -40,19 +43,34 @@ */ public class JBWS358TestCase extends JBossWSTest { + public static Test suite() + { + return new JBossWSTestSetup(JBWS358TestCase.class, "jaxrpc-jbws358-appclient.ear#jaxrpc-jbws358-appclient.jar"); + } + public void testClientAccess() throws Exception { Hello endpoint = null; try { deploy("jaxrpc-jbws358.ear"); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + endpoint = (Hello)service.getPort(Hello.class); - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - endpoint = (Hello)service.getPort(Hello.class); - - String retStr = endpoint.hello("Hello Server"); - assertEquals("Hello Server", retStr); + String retStr = endpoint.hello("Hello Server"); + assertEquals("Hello Server", retStr); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } finally { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml 2012-02-29 13:43:01 UTC (rev 15789) @@ -5,14 +5,13 @@ <display-name>Test Service</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws358.Hello</service-endpoint-interface> </port-component-ref> - </service-ref> </application-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml 2012-02-29 13:43:01 UTC (rev 15789) @@ -10,9 +10,6 @@ <module> <java>jaxrpc-jbws358.jar</java> </module> - <module> - <java>jaxrpc-jbws358-client.jar</java> - </module> </application> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml 2012-02-29 13:43:01 UTC (rev 15789) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/HelloService</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws358/HelloBean?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl 2012-02-29 13:43:01 UTC (rev 15789) @@ -27,7 +27,7 @@ </binding> <service name='HelloService'> <port binding='tns:HelloBinding' name='HelloPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + <soap:address location='http://@jboss.bind.address@:8080/jaxrpc-jbws358/HelloBean?wsdl'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 13:43:01 UTC (rev 15789) @@ -1156,6 +1156,9 @@ <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> +  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> @@ -1256,9 +1259,6 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15788 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-29 07:54:42 -0500 (Wed, 29 Feb 2012) New Revision: 15788 Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/replyto/Initial-META-INF/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/ Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3444] enable appclient tests (WIP) Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-02-29 10:01:09 UTC (rev 15787) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-02-29 12:54:42 UTC (rev 15788) @@ -859,19 +859,6 @@ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class" /> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial-cl.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/Initial-META-INF"> - <include name="application-client.xml" /> - <include name="jboss-client.xml" /> - <include name="jaxws-jbossws-client-config.xml" /> - <include name="jaxrpc-mapping.xml" /> - </metainf> - </jar> <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class" /> @@ -880,26 +867,38 @@ <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class" /> </classes> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto-cl.jar"> + <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> + </classes> + </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.class" /> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.class" /> </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF"> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.wsaddressing.replyto.ApplicationClient" /> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core,org.jboss.ws.common" /> + </manifest> + <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/appclient/META-INF"> <include name="application-client.xml" /> <include name="jboss-client.xml" /> - <include name="jbossws-client-config.xml" /> <include name="jaxrpc-mapping.xml" /> </metainf> </jar> - <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> - </classes> - </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxws-wsaddressing-appclient.jar"/> + </fileset> + </jar> </target> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-02-29 10:01:09 UTC (rev 15787) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2012-02-29 12:54:42 UTC (rev 15788) @@ -21,19 +21,13 @@ */ package org.jboss.test.ws.jaxws.wsaddressing.replyto; -import java.io.ByteArrayInputStream; -import java.net.URL; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPMessage; - import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -46,122 +40,30 @@ */ public class AddressingReplyToTestCase extends JBossWSTest { - private static InitialEndpoint initial; - private static ReplyToEndpoint replyto; - private static FaultToEndpoint faultto; public static Test suite() { return new JBossWSTestSetup(AddressingReplyToTestCase.class, - "jaxws-wsaddressing-initial.war,jaxws-wsaddressing-initial-cl.jar," + - "jaxws-wsaddressing-replyto.war,jaxws-wsaddressing-replyto-cl.jar," + + "jaxws-wsaddressing-initial.war," + + "jaxws-wsaddressing-replyto.war," + "jaxws-wsaddressing-faultto.war"); } - protected void setUp() throws Exception + public void testApplicationClient() throws Exception { - super.setUp(); - - if (initial == null) - { - Service initialService = (Service)getInitialContext("initial-client").lookup("java:comp/env/service/InitialService"); - initial = (InitialEndpoint)initialService.getPort(InitialEndpoint.class); - Service replytoService = (Service)getInitialContext("replyto-client").lookup("java:comp/env/service/ReplyToService"); - replyto = (ReplyToEndpoint)replytoService.getPort(ReplyToEndpoint.class); - - String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-wsaddressing-faultto/FaultToService"; - QName serviceName = new QName("http://org.jboss.ws/addressing/replyto", "FaultToEndpointService"); - javax.xml.ws.Service service = javax.xml.ws.Service.create(new URL(endpointAddress + "?wsdl"), serviceName); - faultto = (FaultToEndpoint) service.getPort(FaultToEndpoint.class); + final String appclientArg = getServerHost();; + final OutputStream appclientOS = new ByteArrayOutputStream(); + JBossWSTestHelper.deployAppclient("jaxws-wsaddressing-appclient.ear#jaxws-wsaddressing-appclient.jar", appclientOS, appclientArg); + // wait till appclient stops + String appclientLog = appclientOS.toString(); + while (!appclientLog.contains("stopped in")) { + Thread.sleep(100); + appclientLog = appclientOS.toString(); } + // assert appclient logs + assertTrue(!appclientLog.contains("APPCLIENT TEST FAILURE")); + assertTrue(appclientLog.contains("TEST START")); + assertTrue(appclientLog.contains("TEST END")); } - public void testScenario() throws Exception - { - _testReplyToMessage(); - _testFaultToMessage(); - _testInital(); - _testReplyTo(); - _testFaultTo(); - } - - /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again. - */ - public void _testReplyToMessage() throws Exception - { - String reqEnv = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + - " <ns1:addItemResponse xmlns:ns1='http://org.jboss.ws/addressing/replyto'>" + - " <result>Mars Bar</result>" + - " </ns1:addItemResponse>" + - " </env:Body>" + - "</env:Envelope>"; - - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); - - URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-wsaddressing-replyto/ReplyToService"); - con.call(reqMsg, epURL); - - assertEquals("Mars Bar", replyto.getLastItem()); - } - - /** This sends a fault message to the FaultTo endpoint and verfies whether we can read it of again. - */ - public void _testFaultToMessage() throws Exception - { - String reqEnv = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Header/>" + - " <env:Body>" + - " <env:Fault>" + - " <faultcode>env:Client</faultcode>" + - " <faultstring>java.lang.IllegalArgumentException: Mars Bar</faultstring>" + - " </env:Fault>" + - " </env:Body>" + - "</env:Envelope>"; - - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); - SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); - - URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-wsaddressing-faultto/FaultToService"); - con.call(reqMsg, epURL); - - assertEquals("java.lang.IllegalArgumentException: Mars Bar", faultto.getLastFault()); - } - - public void _testInital() throws Exception - { - String item = initial.addItem("Ice Cream"); - assertNull("Expected null, but was: " + item, item); - - item = initial.addItem("Invalid Value"); - assertNull("Expected null, but was: " + item, item); - } - - public void _testReplyTo() throws Exception - { - String item = replyto.getLastItem(); - assertEquals("Ice Cream", item); - } - - public void _testFaultTo() throws Exception - { - String lastFault = faultto.getLastFault(); - - /* JAX-WS 10.2.2.3: the fields of the fault message are populated according to - * the following rules of precedence: - * - * faultstring - * 1. SOAPFaultException.getFault().getFaultString() - * 2. Exception.getMessage() - * 3. Exception.toString() - * - * this test used to expect the value returned by toString() */ - assertEquals("Invalid Value", lastFault); - } } Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.java 2012-02-29 12:54:42 UTC (rev 15788) @@ -0,0 +1,162 @@ +/* + * 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.wsaddressing.replyto; + +import java.io.ByteArrayInputStream; +import java.net.URL; + +import javax.naming.InitialContext; +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; + + +/** + * Test endpoint using ws-addressing + * + * NOTE: This test uses a JAX-RPC client against a JAX-WS endpoint. + * + * @author Thomas.Diesler(a)jboss.org + */ +public class ApplicationClient +{ + private static InitialEndpoint initial; + private static ReplyToEndpoint replyto; + private static FaultToEndpoint faultto; + + protected static void init(final String serverHost) throws Exception + { + InitialContext iniCtx = new InitialContext(); + Service initialService = (Service)iniCtx.lookup("java:comp/env/service/InitialService"); + initial = (InitialEndpoint)initialService.getPort(InitialEndpoint.class); + Service replytoService = (Service)iniCtx.lookup("java:comp/env/service/ReplyToService"); + replyto = (ReplyToEndpoint)replytoService.getPort(ReplyToEndpoint.class); + + String endpointAddress = "http://" + serverHost + ":8080/jaxws-wsaddressing-faultto/FaultToService"; + QName serviceName = new QName("http://org.jboss.ws/addressing/replyto", "FaultToEndpointService"); + javax.xml.ws.Service service = javax.xml.ws.Service.create(new URL(endpointAddress + "?wsdl"), serviceName); + faultto = (FaultToEndpoint) service.getPort(FaultToEndpoint.class); + } + + public static void main(String[] args) throws Exception + { + System.out.println("TEST START"); + final String serverHost = args[0]; + init(serverHost); + _testReplyToMessage(serverHost); + _testFaultToMessage(serverHost); + _testInitial(); + _testReplyTo(); + _testFaultTo(); + System.out.println("TEST END"); + } + + /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again. + */ + private static void _testReplyToMessage(final String serverHost) throws Exception + { + String reqEnv = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header/>" + + " <env:Body>" + + " <ns1:addItemResponse xmlns:ns1='http://org.jboss.ws/addressing/replyto'>" + + " <result>Mars Bar</result>" + + " </ns1:addItemResponse>" + + " </env:Body>" + + "</env:Envelope>"; + + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); + + URL epURL = new URL("http://" + serverHost + ":8080/jaxws-wsaddressing-replyto/ReplyToService"); + con.call(reqMsg, epURL); + if (!"Mars Bar".equals(replyto.getLastItem())) + throw new WebServiceException("APPCLIENT TEST FAILURE"); + } + + /** This sends a fault message to the FaultTo endpoint and verfies whether we can read it of again. + */ + private static void _testFaultToMessage(final String serverHost) throws Exception + { + String reqEnv = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header/>" + + " <env:Body>" + + " <env:Fault>" + + " <faultcode>env:Client</faultcode>" + + " <faultstring>java.lang.IllegalArgumentException: Mars Bar</faultstring>" + + " </env:Fault>" + + " </env:Body>" + + "</env:Envelope>"; + + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); + SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); + + URL epURL = new URL("http://" + serverHost + ":8080/jaxws-wsaddressing-faultto/FaultToService"); + con.call(reqMsg, epURL); + + if (!"java.lang.IllegalArgumentException: Mars Bar".equals(faultto.getLastFault())) + throw new WebServiceException("APPCLIENT TEST FAILURE"); + } + + private static void _testInitial() throws Exception + { + String item = initial.addItem("Ice Cream"); + if (item != null) + throw new WebServiceException("APPCLIENT TEST FAILURE: Expected null, but was: " + item); + + item = initial.addItem("Invalid Value"); + if (item != null) + throw new WebServiceException("APPCLIENT TEST FAILURE: Expected null, but was: " + item); + } + + private static void _testReplyTo() throws Exception + { + String item = replyto.getLastItem(); + + if (!"Ice Cream".equals(item)) + throw new WebServiceException("APPCLIENT TEST FAILURE: Expected null, but was: " + item); + } + + private static void _testFaultTo() throws Exception + { + String lastFault = faultto.getLastFault(); + + /* JAX-WS 10.2.2.3: the fields of the fault message are populated according to + * the following rules of precedence: + * + * faultstring + * 1. SOAPFaultException.getFault().getFaultString() + * 2. Exception.getMessage() + * 3. Exception.toString() + * + * this test used to expect the value returned by toString() */ + if (!"Invalid Value".equals(lastFault)) + throw new WebServiceException("APPCLIENT TEST FAILURE"); + } +} Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/application-client.xml 2012-02-29 12:54:42 UTC (rev 15788) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <service-ref> + <service-ref-name>service/InitialService</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpoint</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>ClientHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ClientHandler</handler-class> + </handler> + </service-ref> + + <service-ref> + <service-ref-name>service/ReplyToService</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>ClientHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.wsaddressing.replyto.ClientHandler</handler-class> + </handler> + </service-ref> + +</application-client> + Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jaxrpc-mapping.xml 2012-02-29 12:54:42 UTC (rev 15788) @@ -0,0 +1,72 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxws.wsaddressing.replyto</package-type> + <namespaceURI>http://org.jboss.ws/addressing/replyto</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpointService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/addressing/replyto'>serviceNS:ReplyToEndpointService</wsdl-service-name> + <port-mapping> + <port-name>ReplyToEndpointPort</port-name> + <java-port-name>ReplyToEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpointService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/addressing/replyto'>serviceNS:InitialEndpointService</wsdl-service-name> + <port-mapping> + <port-name>InitialEndpointPort</port-name> + <java-port-name>InitialEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.ReplyToEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/addressing/replyto'>portTypeNS:ReplyToEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/addressing/replyto'>bindingNS:ReplyToEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>addItemResponse</java-method-name> + <wsdl-operation>addItemResponse</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:ReplyToEndpoint_addItemResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>getLastItem</java-method-name> + <wsdl-operation>getLastItem</wsdl-operation> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:ReplyToEndpoint_getLastItemResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxws.wsaddressing.replyto.InitialEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/addressing/replyto'>portTypeNS:InitialEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/addressing/replyto'>bindingNS:InitialEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>addItem</java-method-name> + <wsdl-operation>addItem</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:InitialEndpoint_addItem</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/addressing/replyto'>wsdlMsgNS:InitialEndpoint_addItemResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/appclient/META-INF/jboss-client.xml 2012-02-29 12:54:42 UTC (rev 15788) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <service-ref> + <service-ref-name>service/InitialService</service-ref-name> + <config-name>Standard WSAddressing Client</config-name> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-wsaddressing-initial/InitialService?wsdl</wsdl-override> + </service-ref> + <service-ref> + <service-ref-name>service/ReplyToService</service-ref-name> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl</wsdl-override> + </service-ref> +</jboss-client> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 10:01:09 UTC (rev 15787) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 12:54:42 UTC (rev 15788) @@ -1159,9 +1159,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude> -  <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase*</exclude> <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase*</exclude> @@ -1247,7 +1244,6 @@ <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude>  <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude> @@ -1268,6 +1264,7 @@ <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude> </excludes> </configuration> </plugin>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15787 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-29 05:01:09 -0500 (Wed, 29 Feb 2012) New Revision: 15787 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3444] enable appclient tests (WIP) Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -108,11 +108,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-dynamichandler-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-dynamichandler-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/dynamichandler/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -122,6 +126,11 @@ <include name="jboss-client.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-dynamichandler-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-dynamichandler-appclient.jar"/> + </fileset> + </jar>  <war destfile="${tests.output.dir}/test-libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/exception/WEB-INF/web.xml"> @@ -584,21 +593,6 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-store-pass-encrypt-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml"> @@ -626,14 +620,18 @@ <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -647,6 +645,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-wsaddr-hello-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> @@ -668,11 +671,15 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-sign/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -683,6 +690,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-wssecurity-sign-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt.war" @@ -705,11 +717,15 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -720,6 +736,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-wssecurity-encrypt-appclient.jar"/> + </fileset> + </jar>  Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2012-02-29 10:01:09 UTC (rev 15787) @@ -48,24 +48,34 @@ private static ServiceExt service; private static HandlerTestService endpoint; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(DynamicHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-client.jar"); + return new JBossWSTestSetup(DynamicHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-appclient.ear#jaxrpc-samples-dynamichandler-appclient.jar"); } protected void setUp() throws Exception { super.setUp(); - if (endpoint == null) { - InitialContext iniCtx = getInitialContext(); - service = (ServiceExt)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + service = (ServiceExt)iniCtx.lookup("java:service/TestService"); endpoint = (HandlerTestService)service.getPort(HandlerTestService.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testStaticHandlers() throws Exception { String res = endpoint.testHandlers("InitalMessage"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2012-02-29 10:01:09 UTC (rev 15787) @@ -40,10 +40,11 @@ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-dynamichandler"; private static HandlerTestService endpoint; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(StaticHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-client.jar"); + return new JBossWSTestSetup(StaticHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-appclient.ear#jaxrpc-samples-dynamichandler-appclient.jar"); } protected void setUp() throws Exception @@ -52,12 +53,22 @@ if (endpoint == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); endpoint = (HandlerTestService)service.getPort(HandlerTestService.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testHandlers() throws Exception { String res = endpoint.testHandlers("InitalMessage"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-02-29 10:01:09 UTC (rev 15787) @@ -24,7 +24,7 @@ import java.io.ByteArrayInputStream; import java.net.URL; -import javax.xml.namespace.QName; +import javax.naming.InitialContext; import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPConnection; @@ -46,12 +46,13 @@ { private static Hello initial; private static ReplyTo replyto; + private static InitialContext iniCtx; public static Test suite() { return new JBossWSTestSetup(AddressingReplyToTestCase.class, "jaxrpc-samples-wsaddr-hello.war, jaxrpc-samples-wsaddr-replyto.war," + - "jaxrpc-samples-wsaddr-hello-client.jar"); + "jaxrpc-samples-wsaddr-hello-appclient.jar#jaxrpc-samples-wsaddr-hello-appclient.jar"); } protected void setUp() throws Exception @@ -60,13 +61,24 @@ if (initial == null) { - Service replytoService = (Service)getInitialContext("jaxrpc-addressing-replyto-client").lookup("java:comp/env/service/ReplyToService"); + iniCtx = getAppclientInitialContext(); + Service replytoService = (Service)iniCtx.lookup("java:service/ReplyToService"); replyto = (ReplyTo)replytoService.getPort(ReplyTo.class); - Service initialService = (Service)getInitialContext("jaxrpc-addressing-replyto-client").lookup("java:comp/env/service/HelloService"); + Service initialService = (Service)iniCtx.lookup("java:service/HelloService"); initial = (Hello)initialService.getPort(Hello.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again. */ public void testReplyToMessage() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2012-02-29 10:01:09 UTC (rev 15787) @@ -42,7 +42,8 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(SimpleEncryptTestCase.class, "jaxrpc-samples-wssecurity-encrypt.war, jaxrpc-samples-wssecurity-encrypt-client.jar"); + return new JBossWSTestSetup(SimpleEncryptTestCase.class, "jaxrpc-samples-wssecurity-encrypt.war, " + + "jaxrpc-samples-wssecurity-encrypt-appclient.ear#jaxrpc-samples-wssecurity-encrypt-appclient.jar"); } /** @@ -59,9 +60,20 @@ private Hello getPort() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello port = (Hello)service.getPort(Hello.class); - return port; + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello port = (Hello)service.getPort(Hello.class); + return port; + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2012-02-29 10:01:09 UTC (rev 15787) @@ -42,7 +42,8 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(SimpleSignTestCase.class, "jaxrpc-samples-wssecurity-sign.war, jaxrpc-samples-wssecurity-sign-client.jar"); + return new JBossWSTestSetup(SimpleSignTestCase.class, "jaxrpc-samples-wssecurity-sign.war, " + + "jaxrpc-samples-wssecurity-sign-appclient.ear#jaxrpc-samples-wssecurity-sign-appclient.jar"); } /** @@ -59,9 +60,20 @@ private Hello getPort() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello port = (Hello)service.getPort(Hello.class); - return port; + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello port = (Hello)service.getPort(Hello.class); + return port; + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2012-02-29 10:01:09 UTC (rev 15787) @@ -44,7 +44,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(StorePassEncryptTestCase.class, "jaxrpc-samples-store-pass-encrypt.war, jaxrpc-samples-store-pass-encrypt-client.jar"); + return new JBossWSTestSetup(StorePassEncryptTestCase.class, "jaxrpc-samples-store-pass-encrypt.war"); } public void setUp() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/application-client.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/application-client.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -8,7 +8,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/dynamichandler/META-INF/jboss-client.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-dynamichandler?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> @@ -26,7 +26,7 @@ </service-ref> <service-ref> - <service-ref-name>service/ReplyToService</service-ref-name> + <service-ref-name>java:jboss/exported/service/ReplyToService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/ReplyToService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/replyto-jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -3,16 +3,16 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jaxrpc-addressing-replyto-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> - <config-name>Standard WSAddressing Client</config-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> + <config-name>Standard WSAddressing Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-wsaddr-hello?wsdl</wsdl-override> </service-ref> <service-ref> - <service-ref-name>service/ReplyToService</service-ref-name> + <service-ref-name>java:jboss/exported/service/ReplyToService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-wsaddr-replyto?wsdl</wsdl-override> </service-ref> + </jboss-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/application-client.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/application-client.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-client.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -3,11 +3,10 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> - <config-name>Standard WSSecurity Client</config-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> + <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-wssecurity-encrypt?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/application-client.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/application-client.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-client.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -3,11 +3,10 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> - <config-name>Standard WSSecurity Client</config-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> + <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-wssecurity-sign?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/application-client.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-client.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-store-pass-encrypt?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 09:33:17 UTC (rev 15786) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 10:01:09 UTC (rev 15787) @@ -1240,11 +1240,6 @@ <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude> @@ -1270,6 +1265,9 @@  <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude> </excludes> </configuration> </plugin>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15786 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-29 04:33:17 -0500 (Wed, 29 Feb 2012) New Revision: 15786 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: [JBWS-3435] remove Process.waitFor() call - it freezes sometimes :( Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-02-29 06:31:24 UTC (rev 15785) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-02-29 09:33:17 UTC (rev 15786) @@ -176,7 +176,7 @@ final int sharpIndex = archive.indexOf('#'); final File touchFile = new File(JBOSS_HOME + FS + "bin" + FS + archive.substring(sharpIndex + 1) + ".kill"); touchFile.createNewFile(); - appclientProcess.waitFor(); + Thread.sleep(200); appclientProcess = null; touchFile.delete(); System.out.println("appclient stopped");

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15785 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite/cxf-spring-tests/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-29 01:31:24 -0500 (Wed, 29 Feb 2012) New Revision: 15785 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml Log: Merged revisions 15784 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15784 | ropalka | 2012-02-29 07:27:58 +0100 (Wed, 29 Feb 2012) | 1 line fix build failure ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2012-02-29 06:27:58 UTC (rev 15784) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2012-02-29 06:31:24 UTC (rev 15785) @@ -32,25 +32,6 @@ <mkdir dir="${tests.output.dir}/test-libs"/> -  - <jar jarfile="${tests.output.dir}/test-libs/hornetq-samples-jmstransport-as6.sar"> - <fileset dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF"> - <include name="hornetq-jms.xml"/> - </fileset> - </jar> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/jmstransport/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/WEB-INF"> - <include name="wsdl/**"/> - <include name="jbossws-cxf.xml"/> - <include name="jboss-web.xml"/> - </webinf> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15784 - stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-29 01:27:58 -0500 (Wed, 29 Feb 2012) New Revision: 15784 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml Log: fix build failure Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2012-02-29 06:25:47 UTC (rev 15783) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2012-02-29 06:27:58 UTC (rev 15784) @@ -32,25 +32,6 @@ <mkdir dir="${tests.output.dir}/test-libs"/> -  - <jar jarfile="${tests.output.dir}/test-libs/hornetq-samples-jmstransport-as6.sar"> - <fileset dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF"> - <include name="hornetq-jms.xml"/> - </fileset> - </jar> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/jmstransport/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/WEB-INF"> - <include name="wsdl/**"/> - <include name="jbossws-cxf.xml"/> - <include name="jboss-web.xml"/> - </webinf> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15783 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-29 01:25:47 -0500 (Wed, 29 Feb 2012) New Revision: 15783 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15780-15781 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15780 | ropalka | 2012-02-29 07:14:34 +0100 (Wed, 29 Feb 2012) | 1 line sync. with AS7 upstream ....... r15781 | ropalka | 2012-02-29 07:16:48 +0100 (Wed, 29 Feb 2012) | 1 line fix build failure ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-02-29 06:20:58 UTC (rev 15782) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-02-29 06:25:47 UTC (rev 15783) @@ -102,14 +102,6 @@ </manifest> </war> -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF"> - <include name="**/*" /> - </metainf> - </jar> - -   <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-mixtype.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/mixtype/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-29 06:20:58 UTC (rev 15782) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-29 06:25:47 UTC (rev 15783) @@ -1240,9 +1240,9 @@ </exclusions> </dependency> <dependency> - <groupId>org.jboss.remoting3</groupId> + <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> - <version>1.0.1.Final</version> + <version>1.0.2.Final</version> <scope>test</scope> </dependency> <dependency>

12 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2012