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

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> <!-- jaxrpc-samples-exception --> <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> <!-- jaxrpc-samples-wsaddr-hello.war --> <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> <!-- jaxrpc-samples-wssecurity-sign --> <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> <!-- jaxrpc-samples-wssecurity-encrypt --> <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> <!-- Please add alphabetically --> 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 @@ <!-- # [AS7-3946] waiting for jboss metadata 7.0.1.Final upgrade --> <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>