[jboss-cvs] JBossAS SVN: r79019 - projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext.

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

Author: wolfc
Date: 2008-10-02 07:09:32 -0400 (Thu, 02 Oct 2008)
New Revision: 79019

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulLocalOnlyBean.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulRemoteBusiness.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessRemote.java
Log:
EJBTHREE-1201: removed bindings, don't designate 2.1 interfaces, removed circular injection in SFSB

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulBean.java	2008-10-02 10:48:01 UTC (rev 79018)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulBean.java	2008-10-02 11:09:32 UTC (rev 79019)
@@ -26,16 +26,12 @@
 import javax.ejb.EJBContext;
 import javax.ejb.EJBLocalObject;
 import javax.ejb.EJBObject;
-import javax.ejb.Local;
 import javax.ejb.LocalHome;
 import javax.ejb.Remote;
 import javax.ejb.RemoteHome;
 import javax.ejb.Stateful;
 import javax.naming.InitialContext;
 
-import org.jboss.ejb3.annotation.LocalBinding;
-import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ejb3.annotation.RemoteBindings;
 import org.jboss.logging.Logger;
 
 /**
@@ -47,20 +43,12 @@
 @Stateful(name="Stateful")
 @LocalHome(StatefulLocalHome.class)
 @RemoteHome(StatefulRemoteHome.class)
- at Remote({org.jboss.ejb3.test.ejbcontext.Stateful.class, StatefulRemoteBusiness.class,StatefulRemote.class})
- at Local(StatefulLocal.class)
- at LocalBinding(jndiBinding = StatefulLocal.JNDI_NAME)
- at RemoteBindings(
-{@RemoteBinding(jndiBinding = StatefulRemoteBusiness.JNDI_NAME),
-      @RemoteBinding(jndiBinding = org.jboss.ejb3.test.ejbcontext.Stateful.JNDI_NAME)})
+ at Remote({org.jboss.ejb3.test.ejbcontext.Stateful.class, StatefulRemoteBusiness.class})
 public class StatefulBean extends BaseBean
    implements org.jboss.ejb3.test.ejbcontext.Stateful, StatefulRemoteBusiness
 {
    private static final Logger log = Logger.getLogger(StatefulBean.class);
    
-   @EJB(mappedName=StatefulRemoteBusiness.JNDI_NAME)
-   StatefulRemoteBusiness statefulRemote = null;
-   
    @EJB StatefulLocalOnly statefulLocalOnly;
 
    EJBLocalObject ejbLocalObject;
@@ -117,7 +105,7 @@
    
    public Class testLocalInvokedBusinessInterface() throws Exception
    {
-      return statefulRemote.testInvokedBusinessInterface2();
+      return sessionContext.getBusinessObject(StatefulRemoteBusiness.class).testInvokedBusinessInterface2();
    }
    
    @PostConstruct

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulLocalOnlyBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulLocalOnlyBean.java	2008-10-02 10:48:01 UTC (rev 79018)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulLocalOnlyBean.java	2008-10-02 11:09:32 UTC (rev 79019)
@@ -26,7 +26,6 @@
 import javax.ejb.SessionContext;
 import javax.ejb.Stateful;
 
-import org.jboss.ejb3.annotation.LocalBinding;
 import org.jboss.logging.Logger;
 
 /**
@@ -34,7 +33,6 @@
  */
 @Stateful(name="StatefulLocalOnly")
 @Local(StatefulLocalOnly.class)
- at LocalBinding(jndiBinding="StatefulLocalOnly")
 public class StatefulLocalOnlyBean
    implements StatefulLocalOnly
 {

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulRemoteBusiness.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulRemoteBusiness.java	2008-10-02 10:48:01 UTC (rev 79018)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatefulRemoteBusiness.java	2008-10-02 11:09:32 UTC (rev 79019)
@@ -33,7 +33,7 @@
 @Remote
 public interface StatefulRemoteBusiness
 {
-   String JNDI_NAME = "StatefulBean/remote";
+   String JNDI_NAME = "Stateful/remote";
    
    public Class testInvokedBusinessInterface2() throws Exception;
    

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessBean.java	2008-10-02 10:48:01 UTC (rev 79018)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessBean.java	2008-10-02 11:09:32 UTC (rev 79019)
@@ -33,9 +33,6 @@
 import javax.ejb.Stateless;
 import javax.naming.InitialContext;
 
-import org.jboss.ejb3.annotation.LocalBinding;
-import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ejb3.annotation.RemoteBindings;
 import org.jboss.logging.Logger;
 
 
@@ -48,12 +45,8 @@
 @Stateless(name="Stateless")
 @LocalHome(StatelessLocalHome.class)
 @RemoteHome(StatelessRemoteHome.class)
- at Local({StatelessLocalBusiness.class,StatelessLocal.class})
- at Remote({StatelessBusinessRemote.class,StatelessRemote.class})
- at LocalBinding(jndiBinding = StatelessLocal.JNDI_NAME)
- at RemoteBindings({
- at RemoteBinding(jndiBinding = StatelessRemote.JNDI_NAME),
- at RemoteBinding(jndiBinding = StatelessBusinessRemote.JNDI_NAME)})
+ at Local(StatelessLocalBusiness.class)
+ at Remote(StatelessBusinessRemote.class)
 public class StatelessBean extends BaseBean
    implements org.jboss.ejb3.test.ejbcontext.StatelessBusinessRemote, StatelessLocalBusiness
 {
@@ -64,7 +57,7 @@
    SessionContext sessionContext;
    
    StatelessLocal ejbLocalObject;
-   org.jboss.ejb3.test.ejbcontext.StatelessBusinessRemote ejbObject;
+   StatelessRemote ejbObject;
    
    public void noop()
    {
@@ -122,7 +115,7 @@
    public void postConstruct()
    {
       ejbLocalObject = (StatelessLocal)sessionContext.getEJBLocalObject();
-      ejbObject = (org.jboss.ejb3.test.ejbcontext.StatelessBusinessRemote)sessionContext.getEJBObject();
+      ejbObject = (StatelessRemote)sessionContext.getEJBObject();
    }
 
 }

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessRemote.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessRemote.java	2008-10-02 10:48:01 UTC (rev 79018)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbcontext/StatelessRemote.java	2008-10-02 11:09:32 UTC (rev 79019)
@@ -19,5 +19,7 @@
 {
    String JNDI_NAME = "Stateless/remote";
    
+   void noop();
+   
    public Class<?> testInvokedBusinessInterface() throws Exception;
 }