[jbossws-commits] JBossWS SVN: r3601 - in branches/jbossws-2.0/jbossws-core: src/test/java/org/jboss/test/ws/jaxws/jbws1556 and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-15 16:48:10 -0400 (Fri, 15 Jun 2007)
New Revision: 3601

Modified:
   branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
Log:
[JBWS-1556] @WebWservice does not work with class isolation

Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml	2007-06-15 16:27:34 UTC (rev 3600)
+++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml	2007-06-15 20:48:10 UTC (rev 3601)
@@ -210,6 +210,7 @@
     <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.jar">
       <fileset dir="${tests.output.dir}/classes">
         <include name="org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.class"/>
+        <include name="org/jboss/test/ws/jaxws/jbws1556/UserType.class"/>
       </fileset>
     </jar>
     <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.ear">

Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java	2007-06-15 16:27:34 UTC (rev 3600)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java	2007-06-15 20:48:10 UTC (rev 3601)
@@ -36,8 +36,14 @@
 public class EJB3Bean
 {
    @WebMethod
-   public String hello(String msg)
+   public String helloSimple(String msg)
    {
       return msg;
    }
+   
+   @WebMethod
+   public UserType helloComplex(UserType msg)
+   {
+      return msg;
+   }
 }

Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java	2007-06-15 16:27:34 UTC (rev 3600)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java	2007-06-15 20:48:10 UTC (rev 3601)
@@ -16,5 +16,7 @@
 @SOAPBinding(style = SOAPBinding.Style.RPC)
 public interface EndpointInterface
 {
-   String hello(String msg);
+   String helloSimple(String msg);
+   
+   UserType helloComplex(UserType msg);
 }

Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java	2007-06-15 16:27:34 UTC (rev 3600)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java	2007-06-15 20:48:10 UTC (rev 3601)
@@ -21,6 +21,7 @@
  */
 package org.jboss.test.ws.jaxws.jbws1556;
 
+import java.net.MalformedURLException;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
@@ -41,18 +42,34 @@
  */
 public class JBWS1556EarTestCase extends JBossWSTest
 {
+   private static EndpointInterface port;
+   
    public static Test suite()
    {
       return JBossWSTestSetup.newTestSetup(JBWS1556EarTestCase.class, "jaxws-jbws1556.ear");
    }
 
-   public void testEndpointAccess() throws Exception
+   public void setUp() throws MalformedURLException
    {
-      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1556/EJB3Bean?wsdl");
-      QName serviceName = new QName("http://jbws1556.jaxws.ws.test.jboss.org/", "EJB3BeanService");
-      Service service = Service.create(wsdlURL, serviceName);
-      EndpointInterface port = service.getPort(EndpointInterface.class);
-      String hello = port.hello("hello");
+      if (port == null)
+      {
+         URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1556/EJB3Bean?wsdl");
+         QName serviceName = new QName("http://jbws1556.jaxws.ws.test.jboss.org/", "EJB3BeanService");
+         Service service = Service.create(wsdlURL, serviceName);
+         port = service.getPort(EndpointInterface.class);
+      }
+   }
+
+   public void testSimpleAccess() throws Exception
+   {
+      String hello = port.helloSimple("hello");
       assertEquals("hello", hello);
    }
+
+   public void testComplexAccess() throws Exception
+   {
+      UserType req = new UserType("hello");
+      UserType res = port.helloComplex(req);
+      assertEquals(req, res);
+   }
 }
\ No newline at end of file