Author: ropalka Date: 2012-03-01 07:08:12 -0500 (Thu, 01 Mar 2012) New Revision: 15799 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/jbws70/JBWS70TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/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 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -434,12 +434,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws70-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws70-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws70/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws70/*_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws70/*_ResponseStruct.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/jbws70/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -449,6 +453,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws70-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws70-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws71 --> <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws71-types.jar"> @@ -472,13 +481,17 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws71-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws71-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws71/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws71/UserType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws71/*_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws71/*_ResponseStruct.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/jbws71/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -488,6 +501,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws71-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws71-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws79 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws79.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws79/WEB-INF/web.xml"> @@ -504,11 +522,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws79-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws79-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOne.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwo.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/jbws79/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -519,6 +541,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws79-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws79-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws82 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws82.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws82/WEB-INF/web.xml"> @@ -1868,12 +1895,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws706-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws706-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws706/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws706/DemoServicePortTypeImpl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.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/jbws706/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1883,6 +1914,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws706-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws706-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws707 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws707.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws707/WEB-INF/web.xml"> @@ -1897,11 +1933,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws707-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws707-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws707/UserType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws707/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/jbws707/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1911,6 +1951,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws707-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws707-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws710 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws710.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws710/WEB-INF/web.xml"> @@ -1924,12 +1969,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws710-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws710-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws710/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws710/HelloBean.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.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/jbws710/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1939,6 +1988,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws710-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws710-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws720 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws720.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws720/WEB-INF/web.xml"> @@ -1952,12 +2006,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws720-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws720-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*Impl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*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/jbws720/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1967,6 +2025,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws720-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws720-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws723 --> <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723.jar"> @@ -2012,11 +2075,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws732-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws732-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws732/*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/jbws732/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2027,6 +2094,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws732-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws732-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws751 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws751.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws751/WEB-INF/web.xml"> @@ -2111,12 +2183,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws775-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws775-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws775/*"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws775/*Impl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.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/jbws775/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2126,6 +2202,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws775-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws775-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws801 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws801.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws801/WEB-INF/web.xml"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) @@ -42,6 +42,7 @@ public class JBWS70TestCase extends JBossWSTest { private static Hello hello; + private static InitialContext iniCtx; public JBWS70TestCase(String name) { @@ -57,7 +58,7 @@ suite.addTest(new JBWS70TestCase("testSetVersion")); suite.addTest(new JBWS70TestCase("testGetVersion")); - return new JBossWSTestSetup(suite, "jaxrpc-jbws70.war, jaxrpc-jbws70-client.jar"); + return new JBossWSTestSetup(suite, "jaxrpc-jbws70.war, jaxrpc-jbws70-appclient.ear#jaxrpc-jbws70-appclient.jar"); } public void setUp() throws Exception @@ -65,12 +66,22 @@ super.setUp(); if (hello == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); hello = (Hello)service.getPort(Hello.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testSetVersion() throws Exception { hello.setVersion("Version-1.0"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) @@ -42,16 +42,27 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS706TestCase.class, "jaxrpc-jbws706.war, jaxrpc-jbws706-client.jar"); + return new JBossWSTestSetup(JBWS706TestCase.class, "jaxrpc-jbws706.war, jaxrpc-jbws706-appclient.ear#jaxrpc-jbws706-appclient.jar"); } public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - DemoServicePortType hello = (DemoServicePortType)service.getPort(DemoServicePortType.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + DemoServicePortType hello = (DemoServicePortType)service.getPort(DemoServicePortType.class); - Descr retObj = hello.processDescr("descr"); - assertEquals("descr", retObj.getDescription()); + Descr retObj = hello.processDescr("descr"); + assertEquals("descr", retObj.getDescription()); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) @@ -54,11 +54,12 @@ public class JBWS707TestCase extends JBossWSTest { private static TestEndpoint port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS707TestCase.class, "jaxrpc-jbws707.war, jaxrpc-jbws707-client.jar"); + return new JBossWSTestSetup(JBWS707TestCase.class, "jaxrpc-jbws707.war, jaxrpc-jbws707-appclient.ear#jaxrpc-jbws707-appclient.jar"); } public void setUp() throws Exception @@ -66,12 +67,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 = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testSpecialChars() throws Exception { String inStr = "&Test & this &"; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS71TestCase.class, "jaxrpc-jbws71.war, jaxrpc-jbws71-client.jar"); + return new JBossWSTestSetup(JBWS71TestCase.class, "jaxrpc-jbws71.war, jaxrpc-jbws71-appclient.ear#jaxrpc-jbws71-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/jbws710/JBWS710TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) @@ -40,11 +40,12 @@ public class JBWS710TestCase extends JBossWSTest { private static Hello port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS710TestCase.class, "jaxrpc-jbws710.war, jaxrpc-jbws710-client.jar"); + return new JBossWSTestSetup(JBWS710TestCase.class, "jaxrpc-jbws710.war, jaxrpc-jbws710-appclient.ear#jaxrpc-jbws710-appclient.jar"); } protected void setUp() throws Exception @@ -52,12 +53,22 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); port = (Hello)service.getPort(Hello.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testOnewayRequest() throws Exception { port.onewayRequest("str1", "str2", "str3"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) @@ -42,11 +42,12 @@ public class JBWS720TestCase extends JBossWSTest { private static TestEndpoint port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS720TestCase.class, "jaxrpc-jbws720.war, jaxrpc-jbws720-client.jar"); + return new JBossWSTestSetup(JBWS720TestCase.class, "jaxrpc-jbws720.war, jaxrpc-jbws720-appclient.ear#jaxrpc-jbws720-appclient.jar"); } public 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/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testLangEmptyAny() throws Exception { GetProperty inObj = new GetProperty(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) @@ -42,10 +42,11 @@ { private static WrappedEndpoint wrapped; private static BareEndpoint bare; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(JBWS732TestCase.class, "jaxrpc-jbws732.war, jaxrpc-jbws732-client.jar"); + return new JBossWSTestSetup(JBWS732TestCase.class, "jaxrpc-jbws732.war, jaxrpc-jbws732-appclient.ear#jaxrpc-jbws732-appclient.jar"); } protected void setUp() throws Exception @@ -53,15 +54,24 @@ super.setUp(); if (wrapped == null || bare == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/jbws732/wrapped"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/jbws732/wrapped"); wrapped = (WrappedEndpoint)service.getPort(WrappedEndpoint.class); - service = (Service)iniCtx.lookup("java:comp/env/service/jbws732/bare"); + service = (Service)iniCtx.lookup("java:service/jbws732/bare"); bare = (BareEndpoint)service.getPort(BareEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } /* Wrapped Style, Unwrapped Arrays */ public void testEchoUnwrappedArrayWrappedStyleElements() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) @@ -50,25 +50,36 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS775TestCase.class, "jaxrpc-jbws775.war, jaxrpc-jbws775-client.jar"); + return new JBossWSTestSetup(JBWS775TestCase.class, "jaxrpc-jbws775.war, jaxrpc-jbws775-appclient.ear#jaxrpc-jbws775-appclient.jar"); } public void testEndpointAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/DocumentTranslator"); - DocumentTranslator port = (DocumentTranslator)service.getPort(DocumentTranslator.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/DocumentTranslator"); + DocumentTranslator port = (DocumentTranslator)service.getPort(DocumentTranslator.class); - TDocumentHead tDocHead = new TDocumentHead("title", "en"); - TDocumentBody tDocBody = new TDocumentBody(new String[] {"hi", "bye"}); - TDocument tDocReq = new TDocument(tDocHead, tDocBody); - TTranslationRequest tReq = new TTranslationRequest("es", tDocReq); + TDocumentHead tDocHead = new TDocumentHead("title", "en"); + TDocumentBody tDocBody = new TDocumentBody(new String[] {"hi", "bye"}); + TDocument tDocReq = new TDocument(tDocHead, tDocBody); + TTranslationRequest tReq = new TTranslationRequest("es", tDocReq); - TDocument tDocRes = port.translate(tReq); - assertEquals("en", tDocRes.getHead().getLanguage()); - assertEquals("title", tDocRes.getHead().getTitle()); - assertEquals("hi", tDocRes.getBody().getParagraph()[0]); - assertEquals("bye", tDocRes.getBody().getParagraph()[1]); + TDocument tDocRes = port.translate(tReq); + assertEquals("en", tDocRes.getHead().getLanguage()); + assertEquals("title", tDocRes.getHead().getTitle()); + assertEquals("hi", tDocRes.getBody().getParagraph()[0]); + assertEquals("bye", tDocRes.getBody().getParagraph()[1]); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } public void testSAAJAccess() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) @@ -40,18 +40,33 @@ */ public class JBWS79TestCase extends JBossWSTest { + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS79TestCase.class, "jaxrpc-jbws79.war, jaxrpc-jbws79-client.jar"); + return new JBossWSTestSetup(JBWS79TestCase.class, "jaxrpc-jbws79.war, jaxrpc-jbws79-appclient.ear#jaxrpc-jbws79-appclient.jar"); } + protected void setUp() throws Exception + { + super.setUp(); + iniCtx = getAppclientInitialContext(); + } + + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + } + super.tearDown(); + } + /** Test endpoint one */ public void testEndpointOne() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloOneService"); + Service service = (Service)iniCtx.lookup("java:service/HelloOneService"); HelloOne hello = (HelloOne)service.getPort(HelloOne.class); String in0 = "Kermit"; @@ -62,8 +77,7 @@ */ public void testEndpointTwo() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloTwoService"); + Service service = (Service)iniCtx.lookup("java:service/HelloTwoService"); HelloTwo hello = (HelloTwo)service.getPort(HelloTwo.class); QName in0 = new QName("http://somens", "Kermit"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -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/jbws70/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws70/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -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-jbws70?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -8,7 +8,7 @@ <display-name>TestService</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/logic_top.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/jbws706/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws706/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -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/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws706?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -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/EchoService.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/jbws707/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws707/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -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/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws707?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -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/jbws71/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws71/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -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-jbws71?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -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/jbws710/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws710/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -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-jbws710?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -8,7 +8,7 @@ <display-name>TestService</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/jbws720/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -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-jbws720?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -3,7 +3,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service/jbws732/wrapped</service-ref-name> + <service-ref-name>java:jboss/exported/service/jbws732/wrapped</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>USE_JBOSS_CLIENT_XML_OVERRIDE</wsdl-file> <jaxrpc-mapping-file>META-INF/wrapped-mapping.xml</jaxrpc-mapping-file> @@ -14,7 +14,7 @@ </service-ref> <service-ref> - <service-ref-name>service/jbws732/bare</service-ref-name> + <service-ref-name>java:jboss/exported/service/jbws732/bare</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>USE_JBOSS_CLIENT_XML_OVERRIDE</wsdl-file> <jaxrpc-mapping-file>META-INF/bare-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws732/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -3,15 +3,14 @@ <!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/jbws732/wrapped</service-ref-name> + <service-ref-name>java:jboss/exported/service/jbws732/wrapped</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws732/WrappedService?wsdl</wsdl-override> </service-ref> <service-ref> - <service-ref-name>service/jbws732/bare</service-ref-name> + <service-ref-name>java:jboss/exported/service/jbws732/bare</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws732/BareService?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/DocumentTranslator</service-ref-name> + <service-ref-name>java:jboss/exported/service/DocumentTranslator</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/translator.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> @@ -18,7 +18,7 @@ </service-ref> <service-ref> - <service-ref-name>service/TextTranslator</service-ref-name> + <service-ref-name>java:jboss/exported/service/TextTranslator</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/translator.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/jbws775/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws775/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -3,14 +3,13 @@ <!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/DocumentTranslator</service-ref-name> + <service-ref-name>java:jboss/exported/service/DocumentTranslator</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws775/document?wsdl</wsdl-override> </service-ref> <service-ref> - <service-ref-name>service/TextTranslator</service-ref-name> + <service-ref-name>java:jboss/exported/service/TextTranslator</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws775/text?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -9,7 +9,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloOneService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloOneService</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-one.xml</jaxrpc-mapping-file> @@ -19,7 +19,7 @@ </port-component-ref> </service-ref> <service-ref> - <service-ref-name>service/HelloTwoService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloTwoService</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-two.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws79/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -5,14 +5,13 @@ "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/HelloOneService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloOneService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws79/HelloOne?wsdl</wsdl-override> </service-ref> <service-ref> - <service-ref-name>service/HelloTwoService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloTwoService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws79/HelloTwo?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 11:34:27 UTC (rev 15798) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 12:08:12 UTC (rev 15799) @@ -1193,22 +1193,13 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude><!-- rewrite 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/jbws626/JBWS626TestCase*</exclude> <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/jbws68/JBWS68TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase*</exclude> <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>