Author: ropalka Date: 2012-02-29 08:43:01 -0500 (Wed, 29 Feb 2012) New Revision: 15789 Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml 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/jbws358/JBWS358TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3444] enable 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 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-02-29 13:43:01 UTC (rev 15789) @@ -1033,10 +1033,14 @@ <include name="wsdl/**"/> </metainf> </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws358/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/jbws358/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1044,15 +1048,17 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws358-appclient.jar"/> + </fileset> + </jar> <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar"/> <unjar dest="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar" src="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar"/> <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear"> <fileset dir="${tests.output.dir}/test-resources/jaxrpc/jbws358"> <include name="META-INF/application.xml"/> </fileset> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws358-client.jar"/> - </fileset> </copy> <!-- jaxrpc-jbws377 --> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java 2012-02-29 13:43:01 UTC (rev 15789) @@ -26,7 +26,10 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; +import junit.framework.Test; + import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; @@ -40,19 +43,34 @@ */ public class JBWS358TestCase extends JBossWSTest { + public static Test suite() + { + return new JBossWSTestSetup(JBWS358TestCase.class, "jaxrpc-jbws358-appclient.ear#jaxrpc-jbws358-appclient.jar"); + } + public void testClientAccess() throws Exception { Hello endpoint = null; try { deploy("jaxrpc-jbws358.ear"); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + endpoint = (Hello)service.getPort(Hello.class); - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - endpoint = (Hello)service.getPort(Hello.class); - - String retStr = endpoint.hello("Hello Server"); - assertEquals("Hello Server", retStr); + String retStr = endpoint.hello("Hello Server"); + assertEquals("Hello Server", retStr); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } finally { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application-client.xml 2012-02-29 13:43:01 UTC (rev 15789) @@ -5,14 +5,13 @@ <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> <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws358.Hello</service-endpoint-interface> </port-component-ref> - </service-ref> </application-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/application.xml 2012-02-29 13:43:01 UTC (rev 15789) @@ -10,9 +10,6 @@ <module> <java>jaxrpc-jbws358.jar</java> </module> - <module> - <java>jaxrpc-jbws358-client.jar</java> - </module> </application> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-client.xml 2012-02-29 13:43:01 UTC (rev 15789) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!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/HelloService</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws358/HelloBean?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/wsdl/HelloService.wsdl 2012-02-29 13:43:01 UTC (rev 15789) @@ -27,7 +27,7 @@ </binding> <service name='HelloService'> <port binding='tns:HelloBinding' name='HelloPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + <soap:address location='http://@jboss.bind.address@:8080/jaxrpc-jbws358/HelloBean?wsdl'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 12:54:42 UTC (rev 15788) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-02-29 13:43:01 UTC (rev 15789) @@ -1156,6 +1156,9 @@ <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude> + <!-- # exploaded EAR deployment failure - should JBoss AS7 support it? --> + <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> + <!-- JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> @@ -1256,9 +1259,6 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude> - <!-- # unpackaged EAR deployment failure --> - <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> - <!-- # [AS7-3946] waiting for jboss metadata 7.0.1.Final upgrade --> <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude>