Author: ropalka Date: 2012-03-01 08:46:26 -0500 (Thu, 01 Mar 2012) New Revision: 15801 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/jbws807/JBWS807TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/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-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -570,11 +570,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws82-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws82-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws82/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws82/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/jbws82/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -584,6 +588,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws82-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws82-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws83 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws83.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws83/WEB-INF/web.xml"> @@ -598,11 +607,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws83-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws83-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws83/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws83/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws83/ClientHandler.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/jbws83/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -612,6 +626,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws83-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws83-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws84 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws84.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws84/WEB-INF/web.xml"> @@ -619,18 +638,25 @@ <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.common"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws84/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/*.wsdl"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws84-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws84-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*JavaBean.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*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/jbws84/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -640,6 +666,11 @@ <include name="wsdl/*.wsdl"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws84-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws84-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws124 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws124.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws124/WEB-INF/web.xml"> @@ -2266,17 +2297,24 @@ <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws807/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws807-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws807-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*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/jbws807/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2286,6 +2324,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws807-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws807-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws812 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws812.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws812/WEB-INF/web.xml"> @@ -2303,10 +2346,14 @@ <attribute name="Dependencies" value="org.jboss.ws.common"/> </manifest> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws812-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws812-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.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/jbws812/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2316,6 +2363,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws812-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws812-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws950 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws950.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws950/WEB-INF/web.xml"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2012-03-01 13:46:26 UTC (rev 15801) @@ -42,10 +42,11 @@ public class JBWS807TestCase extends JBossWSTest { private static TestService_PortType port; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-client.jar"); + return new JBossWSTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-appclient.ear#jaxrpc-jbws807-appclient.jar"); } protected void setUp() throws Exception @@ -53,12 +54,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestService_PortType)service.getPort(TestService_PortType.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testPingMsg() throws Exception { try Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2012-03-01 13:46:26 UTC (rev 15801) @@ -67,7 +67,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS812TestCase.class, "jaxrpc-jbws812.war, jaxrpc-jbws812-client.jar"); + return new JBossWSTestSetup(JBWS812TestCase.class, "jaxrpc-jbws812.war, jaxrpc-jbws812-appclient.ear#jaxrpc-jbws812-appclient.jar"); } /** Send the raw bytes via an HttpURLConnection @@ -156,15 +156,24 @@ } - /** Test client proxy API - */ - public void testClientProxy() throws Exception + public void testAppclientProxy() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String resStr = port.echoSimple("\u00a0"); - assertEquals(160, resStr.charAt(0)); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String resStr = port.echoSimple("\u00a0"); + assertEquals(160, resStr.charAt(0)); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2012-03-01 13:46:26 UTC (rev 15801) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS82TestCase.class, "jaxrpc-jbws82.war, jaxrpc-jbws82-client.jar"); + return new JBossWSTestSetup(JBWS82TestCase.class, "jaxrpc-jbws82.war, jaxrpc-jbws82-appclient.ear#jaxrpc-jbws82-appclient.jar"); } /** @@ -50,12 +50,23 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello hello = (Hello)service.getPort(Hello.class); - UserType in0 = new UserType("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals(in0, retObj); + UserType in0 = new UserType("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals(in0, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2012-03-01 13:46:26 UTC (rev 15801) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS83TestCase.class, "jaxrpc-jbws83.war, jaxrpc-jbws83-client.jar"); + return new JBossWSTestSetup(JBWS83TestCase.class, "jaxrpc-jbws83.war, jaxrpc-jbws83-appclient.ear#jaxrpc-jbws83-appclient.jar"); } /** @@ -50,12 +50,23 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello hello = (Hello)service.getPort(Hello.class); - UserType in0 = new UserType("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals(in0, retObj); + UserType in0 = new UserType("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals(in0, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2012-03-01 13:46:26 UTC (rev 15801) @@ -54,7 +54,7 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS84TestCase.class, "jaxrpc-jbws84.war, jaxrpc-jbws84-client.jar"); + return new JBossWSTestSetup(JBWS84TestCase.class, "jaxrpc-jbws84.war, jaxrpc-jbws84-appclient.ear#jaxrpc-jbws84-appclient.jar"); } /** Use the JBoss generated dynamic proxy send the SOAP message. @@ -62,23 +62,34 @@ */ public void testProcessSOAPElement() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/MessageService"); - Message port = (Message)service.getPort(Message.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/MessageService"); + Message port = (Message)service.getPort(Message.class); - MessageFactory factory = MessageFactory.newInstance(); - SOAPMessage reqMessage = factory.createMessage(); + MessageFactory factory = MessageFactory.newInstance(); + SOAPMessage reqMessage = factory.createMessage(); - DocumentBuilder builder = getDocumentBuilder(); - Document doc = builder.parse(new ByteArrayInputStream(Message.request.getBytes())); - reqMessage.getSOAPBody().addDocument(doc); + DocumentBuilder builder = getDocumentBuilder(); + Document doc = builder.parse(new ByteArrayInputStream(Message.request.getBytes())); + reqMessage.getSOAPBody().addDocument(doc); - SOAPEnvelope soapEnvelope = reqMessage.getSOAPPart().getEnvelope(); - SOAPBody soapBody = soapEnvelope.getBody(); - SOAPElement reqElement = (SOAPElement)soapBody.getChildElements().next(); + SOAPEnvelope soapEnvelope = reqMessage.getSOAPPart().getEnvelope(); + SOAPBody soapBody = soapEnvelope.getBody(); + SOAPElement reqElement = (SOAPElement)soapBody.getChildElements().next(); - SOAPElement resElement = port.processSOAPElement(reqElement); - validateResponse(resElement); + SOAPElement resElement = port.processSOAPElement(reqElement); + validateResponse(resElement); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } private DocumentBuilder getDocumentBuilder() throws ParserConfigurationException Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/application-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -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>use overwrite in jboss-client.xml</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/jbws807/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws807/META-INF/jboss-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -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-jbws807?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/application-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -8,7 +8,7 @@ <display-name>HelloService</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/jbws812/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws812/META-INF/jboss-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -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-jbws812?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/application-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -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/jbws82/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws82/META-INF/jboss-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -5,10 +5,9 @@ "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> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws82/services/Foo?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/application-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -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/jbws83/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws83/META-INF/jboss-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -5,10 +5,9 @@ "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> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws83?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/application-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -9,7 +9,7 @@ <display-name>Test web service</display-name> <service-ref> - <service-ref-name>service/MessageService</service-ref-name> + <service-ref-name>java:jboss/exported/service/MessageService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/MessageService.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/jbws84/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws84/META-INF/jboss-client.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -5,10 +5,9 @@ "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/MessageService</service-ref-name> + <service-ref-name>java:jboss/exported/service/MessageService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws84?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 12:41:45 UTC (rev 15800) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 13:46:26 UTC (rev 15801) @@ -1196,11 +1196,6 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude><!-- review test --> <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude><!-- review test --> <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude><!-- rewrite test --> - <exclude>org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase*</exclude> <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>