March 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15800 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-01 07:41:45 -0500 (Thu, 01 Mar 2012) New Revision: 15800 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/jbws626/JBWS626TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/pom.xml Log: [AS7-3444] enabling appclient tests (WIP) Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 12:41:45 UTC (rev 15800) @@ -405,11 +405,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws68-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws68-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws68/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws68/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws68/ClientHandler.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws68/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -419,6 +424,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws68-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws68-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws70.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws70/WEB-INF/web.xml"> @@ -1643,13 +1653,20 @@ <include name="webservices.xml"/> <include name="wsdl/TestService.wsdl"/> </metainf> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws626/ValueObj.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws626/_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/jbws626/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1657,13 +1674,17 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws626-appclient.jar"/> + </fileset> + </jar> <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws626.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF/application.xml"> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF"> <include name="jboss-app.xml"/> </metainf> <fileset dir="${tests.output.dir}/test-libs"> <include name="jaxrpc-jbws626.jar"/> - <include name="jaxrpc-jbws626-client.jar"/> </fileset> </ear> @@ -1680,11 +1701,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws632-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws632-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws632/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws632/_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/jbws632/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1694,6 +1719,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws632-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws632-appclient.jar"/> + </fileset> + </jar>  <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws637-client.jar"> @@ -1721,11 +1751,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws643-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws643-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws643/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws643/*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/jbws643/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1735,6 +1769,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws643-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws643-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws663b.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws663b/WEB-INF/web.xml"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) @@ -39,12 +39,13 @@ */ public class JBWS626TestCase extends JBossWSTest { + private static InitialContext iniCtx; private static DemoEndpoint port; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear"); + return new JBossWSTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear, jaxrpc-jbws626-appclient.ear#jaxrpc-jbws626-appclient.jar"); } protected void setUp() throws Exception @@ -52,12 +53,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 = (DemoEndpoint) service.getPort(DemoEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + } + super.tearDown(); + } + public void testGetArray() throws Exception { ValueObj[] expArr = new ValueObj[] Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) @@ -42,11 +42,12 @@ public class JBWS632TestCase extends JBossWSTest { private static TestSEI port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-client.jar"); + return new JBossWSTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-appclient.ear#jaxrpc-jbws632-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,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 = (TestSEI)service.getPort(TestSEI.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + } + super.tearDown(); + } + public void testStringArray() throws Exception { String[][] arr = new String[][]{new String[]{"a", "b"}, new String[]{"", null}, new String[]{"c", "d"}}; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) @@ -42,11 +42,12 @@ public class JBWS643TestCase extends JBossWSTest { private static ResearchService port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-client.jar"); + return new JBossWSTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-appclient.ear#jaxrpc-jbws643-appclient.jar"); } protected void setUp() throws Exception @@ -54,12 +55,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/ResearchService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/ResearchService"); port = (ResearchService)service.getPort(ResearchService.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + } + super.tearDown(); + } + public void testCreateService() throws Exception { assertNotNull("port not null", port); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2012-03-01 12:41:45 UTC (rev 15800) @@ -48,7 +48,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS68TestCase.class, "jaxrpc-jbws68.war, jaxrpc-jbws68-client.jar"); + return new JBossWSTestSetup(JBWS68TestCase.class, "jaxrpc-jbws68.war, jaxrpc-jbws68-appclient.ear#jaxrpc-jbws68-appclient.jar"); } /** @@ -56,12 +56,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/resources/jaxrpc/jbws626/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) @@ -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/jbws626/META-INF/application.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application.xml 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/application.xml 2012-03-01 12:41:45 UTC (rev 15800) @@ -13,8 +13,4 @@ </ejb> </module> - <module> - <java>jaxrpc-jbws626-client.jar</java> - </module> </application> - Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) @@ -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-jbws626/DemoBean?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) @@ -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/jbws632/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws632/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) @@ -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-jbws632?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) @@ -8,7 +8,7 @@ <display-name>TestService</display-name> <service-ref> - <service-ref-name>service/ResearchService</service-ref-name> + <service-ref-name>java:jboss/exported/service/ResearchService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/yahoo-research.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/jbws643/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws643/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) @@ -5,11 +5,10 @@ "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/ResearchService</service-ref-name> + <service-ref-name>java:jboss/exported/service/ResearchService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws643?wsdl</wsdl-override> </service-ref> - + </jboss-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/application-client.xml 2012-03-01 12:41:45 UTC (rev 15800) @@ -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/jbws68/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/jboss-client.xml 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws68/META-INF/jboss-client.xml 2012-03-01 12:41:45 UTC (rev 15800) @@ -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-jbws68?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 12:08:12 UTC (rev 15799) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 12:41:45 UTC (rev 15800) @@ -1193,13 +1193,9 @@ <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> + <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</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> - <exclude>org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase*</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>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r15799 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 18 other directories.

by jbossws-commits＠lists.jboss.org

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>  <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>  <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>  <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>  <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>  <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>  <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>  <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>  <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>  <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> + <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</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> <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>

12 years, 1 month

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

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>  <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>  <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>  <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>  <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>  <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>  <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>  <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>  <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>  <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>  <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> - <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>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r15797 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-01 06:05:57 -0500 (Thu, 01 Mar 2012) New Revision: 15797 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/jbws316/JBWS316TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/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:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -955,12 +955,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws316-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws316-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws316/BinDataDTO.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBF*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBFBean.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/jbws316/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -970,6 +974,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws316-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws316-appclient.jar"/> + </fileset> + </jar>  <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-ws.jar"> @@ -1017,7 +1026,7 @@ <include name="jaxrpc-jbws331-client.jar"/> </fileset> </ear> - +  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws349.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws349/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -1030,12 +1039,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws349-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws349-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws349/*"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*EndpointImpl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*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/jbws349/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1045,6 +1058,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws349-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws349-appclient.jar"/> + </fileset> + </jar>  <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar"> @@ -1103,13 +1121,17 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws377-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws377-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws377/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws377/UserType.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws377/*_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws377/*_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/jbws377/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1119,6 +1141,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws377-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws377-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws381.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws381/WEB-INF/web.xml"> @@ -1132,12 +1159,16 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws381-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws381-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws381/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws381/WeatherForecastSoapImpl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.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/jbws381/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1147,6 +1178,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws381-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws381-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws383.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws383/WEB-INF/web.xml"> @@ -1161,11 +1197,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws383-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws383-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws383/TestSEI.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws383/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/jbws383/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1175,6 +1215,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws383-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws383-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws413.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws413/WEB-INF/web.xml"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) @@ -42,11 +42,12 @@ public class JBWS316TestCase extends JBossWSTest { private static TestBusinessFacadeBF_WS endpoint; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS316TestCase.class, "jaxrpc-jbws316.war, jaxrpc-jbws316-client.jar"); + return new JBossWSTestSetup(JBWS316TestCase.class, "jaxrpc-jbws316.war, jaxrpc-jbws316-appclient.ear#jaxrpc-jbws316-appclient.jar"); } public void setUp() throws Exception @@ -54,12 +55,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 = (TestBusinessFacadeBF_WS)service.getPort(TestBusinessFacadeBF_WS.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + /** * Test JSE endpoint */ Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) @@ -40,10 +40,11 @@ public class JBWS349TestCase extends JBossWSTest { private static ServiceFacadeEndpoint endpoint; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS349TestCase.class, "jaxrpc-jbws349.war, jaxrpc-jbws349-client.jar"); + return new JBossWSTestSetup(JBWS349TestCase.class, "jaxrpc-jbws349.war, jaxrpc-jbws349-appclient.ear#jaxrpc-jbws349-appclient.jar"); } public void setUp() throws Exception @@ -51,13 +52,23 @@ super.setUp(); if (endpoint == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/ServiceFacade"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/ServiceFacade"); endpoint = (ServiceFacadeEndpoint)service.getPort(ServiceFacadeEndpoint.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testAssetCreate() throws Exception { Event event = new AssetCreate("AssetCreate", 1, "templ"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) @@ -39,16 +39,34 @@ */ public class JBWS377TestCase extends JBossWSTest { + + private InitialContext iniCtx; + /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS377TestCase.class, "jaxrpc-jbws377.war, jaxrpc-jbws377-client.jar"); + return new JBossWSTestSetup(JBWS377TestCase.class, "jaxrpc-jbws377.war, jaxrpc-jbws377-appclient.ear#jaxrpc-jbws377-appclient.jar"); } + protected void setUp() throws Exception + { + super.setUp(); + iniCtx = getAppclientInitialContext(); + } + + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testEndpointNotNull() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); UserType user = new UserType("kermit"); @@ -58,8 +76,7 @@ public void testEndpointNull() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); String retObj = hello.echoStrings(null, "str2", null); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) @@ -41,11 +41,12 @@ public class JBWS381TestCase extends JBossWSTest { private WeatherForecastSoap port; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS381TestCase.class, "jaxrpc-jbws381.war, jaxrpc-jbws381-client.jar"); + return new JBossWSTestSetup(JBWS381TestCase.class, "jaxrpc-jbws381.war, jaxrpc-jbws381-appclient.ear#jaxrpc-jbws381-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 = (WeatherForecastSoap)service.getPort(WeatherForecastSoap.class); } } + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testWeatherByPlaceName() throws Exception { GetWeatherByPlaceNameResponse retObj = port.getWeatherByPlaceName(new GetWeatherByPlaceName("Munich")); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2012-03-01 11:05:57 UTC (rev 15797) @@ -42,18 +42,29 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS383TestCase.class, "jaxrpc-jbws383.war, jaxrpc-jbws383-client.jar"); + return new JBossWSTestSetup(JBWS383TestCase.class, "jaxrpc-jbws383.war, jaxrpc-jbws383-appclient.ear#jaxrpc-jbws383-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(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/resources/jaxrpc/jbws316/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/application-client.xml 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -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/TestBusinessFacadeBF.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/TestBusinessFacadeMapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws316/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -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-jbws316?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -5,7 +5,7 @@ <display-name>Test Service</display-name> <service-ref> - <service-ref-name>service/ServiceFacade</service-ref-name> + <service-ref-name>java:jboss/exported/service/ServiceFacade</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/ServiceFacade.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/jbws349/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/jboss-client.xml 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws349/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -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/ServiceFacade</service-ref-name> + <service-ref-name>java:jboss/exported/service/ServiceFacade</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws349?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -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/jbws377/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/jboss-client.xml 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws377/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -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-jbws377?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -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/WeatherForecast.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/jbws381/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/jboss-client.xml 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws381/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -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-jbws381?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/application-client.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -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/jbws383/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/jboss-client.xml 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws383/META-INF/jboss-client.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -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-jbws383?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 11:04:50 UTC (rev 15796) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 11:05:57 UTC (rev 15797) @@ -1192,12 +1192,7 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> <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>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r15796 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-01 06:04:50 -0500 (Thu, 01 Mar 2012) New Revision: 15796 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: Merged revisions 15794 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15794 | alessio.soldano(a)jboss.com | 2012-03-01 11:20:52 +0100 (Thu, 01 Mar 2012) | 2 lines Fix assembly plugin configuration to avoid picking the same jbossws-cxf-resources.jar for all target containers; simplify assembly plugin configuration a bit and add missing dependency in dist module ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-01 10:59:10 UTC (rev 15795) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-03-01 11:04:50 UTC (rev 15796) @@ -52,6 +52,13 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-resources</artifactId> + <version>${project.version}</version> + <classifier>jboss711</classifier> + </dependency> + + <dependency> + <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-server</artifactId> <version>${project.version}</version> </dependency> @@ -129,6 +136,7 @@ <scope>provided</scope> </dependency> +  <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss701</artifactId> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 10:59:10 UTC (rev 15795) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 11:04:50 UTC (rev 15796) @@ -30,7 +30,10 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws.cxf:*</include> + <include>org.jboss.ws.cxf:jbossws-cxf-client:jar</include> + <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include> + <include>org.jboss.ws.cxf:jbossws-cxf-server:jar</include> + <include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include> <include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include> <include>org.jboss.com.sun.httpserver:httpserver:jar</include> <include>org.apache.cxf:cxf-*</include> @@ -75,53 +78,39 @@ <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> - <include>org.jboss.ws:jbossws-jboss701:jar</include> - <include>org.jboss.ws:jbossws-jboss702:jar</include> - <include>org.jboss.ws:jbossws-jboss710:jar</include> + <include>org.jboss.ws:jbossws-jboss*:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> - + <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss701:jar:*:tests-integration</include> + <include>org.jboss.ws:jbossws-jboss*:jar:*:tests-integration</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> - </dependencySet> + </dependencySet> <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss702:jar:*:tests-integration</include> + <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:jboss*</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> - </dependencySet> + </dependencySet> <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss710:jar:*:tests-integration</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> - <includes> <include>org.jboss.ws:jbossws-shared-testsuite:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-03-01 10:59:10 UTC (rev 15795) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-03-01 11:04:50 UTC (rev 15796) @@ -41,13 +41,6 @@ <id>all</id> <goals><goal>jar</goal></goals> <phase>package</phase> - <configuration> - <excludes> - <exclude>**/jbossws-jboss701/**</exclude> - <exclude>**/jbossws-jboss702/**</exclude> - <exclude>**/jbossws-jboss710/**</exclude> - </excludes> - </configuration> </execution> <execution> <id>jboss701</id> @@ -76,6 +69,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss711</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss711</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 10:59:10 UTC (rev 15795) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 11:04:50 UTC (rev 15796) @@ -130,7 +130,7 @@ </copy> <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jbossws-cxf-resources.jar"/> + <include name="**/jbossws-cxf-resources-(a){jbossid}.jar"/> <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r15795 - in stack/native/trunk/modules: dist/src/main/scripts and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-01 05:59:10 -0500 (Thu, 01 Mar 2012) New Revision: 15795 Modified: stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/resources/pom.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: Fix assembly plugin configuration to avoid picking the same jbossws-native-resources.jar for all target containers; simplify assembly plugin configuration a bit and add missing dependency in dist module Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2012-03-01 10:20:52 UTC (rev 15794) +++ stack/native/trunk/modules/dist/pom.xml 2012-03-01 10:59:10 UTC (rev 15795) @@ -63,6 +63,13 @@ </dependency> <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-resources</artifactId> + <version>${project.version}</version> + <classifier>jboss711</classifier> + </dependency> + + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common-tools</artifactId> <scope>provided</scope> @@ -107,6 +114,7 @@ <scope>provided</scope> </dependency> +  <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss701</artifactId> Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 10:20:52 UTC (rev 15794) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 10:59:10 UTC (rev 15795) @@ -35,7 +35,6 @@ <include>org.jboss.ws.native:jbossws-native-client</include> <include>org.jboss.ws.native:jbossws-native-factories:jar</include> <include>org.jboss.ws.native:jbossws-native-services:jar</include> - <include>org.jboss.ws.native:jbossws-native-resources:jar:jboss701</include> <include>org.jboss.ws.native:jbossws-native-core</include> <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> <include>javax.jws:jsr181-api:jar</include> @@ -69,9 +68,7 @@ <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> - <include>org.jboss.ws:jbossws-jboss701:jar</include> - <include>org.jboss.ws:jbossws-jboss702:jar</include> - <include>org.jboss.ws:jbossws-jboss710:jar</include> + <include>org.jboss.ws:jbossws-jboss*:jar</include> <include>org.jboss:jbossxb:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> @@ -84,7 +81,7 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss701:jar:*:tests-integration</include> + <include>org.jboss.ws:jbossws-jboss*:jar:*:tests-integration</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> @@ -95,25 +92,13 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss702:jar:*:tests-integration</include> + <include>org.jboss.ws.native:jbossws-native-resources:jar:*:jboss*</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss710:jar:*:tests-integration</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2012-03-01 10:20:52 UTC (rev 15794) +++ stack/native/trunk/modules/resources/pom.xml 2012-03-01 10:59:10 UTC (rev 15795) @@ -41,13 +41,6 @@ <id>all</id> <goals><goal>jar</goal></goals> <phase>package</phase> - <configuration> - <excludes> - <exclude>**/jbossws-jboss701/**</exclude> - <exclude>**/jbossws-jboss702/**</exclude> - <exclude>**/jbossws-jboss710/**</exclude> - </excludes> - </configuration> </execution> <execution> <id>jboss701</id> @@ -76,6 +69,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss711</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss711</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 10:20:52 UTC (rev 15794) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 10:59:10 UTC (rev 15795) @@ -160,7 +160,7 @@ </copy> <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jbossws-native-resources.jar"/> + <include name="**/jbossws-native-resources-(a){jbossid}.jar"/> <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r15794 - in stack/cxf/trunk/modules: dist/src/main/scripts and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-01 05:20:52 -0500 (Thu, 01 Mar 2012) New Revision: 15794 Modified: stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/pom.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: Fix assembly plugin configuration to avoid picking the same jbossws-cxf-resources.jar for all target containers; simplify assembly plugin configuration a bit and add missing dependency in dist module Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-03-01 10:02:34 UTC (rev 15793) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-03-01 10:20:52 UTC (rev 15794) @@ -52,6 +52,13 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-resources</artifactId> + <version>${project.version}</version> + <classifier>jboss711</classifier> + </dependency> + + <dependency> + <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-server</artifactId> <version>${project.version}</version> </dependency> @@ -136,6 +143,7 @@ <scope>provided</scope> </dependency> +  <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss701</artifactId> Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 10:02:34 UTC (rev 15793) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-01 10:20:52 UTC (rev 15794) @@ -30,7 +30,10 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws.cxf:*</include> + <include>org.jboss.ws.cxf:jbossws-cxf-client:jar</include> + <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include> + <include>org.jboss.ws.cxf:jbossws-cxf-server:jar</include> + <include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include> <include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include> <include>org.jboss.com.sun.httpserver:httpserver:jar</include> <include>org.apache.cxf:cxf-*</include> @@ -79,53 +82,39 @@ <include>org.opensaml:xmltooling:jar</include> <include>joda-time:joda-time:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> - <include>org.jboss.ws:jbossws-jboss701:jar</include> - <include>org.jboss.ws:jbossws-jboss702:jar</include> - <include>org.jboss.ws:jbossws-jboss710:jar</include> + <include>org.jboss.ws:jbossws-jboss*:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> - + <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss701:jar:*:tests-integration</include> + <include>org.jboss.ws:jbossws-jboss*:jar:*:tests-integration</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> - </dependencySet> + </dependencySet> <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss702:jar:*:tests-integration</include> + <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:jboss*</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> - </dependencySet> + </dependencySet> <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss710:jar:*:tests-integration</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> - <scope>provided</scope> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> - <includes> <include>org.jboss.ws:jbossws-shared-testsuite:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2012-03-01 10:02:34 UTC (rev 15793) +++ stack/cxf/trunk/modules/resources/pom.xml 2012-03-01 10:20:52 UTC (rev 15794) @@ -41,13 +41,6 @@ <id>all</id> <goals><goal>jar</goal></goals> <phase>package</phase> - <configuration> - <excludes> - <exclude>**/jbossws-jboss701/**</exclude> - <exclude>**/jbossws-jboss702/**</exclude> - <exclude>**/jbossws-jboss710/**</exclude> - </excludes> - </configuration> </execution> <execution> <id>jboss701</id> @@ -76,6 +69,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss711</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss711</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 10:02:34 UTC (rev 15793) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-01 10:20:52 UTC (rev 15794) @@ -138,7 +138,7 @@ </copy> <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jbossws-cxf-resources.jar"/> + <include name="**/jbossws-cxf-resources-(a){jbossid}.jar"/> <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r15793 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-01 05:02:34 -0500 (Thu, 01 Mar 2012) New Revision: 15793 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/jbws217/JBWS217TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/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-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-01 10:02:34 UTC (rev 15793) @@ -839,10 +839,14 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws217-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws217-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws217/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/jbws217/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -852,6 +856,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws217-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws217-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws231.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws231/WEB-INF/web.xml"> @@ -866,11 +875,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws231-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws231-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.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/jbws231/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -880,6 +893,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws231-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws231-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws251.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws251/WEB-INF/web.xml"> @@ -896,13 +914,17 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws251-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws251-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws251/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws251/BaseException.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionOne.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionTwo.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/jbws251/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -912,6 +934,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws251-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws251-appclient.jar"/> + </fileset> + </jar>  <copy todir="${tests.output.dir}/test-resources/META-INF" file="${tests.output.dir}/test-resources/jaxrpc/jbws413/WEB-INF/jaxrpc-mapping.xml"/> @@ -2756,10 +2783,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jbws2234/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws2234/TestException.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/jbws2234/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2768,7 +2800,12 @@ <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - </jar> + </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws2234-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws2234-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2012-03-01 10:02:34 UTC (rev 15793) @@ -41,7 +41,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS217TestCase.class, "jaxrpc-jbws217.war, jaxrpc-jbws217-client.jar"); + return new JBossWSTestSetup(JBWS217TestCase.class, "jaxrpc-jbws217.war, jaxrpc-jbws217-appclient.ear#jaxrpc-jbws217-appclient.jar"); } /** @@ -49,12 +49,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); - int in0 = 100; - int retObj = hello.hello(in0); - assertEquals(in0, retObj); + int in0 = 100; + int retObj = hello.hello(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/jbws2234/JBWS2234TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase.java 2012-03-01 10:02:34 UTC (rev 15793) @@ -39,10 +39,11 @@ public class JBWS2234TestCase extends JBossWSTest { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-client.jar"); + return new JBossWSTestSetup(JBWS2234TestCase.class, "jaxrpc-jbws2234.war, jaxrpc-jbws2234-appclient.ear#jaxrpc-jbws2234-appclient.jar"); } public void setUp() throws Exception @@ -50,12 +51,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 testCall() throws Exception { final String message = "Hello!!"; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2012-03-01 10:02:34 UTC (rev 15793) @@ -40,10 +40,11 @@ public class JBWS231TestCase extends JBossWSTest { private static TestEndpoint port; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS231TestCase.class, "jaxrpc-jbws231.war, jaxrpc-jbws231-client.jar"); + return new JBossWSTestSetup(JBWS231TestCase.class, "jaxrpc-jbws231.war, jaxrpc-jbws231-appclient.ear#jaxrpc-jbws231-appclient.jar"); } public void setUp() throws Exception @@ -51,12 +52,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 testSimple() throws Exception { EyeColorType ret = port.echoSimple(EyeColorType.green); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2012-03-01 10:02:34 UTC (rev 15793) @@ -42,11 +42,12 @@ public class JBWS251TestCase extends JBossWSTest { private static Hello hello; + private static InitialContext iniCtx; /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS251TestCase.class, "jaxrpc-jbws251.war, jaxrpc-jbws251-client.jar"); + return new JBossWSTestSetup(JBWS251TestCase.class, "jaxrpc-jbws251.war, jaxrpc-jbws251-appclient.ear#jaxrpc-jbws251-appclient.jar"); } public void setUp() throws Exception @@ -54,12 +55,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 testNoException() throws Exception { String inStr = "Kermit"; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/application-client.xml 2012-03-01 10:02:34 UTC (rev 15793) @@ -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/jbws217/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws217/META-INF/jboss-client.xml 2012-03-01 10:02:34 UTC (rev 15793) @@ -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-jbws217?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/application-client.xml 2012-03-01 10:02:34 UTC (rev 15793) @@ -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/jbws2234/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws2234/META-INF/jboss-client.xml 2012-03-01 10:02:34 UTC (rev 15793) @@ -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-jbws2234/TestEndpoint?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/application-client.xml 2012-03-01 10:02:34 UTC (rev 15793) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws231/META-INF/jboss-client.xml 2012-03-01 10:02:34 UTC (rev 15793) @@ -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-jbws231?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/application-client.xml 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/application-client.xml 2012-03-01 10:02:34 UTC (rev 15793) @@ -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/jbws251/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/jboss-client.xml 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws251/META-INF/jboss-client.xml 2012-03-01 10:02:34 UTC (rev 15793) @@ -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-jbws251?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 15:23:28 UTC (rev 15792) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-01 10:02:34 UTC (rev 15793) @@ -1192,10 +1192,6 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase*</exclude>

12 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2012