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

Author: ropalka Date: 2012-03-01 06:34:27 -0500 (Thu, 01 Mar 2012) New Revision: 15798 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/jbws413/JBWS413TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/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:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -1234,11 +1234,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws413-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws413-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws413/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws413/JavaType.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/jbws413/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1248,6 +1252,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws413-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws413-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws414 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws414.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws414/WEB-INF/web.xml"> @@ -1265,13 +1274,17 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws414-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws414-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws414/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws414/St.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws414/RefType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws414/Interface.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/jbws414/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1282,6 +1295,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws414-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws414-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws423 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws423.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws423/WEB-INF/web.xml"> @@ -1297,12 +1315,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws423-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws423-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws423/ValueObj.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws423/_arrays/**"/> + <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/jbws423/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1312,6 +1334,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws423-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws423-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws424 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws424.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws424/WEB-INF/web.xml"> @@ -1327,13 +1354,17 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws424-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws424-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws424/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws424/PrivateException.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws424/Exception2.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws424/TestHandler.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/jbws424/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1343,6 +1374,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws424-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws424-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws425 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws425.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws425/WEB-INF/web.xml"> @@ -1356,10 +1392,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws425-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws425-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws425/Hello.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws425/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1369,6 +1409,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws425-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws425-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws434 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws434.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws434/WEB-INF/web.xml"> @@ -1384,12 +1429,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws434-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws434-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.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/jbws434/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1399,6 +1448,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws434-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws434-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws456 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws456.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws456/WEB-INF/web.xml"> @@ -1413,12 +1467,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws456-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws456-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws456/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws456/JavaType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws456/TestHandler.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/jbws456/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1428,6 +1486,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws456-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws456-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws463 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws463.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws463/WEB-INF/web.xml"> @@ -1441,10 +1504,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws463-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws463-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws463/TestSEI.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/jbws463/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1454,6 +1521,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws463-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws463-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws464 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws464.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws464/WEB-INF/web.xml"> @@ -1468,10 +1540,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws464-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws464-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws464/Hello.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws464/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1481,6 +1557,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws464-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws464-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws484 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws484.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws484/WEB-INF/web.xml"> @@ -1494,12 +1575,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws484-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws484-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws484/*"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws484/TestServiceBean.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.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/jbws484/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1509,6 +1594,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws484-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws484-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws626 --> <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws626.jar"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) @@ -49,18 +49,29 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS413TestCase.class, "jaxrpc-jbws413.war, jaxrpc-jbws413-client.jar"); + return new JBossWSTestSetup(JBWS413TestCase.class, "jaxrpc-jbws413.war, jaxrpc-jbws413-appclient.ear#jaxrpc-jbws413-appclient.jar"); } - public void testClientAccess() throws Exception + public void testAppclientAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestSEI port = (TestSEI)service.getPort(TestSEI.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestSEI port = (TestSEI)service.getPort(TestSEI.class); - JavaType in = new JavaType(new Double[] { new Double(1), new Double(2), new Double(3) }); - JavaType retObj = port.doStuff(in); - assertEquals(in, retObj); + JavaType in = new JavaType(new Double[] { new Double(1), new Double(2), new Double(3) }); + JavaType retObj = port.doStuff(in); + assertEquals(in, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } /** Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) @@ -42,18 +42,29 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS414TestCase.class, "jaxrpc-jbws414.war, jaxrpc-jbws414-client.jar"); + return new JBossWSTestSetup(JBWS414TestCase.class, "jaxrpc-jbws414.war, jaxrpc-jbws414-appclient.ear#jaxrpc-jbws414-appclient.jar"); } public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestSEI port = (TestSEI)service.getPort(TestSEI.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestSEI port = (TestSEI)service.getPort(TestSEI.class); - St st = new St(new RefType("A more appropiate test string")); - St retObj = port.doStuff(st); - assertEquals(st, retObj); + St st = new St(new RefType("A more appropiate test string")); + St retObj = port.doStuff(st); + assertEquals(st, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) @@ -41,11 +41,12 @@ public class JBWS423TestCase extends JBossWSTest { private static DemoEndpoint port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS423TestCase.class, "jaxrpc-jbws423.war, jaxrpc-jbws423-client.jar"); + return new JBossWSTestSetup(JBWS423TestCase.class, "jaxrpc-jbws423.war, jaxrpc-jbws423-appclient.ear#jaxrpc-jbws423-appclient.jar"); } @@ -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 = (DemoEndpoint)service.getPort(DemoEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testGetArray() throws Exception { ValueObj[] expArr = new ValueObj[] { new ValueObj("a", "b"), new ValueObj("c", "d") }; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) @@ -42,24 +42,35 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS424TestCase.class, "jaxrpc-jbws424.war, jaxrpc-jbws424-client.jar"); + return new JBossWSTestSetup(JBWS424TestCase.class, "jaxrpc-jbws424.war, jaxrpc-jbws424-appclient.ear#jaxrpc-jbws424-appclient.jar"); } public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestSEI port = (TestSEI)service.getPort(TestSEI.class); - + InitialContext iniCtx = null; try { - port.doStuff("A more appropiate test string"); - fail("Expected Exception2"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestSEI port = (TestSEI)service.getPort(TestSEI.class); + + try + { + port.doStuff("A more appropiate test string"); + fail("Expected Exception2"); + } + catch (Exception2 ex) + { + assertEquals("Some exception description", ex.getDescription()); + assertEquals("bang", ex.getShortDescr()); + } } - catch (Exception2 ex) + finally { - assertEquals("Some exception description", ex.getDescription()); - assertEquals("bang", ex.getShortDescr()); + if (iniCtx != null) + { + iniCtx.close(); + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) @@ -54,12 +54,12 @@ public class JBWS425TestCase extends JBossWSTest { private static final String SOAP_ACTION = "\"urn:some-soap-action\""; - + private static InitialContext iniCtx; private static Hello endpoint; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS425TestCase.class, "jaxrpc-jbws425.war, jaxrpc-jbws425-client.jar"); + return new JBossWSTestSetup(JBWS425TestCase.class, "jaxrpc-jbws425.war, jaxrpc-jbws425-appclient.ear#jaxrpc-jbws425-appclient.jar"); } public void setUp() throws Exception @@ -67,12 +67,22 @@ super.setUp(); if (endpoint == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); endpoint = (Hello)service.getPort(Hello.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testClientActionFromWSDL() throws Exception { String soapAction = endpoint.hello("Hello Server"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) @@ -45,10 +45,11 @@ public class JBWS434TestCase extends JBossWSTest { private static TestServiceEndpoint port; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(JBWS434TestCase.class, "jaxrpc-jbws434.war, jaxrpc-jbws434-client.jar"); + return new JBossWSTestSetup(JBWS434TestCase.class, "jaxrpc-jbws434.war, jaxrpc-jbws434-appclient.ear#jaxrpc-jbws434-appclient.jar"); } protected void setUp() throws Exception @@ -56,12 +57,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 = (TestServiceEndpoint)service.getPort(TestServiceEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testWildCardArrayWithOtherNS() throws Exception { SOAPFactory factory = SOAPFactory.newInstance(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) @@ -44,18 +44,29 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS456TestCase.class, "jaxrpc-jbws456.war, jaxrpc-jbws456-client.jar"); + return new JBossWSTestSetup(JBWS456TestCase.class, "jaxrpc-jbws456.war, jaxrpc-jbws456-appclient.ear#jaxrpc-jbws456-appclient.jar"); } public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - TestSEI port = (TestSEI)service.getPort(TestSEI.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); + TestSEI port = (TestSEI)service.getPort(TestSEI.class); - JavaType in = new JavaType("A more appropiate test string"); - JavaType retObj = port.doStuff(in); - assertEquals(in.getValue() + " - Processed", TestHandler.getReturnParam()); + JavaType in = new JavaType("A more appropiate test string"); + JavaType retObj = port.doStuff(in); + assertEquals(in.getValue() + " - Processed", TestHandler.getReturnParam()); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) @@ -42,10 +42,11 @@ public class JBWS463TestCase extends JBossWSTest { private static TestSEI port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS463TestCase.class, "jaxrpc-jbws463.war, jaxrpc-jbws463-client.jar"); + return new JBossWSTestSetup(JBWS463TestCase.class, "jaxrpc-jbws463.war, jaxrpc-jbws463-appclient.ear#jaxrpc-jbws463-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 = (TestSEI)service.getPort(TestSEI.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testInteger() throws Exception { String retObj = port.doStuff(new Integer(1)); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) @@ -44,10 +44,11 @@ public class JBWS464TestCase extends JBossWSTest { private static Hello hello; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS464TestCase.class, "jaxrpc-jbws464.war, jaxrpc-jbws464-client.jar"); + return new JBossWSTestSetup(JBWS464TestCase.class, "jaxrpc-jbws464.war, jaxrpc-jbws464-appclient.ear#jaxrpc-jbws464-appclient.jar"); } public void setUp() throws Exception @@ -55,12 +56,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 testValidAccess() throws Exception { String retObj = hello.hello("Hello Server"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2012-03-01 11:34:27 UTC (rev 15798) @@ -42,10 +42,11 @@ public class JBWS484TestCase extends JBossWSTest { private static TestService_PortType endpoint; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS484TestCase.class, "jaxrpc-jbws484.war, jaxrpc-jbws484-client.jar"); + return new JBossWSTestSetup(JBWS484TestCase.class, "jaxrpc-jbws484.war, jaxrpc-jbws484-appclient.ear#jaxrpc-jbws484-appclient.jar"); } public void setUp() throws Exception @@ -53,12 +54,22 @@ super.setUp(); 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 = (TestService_PortType)service.getPort(TestService_PortType.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testValidAccess() throws Exception { int retObj = endpoint.testMethod("Hello", "Server"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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/jbws413/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws413/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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-jbws413?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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/jbws414/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws414/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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-jbws414?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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/jbws423/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws423/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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-jbws423?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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/jbws424/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws424/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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-jbws424?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -5,7 +5,7 @@ <display-name>Test Service</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws425/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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-jbws425?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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/jbws434/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws434/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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-jbws434?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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/jbws456/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws456/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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-jbws456?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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/jbws463/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws463/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -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-jbws463?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -6,7 +6,7 @@ <display-name>Test Service</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws464/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -4,10 +4,8 @@ <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-jbws464?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/application-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -6,7 +6,7 @@ <display-name>Test Service</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/jbws484/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws484/META-INF/jboss-client.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -4,10 +4,8 @@ <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-jbws484?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 11:05:57 UTC (rev 15797) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 11:34:27 UTC (rev 15798) @@ -1193,16 +1193,6 @@ <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/jbws413/JBWS413TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase*</exclude> <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>