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

Author: ropalka Date: 2012-03-01 16:08:34 -0500 (Thu, 01 Mar 2012) New Revision: 15815 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/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/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 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 21:08:34 UTC (rev 15815) @@ -129,14 +129,18 @@ <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*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/benchmark/jaxrpc/rpclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -144,6 +148,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-rpclit-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-benchmark-rpclit-appclient.jar"/> + </fileset> + </jar> <war warfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> @@ -173,14 +182,18 @@ <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*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/benchmark/jaxrpc/doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -188,6 +201,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-benchmark-doclit-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-benchmark-doclit-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-encoded-href.war --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-encoded-href.war" webxml="${tests.output.dir}/test-resources/jaxrpc/encoded/href/WEB-INF/web.xml"> @@ -2989,11 +3007,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1316/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws1316/*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/jbws1316/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3003,6 +3025,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1316-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-jbws1378 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1378.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1378/WEB-INF/web.xml"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2012-03-01 21:08:34 UTC (rev 15815) @@ -39,27 +39,34 @@ public class BenchmarkDocEJBTestCase extends JBossWSTest { private static BenchmarkService endpoint; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-client.jar"); + return new JBossWSTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-appclient.ear#jaxrpc-benchmark-doclit-appclient.jar"); } protected void setUp() throws Exception { super.setUp(); - if (endpoint == null) { - InitialContext iniCtx = getInitialContext("benchmark-client"); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/BenchmarkEJB"); endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-doc-ejb"); } - - } + + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } public void testEchoSimpleType() throws Exception { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2012-03-01 21:08:34 UTC (rev 15815) @@ -41,10 +41,11 @@ public class BenchmarkDocJSETestCase extends JBossWSTest { private static BenchmarkService endpoint; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-client.jar"); + return new JBossWSTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-appclient.ear#jaxrpc-benchmark-doclit-appclient.jar"); } protected void setUp() throws Exception @@ -55,8 +56,8 @@ { if (endpoint == null) { - InitialContext iniCtx = getInitialContext("benchmark-client"); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/BenchmarkJSE"); endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-doc/jse"); @@ -72,6 +73,15 @@ } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testEchoSimpleType() throws Exception { SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2012-03-01 21:08:34 UTC (rev 15815) @@ -39,10 +39,11 @@ public class BenchmarkRpcEJBTestCase extends JBossWSTest { private static BenchmarkService endpoint; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-client.jar"); + return new JBossWSTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-appclient.ear#jaxrpc-benchmark-rpclit-appclient.jar"); } protected void setUp() throws Exception @@ -51,14 +52,23 @@ if (endpoint == null) { - InitialContext iniCtx = getInitialContext("benchmark-client"); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/BenchmarkEJB"); endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-rpc-ejb"); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testEchoSimpleType() throws Exception { SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2012-03-01 21:08:34 UTC (rev 15815) @@ -39,10 +39,11 @@ public class BenchmarkRpcJSETestCase extends JBossWSTest { private static BenchmarkService endpoint; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-client.jar"); + return new JBossWSTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-appclient.ear#jaxrpc-benchmark-rpclit-appclient.jar"); } protected void setUp() throws Exception @@ -51,14 +52,23 @@ if (endpoint == null) { - InitialContext iniCtx = getInitialContext("benchmark-client"); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/BenchmarkJSE"); endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-rpc"); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testEchoSimpleType() throws Exception { SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java 2012-03-01 21:08:34 UTC (rev 15815) @@ -44,10 +44,11 @@ private static final String MESSAGE = "Hello JBWS1316!!"; private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() { - return new JBossWSTestSetup(JBWS1316CallTestCase.class, "jaxrpc-jbws1316.war, jaxrpc-jbws1316-client.jar"); + return new JBossWSTestSetup(JBWS1316CallTestCase.class, "jaxrpc-jbws1316.war, jaxrpc-jbws1316-appclient.ear#jaxrpc-jbws1316-appclient.jar"); } protected void setUp() throws Exception @@ -55,12 +56,21 @@ 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; + } + } + /** * Test that a message without a wsse:Security header is rejected. * Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/application-client.xml 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/application-client.xml 2012-03-01 21:08:34 UTC (rev 15815) @@ -8,7 +8,7 @@ <display-name>Benchmark test</display-name> <service-ref> - <service-ref-name>service/BenchmarkJSE</service-ref-name> + <service-ref-name>java:jboss/exported/service/BenchmarkJSE</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> @@ -17,7 +17,7 @@ </port-component-ref> </service-ref> <service-ref> - <service-ref-name>service/BenchmarkEJB</service-ref-name> + <service-ref-name>java:jboss/exported/service/BenchmarkEJB</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/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-client.xml 2012-03-01 21:08:34 UTC (rev 15815) @@ -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>benchmark-client</jndi-name> <service-ref> - <service-ref-name>service/BenchmarkJSE</service-ref-name> + <service-ref-name>java:jboss/exported/service/BenchmarkJSE</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-benchmark-doc/jse?wsdl</wsdl-override> </service-ref> <service-ref> - <service-ref-name>service/BenchmarkEJB</service-ref-name> + <service-ref-name>java:jboss/exported/service/BenchmarkEJB</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-benchmark-doc-ejb?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/application-client.xml 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/application-client.xml 2012-03-01 21:08:34 UTC (rev 15815) @@ -8,7 +8,7 @@ <display-name>Benchmark test</display-name> <service-ref> - <service-ref-name>service/BenchmarkJSE</service-ref-name> + <service-ref-name>java:jboss/exported/service/BenchmarkJSE</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> @@ -17,7 +17,7 @@ </port-component-ref> </service-ref> <service-ref> - <service-ref-name>service/BenchmarkEJB</service-ref-name> + <service-ref-name>java:jboss/exported/service/BenchmarkEJB</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/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-client.xml 2012-03-01 21:08:34 UTC (rev 15815) @@ -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>benchmark-client</jndi-name> <service-ref> - <service-ref-name>service/BenchmarkJSE</service-ref-name> + <service-ref-name>java:jboss/exported/service/BenchmarkJSE</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-benchmark-rpc?wsdl</wsdl-override> </service-ref> <service-ref> - <service-ref-name>service/BenchmarkEJB</service-ref-name> + <service-ref-name>java:jboss/exported/service/BenchmarkEJB</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-benchmark-rpc-ejb?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml 2012-03-01 21:08:34 UTC (rev 15815) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> @@ -18,7 +18,7 @@ <handler> <handler-name>ClientHandler</handler-name> <handler-class>org.jboss.test.ws.jaxrpc.jbws1316.TestSecurityHandler</handler-class> - </handler> + </handler> </service-ref> </application-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml 2012-03-01 21:08:34 UTC (rev 15815) @@ -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-jbws1316?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 20:41:27 UTC (rev 15814) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 21:08:34 UTC (rev 15815) @@ -1168,12 +1168,13 @@ <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase*</exclude> <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude>