[jbossws-commits] JBossWS SVN: r15685 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: ropalka
Date: 2012-02-17 09:42:33 -0500 (Fri, 17 Feb 2012)
New Revision: 15685

Modified:
   shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
   shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java
Log:
rename ejb archive to don't be detected as appclient jar

Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java	2012-02-17 13:51:17 UTC (rev 15684)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java	2012-02-17 14:42:33 UTC (rev 15685)
@@ -167,7 +167,8 @@
             clientJars.add(archiveURL);
             if (archive.contains("jaxrpc") || archive.contains("serviceref"))
             {
-               performDeploy(archive);
+               // TODO: deploy to appclient
+               //performDeploy(archive);
             }
          }
          else

Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml	2012-02-17 13:51:17 UTC (rev 15684)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml	2012-02-17 14:42:33 UTC (rev 15685)
@@ -475,7 +475,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: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java	2012-02-17 13:51:17 UTC (rev 15684)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java	2012-02-17 14:42:33 UTC (rev 15685)
@@ -43,16 +43,16 @@
 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 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!";