[jboss-cvs] JBossAS SVN: r71358 - in projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices: unit and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-03-27 17:10:30 -0400 (Thu, 27 Mar 2008)
New Revision: 71358

Modified:
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/jsr181/RemoteHomeInterface.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java
Log:
[EJBTHREE-1219] Resolved EJB3-related regressions for webservices tests

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/jsr181/RemoteHomeInterface.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/jsr181/RemoteHomeInterface.java	2008-03-27 19:54:18 UTC (rev 71357)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/jsr181/RemoteHomeInterface.java	2008-03-27 21:10:30 UTC (rev 71358)
@@ -21,13 +21,12 @@
  */
 package org.jboss.ejb3.test.webservices.jsr181;
 
-import javax.ejb.*;
+import javax.ejb.EJBHome;
 
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  */
-public interface RemoteHomeInterface extends EJBHome {
-    
-  public EJB3RemoteBusinessInterface create() throws java.rmi.RemoteException, javax.ejb.CreateException;
-} 
-
+public interface RemoteHomeInterface extends EJBHome
+{
+   public EJB3RemoteInterface create() throws java.rmi.RemoteException, javax.ejb.CreateException;
+}

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java	2008-03-27 19:54:18 UTC (rev 71357)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/jsr181/StatelessBean.java	2008-03-27 21:10:30 UTC (rev 71358)
@@ -21,17 +21,14 @@
  */
 package org.jboss.ejb3.test.webservices.jsr181;
 
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
 import javax.ejb.Remote;
+import javax.ejb.Stateless;
 import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.xml.rpc.Service;
 import javax.xml.ws.WebServiceRef;
-import org.jboss.logging.Logger;
 
 import org.jboss.ejb3.Container;
+import org.jboss.logging.Logger;
 
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java	2008-03-27 19:54:18 UTC (rev 71357)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/JSR181TestCase.java	2008-03-27 21:10:30 UTC (rev 71358)
@@ -21,8 +21,19 @@
  */
 package org.jboss.ejb3.test.webservices.unit;
 
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.rmi.PortableRemoteObject;
+import javax.xml.rpc.Service;
+
 import junit.framework.Test;
+
 import org.jboss.ejb3.test.webservices.jsr181.EJB3RemoteBusinessInterface;
+import org.jboss.ejb3.test.webservices.jsr181.EJB3RemoteInterface;
 import org.jboss.ejb3.test.webservices.jsr181.EndpointInterface;
 import org.jboss.ejb3.test.webservices.jsr181.NarrowableEJB3RemoteHomeInterface;
 import org.jboss.ejb3.test.webservices.jsr181.NarrowableEJB3RemoteInterface;
@@ -30,13 +41,6 @@
 import org.jboss.ejb3.test.webservices.jsr181.StatelessRemote;
 import org.jboss.test.JBossTestCase;
 
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
-import javax.xml.rpc.Service;
-import java.util.Hashtable;
-
 /**
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  * @version $Revision$
@@ -62,7 +66,7 @@
    {
       InitialContext iniCtx = getInitialContext();
       RemoteHomeInterface home = (RemoteHomeInterface)iniCtx.lookup("EJB3Bean/home");
-      EJB3RemoteBusinessInterface ejb3Remote = home.create();
+      EJB3RemoteInterface ejb3Remote = home.create();
 
       String helloWorld = "Hello world!";
       Object retObj = ejb3Remote.echo(helloWorld);
@@ -90,7 +94,9 @@
    public void testWebService() throws Exception
    {
       InitialContext iniCtx = getInitialContext();
-      Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+      Object obj = iniCtx.lookup("java:comp/env/service/TestService");
+      Reference ref = (Reference)iniCtx.lookup("java:comp/env/service/TestService");
+      Service service = (Service)ref.get(0);
       EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
 
       String helloWorld = "Hello world!";

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java	2008-03-27 19:54:18 UTC (rev 71357)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/webservices/unit/WsUnitTestCase.java	2008-03-27 21:10:30 UTC (rev 71358)
@@ -21,17 +21,11 @@
  */
 package org.jboss.ejb3.test.webservices.unit;
 
-import org.jboss.test.JBossTestCase;
-import org.jboss.logging.Logger;
-import org.jboss.ejb3.test.stateful.unit.RemoteUnitTestCase;
-import org.jboss.ejb3.test.stateful.*;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-
-import javax.ejb.NoSuchEJBException;
-
 import junit.framework.Test;
 
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+
 /**
  * Sample client for the jboss container.
  *