Author: ropalka Date: 2012-02-17 09:48:07 -0500 (Fri, 17 Feb 2012) New Revision: 15687 Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java Log: Merged revisions 15686 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15686 | ropalka | 2012-02-17 15:44:26 +0100 (Fri, 17 Feb 2012) | 1 line rename ejb archive to don't be detected as appclient jar ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678 + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686 Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-17 14:44:26 UTC (rev 15686) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-17 14:48:07 UTC (rev 15687) @@ -504,7 +504,7 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-ejb-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-ejbclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.class"/> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-17 14:44:26 UTC (rev 15686) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-17 14:48:07 UTC (rev 15687) @@ -45,10 +45,10 @@ public class ServiceRefEJBTestCase extends JBossWSTest { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; - + public static Test suite() { - return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-ejb-client.jar"); + return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-ejbclient.jar"); } public void testWSDLAccess() throws MalformedURLException @@ -58,7 +58,7 @@ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); assertNotNull(wsdlDefinitions); } - + public void testDynamicProxy() throws Exception { URL wsdlURL = getResourceURL("jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); @@ -75,12 +75,11 @@ public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejb-client//EJBClient!" + EJBRemoteHome.class.getName()); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejbclient//EJBClient!" + EJBRemoteHome.class.getName()); EJBRemote ejbRemote = ejbHome.create(); String helloWorld = "Hello World!"; Object retObj = ejbRemote.echo(helloWorld); assertEquals(helloWorld, retObj); - } }