You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/24 07:44:38 UTC

svn commit: r499281 [1/2] - in /incubator/openejb/trunk/openejb3: container/openejb-core/src/main/java/org/apache/openejb/core/stateful/ container/openejb-core/src/main/java/org/apache/openejb/core/stateless/ itests/openejb-itests-beans/src/main/java/o...

Author: dblevins
Date: Tue Jan 23 22:44:36 2007
New Revision: 499281

URL: http://svn.apache.org/viewvc?view=rev&rev=499281
Log:
Test the lookup of remote and local business interfaces of both stateful and stateless session beans.

Modified:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpObject.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpObject.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulObject.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessObject.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml
    incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/bmp/BmpJndiEncTests.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp/CmpJndiEncTests.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmp2/Cmp2JndiEncTests.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateful/StatefulJndiEncTests.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/stateless/StatelessJndiEncTests.java

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulInstanceManager.java Tue Jan 23 22:44:36 2007
@@ -130,8 +130,8 @@
                 sessionContext = createSessionContext();
                 ctx.bind("java:comp/EJBContext", sessionContext);
             }
-            if(javax.ejb.SessionBean.class.isAssignableFrom(beanClass)) {
-                threadContext.setCurrentOperation(Operation.SET_CONTEXT);
+            if(javax.ejb.SessionBean.class.isAssignableFrom(beanClass) || hasSetSessionContext(beanClass)) {
+                callContext.setCurrentOperation(Operation.SET_CONTEXT);
                 objectRecipe.setProperty("sessionContext", new StaticRecipe(sessionContext));
             }
             for (Injection injection : deploymentInfo.getInjections()) {
@@ -169,6 +169,15 @@
         beanIndex.put(primaryKey, entry);
 
         return bean;
+    }
+
+    private boolean hasSetSessionContext(Class beanClass) {
+        try {
+            beanClass.getMethod("setSessionContext", SessionContext.class);
+            return true;
+        } catch (NoSuchMethodException e) {
+            return false;
+        }
     }
 
     private SessionContext createSessionContext() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java Tue Jan 23 22:44:36 2007
@@ -38,6 +38,7 @@
 import java.lang.reflect.Method;
 import java.rmi.RemoteException;
 import java.util.HashMap;
+import java.util.Map;
 
 public class StatelessInstanceManager {
 
@@ -106,7 +107,7 @@
                     // TODO: This should work
                     ctx.bind("java:comp/EJBContext", sessionContext);
                 }
-                if(javax.ejb.SessionBean.class.isAssignableFrom(beanClass)) {
+                if(javax.ejb.SessionBean.class.isAssignableFrom(beanClass) || hasSetSessionContext(beanClass)) {
                     callContext.setCurrentOperation(Operation.SET_CONTEXT);
                     objectRecipe.setProperty("sessionContext", new StaticRecipe(sessionContext));
                 }
@@ -120,6 +121,12 @@
                     }
                 }
                 bean = objectRecipe.create(beanClass.getClassLoader());
+                Map unsetProperties = objectRecipe.getUnsetProperties();
+                if (unsetProperties.size() > 0){
+                    for (Object property : unsetProperties.keySet()) {
+                        logger.warn("Injection: No such property '"+property+"' in class "+beanClass.getName());
+                    }
+                }
                 callContext.setCurrentOperation(Operation.CREATE);
 
                 Method postConstruct = deploymentInfo.getPostConstruct();
@@ -138,6 +145,15 @@
             }
         }
         return bean;
+    }
+
+    private boolean hasSetSessionContext(Class beanClass) {
+        try {
+            beanClass.getMethod("setSessionContext", SessionContext.class);
+            return true;
+        } catch (NoSuchMethodException e) {
+            return false;
+        }
     }
 
     private SessionContext createSessionContext() {

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java Tue Jan 23 22:44:36 2007
@@ -21,8 +21,12 @@
 import org.apache.openejb.test.TestFailureException;
 import org.apache.openejb.test.stateful.BasicStatefulHome;
 import org.apache.openejb.test.stateful.BasicStatefulObject;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessLocal;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessRemote;
 import org.apache.openejb.test.stateless.BasicStatelessHome;
 import org.apache.openejb.test.stateless.BasicStatelessObject;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessLocal;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
 
 import javax.ejb.EJBException;
 import javax.ejb.EntityContext;
@@ -143,6 +147,58 @@
                 Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
             }
         } catch (AssertionFailedError afe) {
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessLocal object = (BasicStatelessBusinessLocal) ejbContext.lookup("entity/bmp/beanReferences/stateless-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessRemote object = (BasicStatelessBusinessRemote) ejbContext.lookup("entity/bmp/beanReferences/stateless-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessLocal object = (BasicStatefulBusinessLocal) ejbContext.lookup("entity/bmp/beanReferences/stateful-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessRemote object = (BasicStatefulBusinessRemote) ejbContext.lookup("entity/bmp/beanReferences/stateful-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
             throw new TestFailureException(afe);
         }
     }

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java Tue Jan 23 22:44:36 2007
@@ -32,8 +32,12 @@
 import org.apache.openejb.test.TestFailureException;
 import org.apache.openejb.test.stateful.BasicStatefulHome;
 import org.apache.openejb.test.stateful.BasicStatefulObject;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessLocal;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessRemote;
 import org.apache.openejb.test.stateless.BasicStatelessHome;
 import org.apache.openejb.test.stateless.BasicStatelessObject;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessLocal;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
 
 /**
  * 
@@ -41,23 +45,23 @@
  * @author <a href="mailto:Richard@Monson-Haefel.com">Richard Monson-Haefel</a>
  */
 public class EncBmpBean implements javax.ejb.EntityBean{
-    
+
     private int primaryKey;
     private String firstName;
     private String lastName;
     private EntityContext ejbContext;
-    
-    
+
+
     //=============================
     // Home interface methods
     //    
-    
+
     /**
      * Maps to EncBmpHome.findEmptyCollection
      * 
      * @return
      * @exception javax.ejb.FinderException
-     * @see EncBmpHome#findEmptyCollection()   
+     * @see EncBmpHome#findEmptyCollection()
      */
     public java.util.Collection ejbFindEmptyCollection()
     throws javax.ejb.FinderException, java.rmi.RemoteException {
@@ -68,7 +72,7 @@
      * Maps to EncBmpHome.findByPrimaryKey
      * 
      * @param primaryKey
-     * @return 
+     * @return
      * @exception javax.ejb.FinderException
      * @see EncBmpHome#findByPrimaryKey(Integer)
      */
@@ -81,7 +85,7 @@
      * Maps to EncBmpHome.create
      * 
      * @param name
-     * @return 
+     * @return
      * @exception javax.ejb.CreateException
      * @see EncBmpHome#create
      */
@@ -89,28 +93,28 @@
     throws javax.ejb.CreateException{
         return new Integer(-1);
     }
-    
+
     public void ejbPostCreate(String name)
     throws javax.ejb.CreateException{
     }
-    
-    
+
+
     //    
     // Home interface methods
     //=============================
-    
+
 
     //=============================
     // Remote interface methods
     //    
-    
+
 
     public void lookupEntityBean() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             BasicBmpHome home = (BasicBmpHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/bmp/beanReferences/bmp_entity"), BasicBmpHome.class );
             Assert.assertNotNull("The EJBHome looked up is null",home);
 
@@ -123,13 +127,13 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupStatefulBean() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             BasicStatefulHome home = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/bmp/beanReferences/stateful"), BasicStatefulHome.class );
             Assert.assertNotNull("The EJBHome looked up is null",home);
 
@@ -142,13 +146,13 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupStatelessBean() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             BasicStatelessHome home = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/bmp/beanReferences/stateless"), BasicStatelessHome.class );
             Assert.assertNotNull("The EJBHome looked up is null",home);
 
@@ -162,15 +166,81 @@
         }
     }
 
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+                Object o = ctx.lookup("java:comp/env/entity/bmp/beanReferences/stateless-business-local");
+                BasicStatelessBusinessLocal object = (BasicStatelessBusinessLocal) o;
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                e.printStackTrace();
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatelessBusinessRemote object = (BasicStatelessBusinessRemote) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/bmp/beanReferences/stateless-business-remote"), BasicStatelessBusinessRemote.class );
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatefulBusinessLocal object = (BasicStatefulBusinessLocal) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/bmp/beanReferences/stateful-business-local"), BasicStatefulBusinessLocal.class );
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatefulBusinessRemote object = (BasicStatefulBusinessRemote) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/bmp/beanReferences/stateful-business-remote"), BasicStatefulBusinessRemote.class );
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
     public void lookupStringEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             String expected = new String("1");
             String actual   = (String)ctx.lookup("java:comp/env/entity/bmp/references/String");
-            
+
             Assert.assertNotNull("The String looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -181,16 +251,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupDoubleEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Double expected = new Double(1.0D);
             Double actual   = (Double)ctx.lookup("java:comp/env/entity/bmp/references/Double");
-            
+
             Assert.assertNotNull("The Double looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -201,16 +271,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupLongEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Long expected = new Long(1L);
             Long actual   = (Long)ctx.lookup("java:comp/env/entity/bmp/references/Long");
-            
+
             Assert.assertNotNull("The Long looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -221,16 +291,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupFloatEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Float expected = new Float(1.0F);
             Float actual   = (Float)ctx.lookup("java:comp/env/entity/bmp/references/Float");
-            
+
             Assert.assertNotNull("The Float looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -241,16 +311,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupIntegerEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Integer expected = new Integer(1);
             Integer actual   = (Integer)ctx.lookup("java:comp/env/entity/bmp/references/Integer");
-            
+
             Assert.assertNotNull("The Integer looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -261,16 +331,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupShortEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Short expected = new Short((short)1);
             Short actual   = (Short)ctx.lookup("java:comp/env/entity/bmp/references/Short");
-            
+
             Assert.assertNotNull("The Short looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -281,16 +351,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupBooleanEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Boolean expected = new Boolean(true);
             Boolean actual = (Boolean)ctx.lookup("java:comp/env/entity/bmp/references/Boolean");
-            
+
             Assert.assertNotNull("The Boolean looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -301,16 +371,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupByteEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Byte expected = new Byte((byte)1);
             Byte actual   = (Byte)ctx.lookup("java:comp/env/entity/bmp/references/Byte");
-            
+
             Assert.assertNotNull("The Byte looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -357,12 +427,12 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupPersistenceUnit() throws TestFailureException{
         try{
             try{
                 InitialContext ctx = new InitialContext();
-                Assert.assertNotNull("The InitialContext is null", ctx);                
+                Assert.assertNotNull("The InitialContext is null", ctx);
                 EntityManagerFactory emf = (EntityManagerFactory)ctx.lookup("java:comp/env/persistence/TestUnit");
                 Assert.assertNotNull("The EntityManagerFactory is null", emf );
 
@@ -373,7 +443,7 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupPersistenceContext() throws TestFailureException{
         try{
             try{
@@ -400,7 +470,7 @@
     //================================
     // EntityBean interface methods
     //    
-    
+
     /**
      * A container invokes this method to instruct the
      * instance to synchronize its state by loading it state from the
@@ -408,7 +478,7 @@
      */
     public void ejbLoad() throws EJBException,RemoteException {
     }
-    
+
     /**
      * Set the associated entity context. The container invokes this method
      * on an instance after the instance has been created.
@@ -416,14 +486,14 @@
     public void setEntityContext(EntityContext ctx) throws EJBException,RemoteException {
         ejbContext = ctx;
     }
-    
+
     /**
      * Unset the associated entity context. The container calls this method
      * before removing the instance.
      */
     public void unsetEntityContext() throws EJBException,RemoteException {
     }
-    
+
     /**
      * A container invokes this method to instruct the
      * instance to synchronize its state by storing it to the underlying
@@ -431,7 +501,7 @@
      */
     public void ejbStore() throws EJBException,RemoteException {
     }
-    
+
     /**
      * A container invokes this method before it removes the EJB object
      * that is currently associated with the instance. This method
@@ -442,7 +512,7 @@
      */
     public void ejbRemove() throws RemoveException,EJBException,RemoteException {
     }
-    
+
     /**
      * A container invokes this method when the instance
      * is taken out of the pool of available instances to become associated
@@ -451,7 +521,7 @@
      */
     public void ejbActivate() throws EJBException,RemoteException {
     }
-    
+
     /**
      * A container invokes this method on an instance before the instance
      * becomes disassociated with a specific EJB object. After this method

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpObject.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpObject.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpObject.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpObject.java Tue Jan 23 22:44:36 2007
@@ -31,6 +31,11 @@
     public void lookupStatefulBean()  throws TestFailureException, RemoteException;
     public void lookupStatelessBean() throws TestFailureException, RemoteException;
 
+    public void lookupStatelessBusinessLocal() throws TestFailureException, RemoteException;
+    public void lookupStatelessBusinessRemote() throws TestFailureException, RemoteException;
+    public void lookupStatefulBusinessLocal() throws TestFailureException, RemoteException;
+    public void lookupStatefulBusinessRemote() throws TestFailureException, RemoteException;
+
     public void lookupResource() throws TestFailureException, RemoteException;
     public void lookupPersistenceUnit() throws TestFailureException, RemoteException;
     public void lookupPersistenceContext() throws TestFailureException, RemoteException;

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java Tue Jan 23 22:44:36 2007
@@ -21,8 +21,12 @@
 import org.apache.openejb.test.TestFailureException;
 import org.apache.openejb.test.stateful.BasicStatefulHome;
 import org.apache.openejb.test.stateful.BasicStatefulObject;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessLocal;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessRemote;
 import org.apache.openejb.test.stateless.BasicStatelessHome;
 import org.apache.openejb.test.stateless.BasicStatelessObject;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessLocal;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
 
 import javax.ejb.EJBException;
 import javax.ejb.EntityContext;
@@ -119,6 +123,58 @@
                 Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
             }
         } catch (AssertionFailedError afe) {
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessLocal object = (BasicStatelessBusinessLocal) ejbContext.lookup("entity/cmp/beanReferences/stateless-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessRemote object = (BasicStatelessBusinessRemote) ejbContext.lookup("entity/cmp/beanReferences/stateless-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessLocal object = (BasicStatefulBusinessLocal) ejbContext.lookup("entity/cmp/beanReferences/stateful-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessRemote object = (BasicStatefulBusinessRemote) ejbContext.lookup("entity/cmp/beanReferences/stateful-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
             throw new TestFailureException(afe);
         }
     }

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java Tue Jan 23 22:44:36 2007
@@ -29,8 +29,12 @@
 import org.apache.openejb.test.TestFailureException;
 import org.apache.openejb.test.stateful.BasicStatefulHome;
 import org.apache.openejb.test.stateful.BasicStatefulObject;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessLocal;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessRemote;
 import org.apache.openejb.test.stateless.BasicStatelessHome;
 import org.apache.openejb.test.stateless.BasicStatelessObject;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessLocal;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
 
 public abstract class EncCmp2Bean implements EntityBean {
     public EntityContext ejbContext;
@@ -132,6 +136,72 @@
         }
     }
 
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+                Object o = ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateless-business-local");
+                BasicStatelessBusinessLocal object = (BasicStatelessBusinessLocal) o;
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                e.printStackTrace();
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatelessBusinessRemote object = (BasicStatelessBusinessRemote) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateless-business-remote"), BasicStatelessBusinessRemote.class );
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatefulBusinessLocal object = (BasicStatefulBusinessLocal) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateful-business-local"), BasicStatefulBusinessLocal.class );
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatefulBusinessRemote object = (BasicStatefulBusinessRemote) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateful-business-remote"), BasicStatefulBusinessRemote.class );
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
     public void lookupStringEntry() throws TestFailureException {
         try {
             try {
@@ -324,12 +394,12 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupPersistenceUnit() throws TestFailureException{
         try{
             try{
                 InitialContext ctx = new InitialContext();
-                Assert.assertNotNull("The InitialContext is null", ctx);                
+                Assert.assertNotNull("The InitialContext is null", ctx);
                 EntityManagerFactory emf = (EntityManagerFactory)ctx.lookup("java:comp/env/persistence/TestUnit");
                 Assert.assertNotNull("The EntityManagerFactory is null", emf );
 
@@ -340,7 +410,7 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupPersistenceContext() throws TestFailureException{
         try{
             try{

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java Tue Jan 23 22:44:36 2007
@@ -33,8 +33,12 @@
 import org.apache.openejb.test.TestFailureException;
 import org.apache.openejb.test.stateful.BasicStatefulHome;
 import org.apache.openejb.test.stateful.BasicStatefulObject;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessLocal;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessRemote;
 import org.apache.openejb.test.stateless.BasicStatelessHome;
 import org.apache.openejb.test.stateless.BasicStatelessObject;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessLocal;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
 
 /**
  * 
@@ -46,48 +50,48 @@
     public String firstName;
     public String lastName;
     public EntityContext ejbContext;
-    
+
     //=============================
     // Home interface methods
     //    
-    
+
     /**
      * Maps to EncCmpHome.create
      * 
      * @param name
-     * @return 
+     * @return
      * @exception javax.ejb.CreateException
      * @see EncCmpHome#create
      */
     public Integer ejbCreate(String name)
     throws javax.ejb.CreateException{
-        StringTokenizer st = new StringTokenizer(name, " ");    
+        StringTokenizer st = new StringTokenizer(name, " ");
         firstName = st.nextToken();
         lastName = st.nextToken();
         return null;
     }
-    
+
     public void ejbPostCreate(String name)
     throws javax.ejb.CreateException{
     }
-    
-    
+
+
     //    
     // Home interface methods
     //=============================
-    
+
 
     //=============================
     // Remote interface methods
     //    
-    
+
 
     public void lookupEntityBean() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             BasicCmpHome home = (BasicCmpHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/cmp_entity"), BasicCmpHome.class );
             Assert.assertNotNull("The EJBHome looked up is null",home);
 
@@ -100,13 +104,13 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupStatefulBean() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             BasicStatefulHome home = (BasicStatefulHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateful"), BasicStatefulHome.class );
             Assert.assertNotNull("The EJBHome looked up is null",home);
 
@@ -119,13 +123,13 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupStatelessBean() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             BasicStatelessHome home = (BasicStatelessHome) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateless"), BasicStatelessHome.class );
             Assert.assertNotNull("The EJBHome looked up is null",home);
 
@@ -139,15 +143,81 @@
         }
     }
 
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+                Object o = ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateless-business-local");
+                BasicStatelessBusinessLocal object = (BasicStatelessBusinessLocal) o;
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                e.printStackTrace();
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatelessBusinessRemote object = (BasicStatelessBusinessRemote) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateless-business-remote"), BasicStatelessBusinessRemote.class );
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatefulBusinessLocal object = (BasicStatefulBusinessLocal) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateful-business-local"), BasicStatefulBusinessLocal.class );
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatefulBusinessRemote object = (BasicStatefulBusinessRemote) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/entity/cmp/beanReferences/stateful-business-remote"), BasicStatefulBusinessRemote.class );
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
     public void lookupStringEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             String expected = new String("1");
             String actual   = (String)ctx.lookup("java:comp/env/entity/cmp/references/String");
-            
+
             Assert.assertNotNull("The String looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -158,16 +228,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupDoubleEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Double expected = new Double(1.0D);
             Double actual   = (Double)ctx.lookup("java:comp/env/entity/cmp/references/Double");
-            
+
             Assert.assertNotNull("The Double looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -178,16 +248,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupLongEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Long expected = new Long(1L);
             Long actual   = (Long)ctx.lookup("java:comp/env/entity/cmp/references/Long");
-            
+
             Assert.assertNotNull("The Long looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -198,16 +268,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupFloatEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Float expected = new Float(1.0F);
             Float actual   = (Float)ctx.lookup("java:comp/env/entity/cmp/references/Float");
-            
+
             Assert.assertNotNull("The Float looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -218,16 +288,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupIntegerEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Integer expected = new Integer(1);
             Integer actual   = (Integer)ctx.lookup("java:comp/env/entity/cmp/references/Integer");
-            
+
             Assert.assertNotNull("The Integer looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -238,16 +308,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupShortEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Short expected = new Short((short)1);
             Short actual   = (Short)ctx.lookup("java:comp/env/entity/cmp/references/Short");
-            
+
             Assert.assertNotNull("The Short looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -258,16 +328,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupBooleanEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Boolean expected = new Boolean(true);
             Boolean actual = (Boolean)ctx.lookup("java:comp/env/entity/cmp/references/Boolean");
-            
+
             Assert.assertNotNull("The Boolean looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -278,16 +348,16 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupByteEntry() throws TestFailureException{
         try{
             try{
             InitialContext ctx = new InitialContext();
             Assert.assertNotNull("The InitialContext is null", ctx );
-            
+
             Byte expected = new Byte((byte)1);
             Byte actual   = (Byte)ctx.lookup("java:comp/env/entity/cmp/references/Byte");
-            
+
             Assert.assertNotNull("The Byte looked up is null", actual );
             Assert.assertEquals(expected, actual );
 
@@ -339,7 +409,7 @@
         try{
             try{
                 InitialContext ctx = new InitialContext();
-                Assert.assertNotNull("The InitialContext is null", ctx);                
+                Assert.assertNotNull("The InitialContext is null", ctx);
                 EntityManagerFactory emf = (EntityManagerFactory)ctx.lookup("java:comp/env/persistence/TestUnit");
                 Assert.assertNotNull("The EntityManagerFactory is null", emf );
 
@@ -350,7 +420,7 @@
             throw new TestFailureException(afe);
         }
     }
-    
+
     public void lookupPersistenceContext() throws TestFailureException{
         try{
             try{
@@ -377,7 +447,7 @@
     //================================
     // EntityBean interface methods
     //    
-    
+
     /**
      * A container invokes this method to instruct the
      * instance to synchronize its state by loading it state from the
@@ -385,7 +455,7 @@
      */
     public void ejbLoad() throws EJBException,RemoteException {
     }
-    
+
     /**
      * Set the associated entity context. The container invokes this method
      * on an instance after the instance has been created.
@@ -393,14 +463,14 @@
     public void setEntityContext(EntityContext ctx) throws EJBException,RemoteException {
         ejbContext = ctx;
     }
-    
+
     /**
      * Unset the associated entity context. The container calls this method
      * before removing the instance.
      */
     public void unsetEntityContext() throws EJBException,RemoteException {
     }
-    
+
     /**
      * A container invokes this method to instruct the
      * instance to synchronize its state by storing it to the underlying
@@ -408,7 +478,7 @@
      */
     public void ejbStore() throws EJBException,RemoteException {
     }
-    
+
     /**
      * A container invokes this method before it removes the EJB object
      * that is currently associated with the instance. This method
@@ -419,7 +489,7 @@
      */
     public void ejbRemove() throws RemoveException,EJBException,RemoteException {
     }
-    
+
     /**
      * A container invokes this method when the instance
      * is taken out of the pool of available instances to become associated
@@ -428,7 +498,7 @@
      */
     public void ejbActivate() throws EJBException,RemoteException {
     }
-    
+
     /**
      * A container invokes this method on an instance before the instance
      * becomes disassociated with a specific EJB object. After this method

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpObject.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpObject.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpObject.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpObject.java Tue Jan 23 22:44:36 2007
@@ -31,6 +31,11 @@
     public void lookupStatefulBean()  throws TestFailureException, RemoteException;
     public void lookupStatelessBean() throws TestFailureException, RemoteException;
 
+    public void lookupStatelessBusinessLocal() throws TestFailureException, RemoteException;
+    public void lookupStatelessBusinessRemote() throws TestFailureException, RemoteException;
+    public void lookupStatefulBusinessLocal() throws TestFailureException, RemoteException;
+    public void lookupStatefulBusinessRemote() throws TestFailureException, RemoteException;
+
     public void lookupResource() throws TestFailureException, RemoteException;
     public void lookupPersistenceUnit() throws TestFailureException, RemoteException;
     public void lookupPersistenceContext() throws TestFailureException, RemoteException;

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java Tue Jan 23 22:44:36 2007
@@ -23,6 +23,8 @@
 import org.apache.openejb.test.entity.bmp.BasicBmpObject;
 import org.apache.openejb.test.stateless.BasicStatelessHome;
 import org.apache.openejb.test.stateless.BasicStatelessObject;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessLocal;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
 
 import javax.ejb.EJBContext;
 import javax.ejb.EJBException;
@@ -116,6 +118,58 @@
                 Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
             }
         } catch (AssertionFailedError afe) {
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessLocal object = (BasicStatelessBusinessLocal) ejbContext.lookup("stateful/beanReferences/stateless-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessRemote object = (BasicStatelessBusinessRemote) ejbContext.lookup("stateful/beanReferences/stateless-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessLocal object = (BasicStatefulBusinessLocal) ejbContext.lookup("stateful/beanReferences/stateful-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessRemote object = (BasicStatefulBusinessRemote) ejbContext.lookup("stateful/beanReferences/stateful-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
             throw new TestFailureException(afe);
         }
     }

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java Tue Jan 23 22:44:36 2007
@@ -19,6 +19,8 @@
 import org.apache.openejb.test.TestFailureException;
 import org.apache.openejb.test.stateless.BasicStatelessHome;
 import org.apache.openejb.test.stateless.BasicStatelessObject;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessLocal;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
 import org.apache.openejb.test.entity.bmp.BasicBmpHome;
 import org.apache.openejb.test.entity.bmp.BasicBmpObject;
 
@@ -39,11 +41,11 @@
  */
 public class ContextLookupStatefulPojoBean {
 
-    private EntityManager extendedEntityManager;
     private SessionContext ejbContext;
 
-    // Used for testing propigation
-    private static EntityManager inheritedDelegate;
+    public void setSessionContext(SessionContext ejbContext) {
+        this.ejbContext = ejbContext;
+    }
 
     public void lookupEntityBean() throws TestFailureException {
         try {
@@ -93,11 +95,61 @@
         }
     }
 
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessLocal object = (BasicStatelessBusinessLocal) ejbContext.lookup("stateful/beanReferences/stateless-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessRemote object = (BasicStatelessBusinessRemote) ejbContext.lookup("stateful/beanReferences/stateless-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessLocal object = (BasicStatefulBusinessLocal) ejbContext.lookup("stateful/beanReferences/stateful-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessRemote object = (BasicStatefulBusinessRemote) ejbContext.lookup("stateful/beanReferences/stateful-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
     public void lookupStringEntry() throws TestFailureException {
         try {
             try {
-                InitialContext ctx = new InitialContext();
-                ejbContext = (SessionContext)ctx.lookup("java:comp/EJBContext");
                 String expected = new String("1");
                 String actual = (String) ejbContext.lookup("stateful/references/String");
 

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java Tue Jan 23 22:44:36 2007
@@ -37,6 +37,8 @@
 import org.apache.openejb.test.entity.bmp.BasicBmpObject;
 import org.apache.openejb.test.stateless.BasicStatelessHome;
 import org.apache.openejb.test.stateless.BasicStatelessObject;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessLocal;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
 
 /**
  *
@@ -128,6 +130,72 @@
         }
     }
 
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            Object o = ctx.lookup("java:comp/env/stateful/beanReferences/stateless-business-local");
+            BasicStatelessBusinessLocal object = (BasicStatelessBusinessLocal) o;
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                e.printStackTrace();
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatelessBusinessRemote object = (BasicStatelessBusinessRemote) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/stateful/beanReferences/stateless-business-remote"), BasicStatelessBusinessRemote.class );
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatefulBusinessLocal object = (BasicStatefulBusinessLocal) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/stateful/beanReferences/stateful-business-local"), BasicStatefulBusinessLocal.class );
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            InitialContext ctx = new InitialContext();
+            Assert.assertNotNull("The InitialContext is null", ctx );
+
+            BasicStatefulBusinessRemote object = (BasicStatefulBusinessRemote) javax.rmi.PortableRemoteObject.narrow( ctx.lookup("java:comp/env/stateful/beanReferences/stateful-business-remote"), BasicStatefulBusinessRemote.class );
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
     public void lookupStringEntry() throws TestFailureException{
         try{
             try{
@@ -424,8 +492,8 @@
     //    
     // SessionBean interface methods
     //==================================
-    
-    
+
+
     //============================================
     // SessionSynchronization interface methods
     //

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulObject.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulObject.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulObject.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulObject.java Tue Jan 23 22:44:36 2007
@@ -31,6 +31,11 @@
     public void lookupStatefulBean()  throws TestFailureException, RemoteException;
     public void lookupStatelessBean() throws TestFailureException, RemoteException;
 
+    public void lookupStatelessBusinessLocal() throws TestFailureException, RemoteException;
+    public void lookupStatelessBusinessRemote() throws TestFailureException, RemoteException;
+    public void lookupStatefulBusinessLocal() throws TestFailureException, RemoteException;
+    public void lookupStatefulBusinessRemote() throws TestFailureException, RemoteException;
+
     public void lookupResource() throws TestFailureException, RemoteException;
     public void lookupPersistenceUnit() throws TestFailureException, RemoteException;
     public void lookupPersistenceContext() throws TestFailureException, RemoteException;

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java Tue Jan 23 22:44:36 2007
@@ -21,6 +21,8 @@
 import org.apache.openejb.test.TestFailureException;
 import org.apache.openejb.test.entity.bmp.BasicBmpHome;
 import org.apache.openejb.test.stateless.BasicStatelessHome;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessLocal;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
 
 import javax.ejb.CreateException;
 import javax.ejb.SessionContext;
@@ -29,6 +31,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
+import javax.naming.InitialContext;
 import java.rmi.RemoteException;
 
 /**
@@ -57,6 +60,10 @@
     private EntityManager em;
     private EntityManager eem;
     private EntityManager pem;
+    private BasicStatelessBusinessLocal statelessBusinessLocal;
+    private BasicStatelessBusinessRemote statelessBusinessRemote;
+    private BasicStatefulBusinessLocal statefulBusinessLocal;
+    private BasicStatefulBusinessRemote statefulBusinessRemote;
 
     //=============================
     // Home interface methods
@@ -100,6 +107,38 @@
         try {
             Assert.assertNotNull("The EJBObject is null", statelessHome);
         } catch (AssertionFailedError afe) {
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            Assert.assertNotNull("The EJB BusinessLocal is null", statelessBusinessLocal );
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            Assert.assertNotNull("The EJB BusinessRemote is null", statelessBusinessRemote );
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            Assert.assertNotNull("The EJB BusinessLocal is null", statefulBusinessLocal );
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            Assert.assertNotNull("The EJB BusinessRemote is null", statefulBusinessRemote );
+        } catch (AssertionFailedError afe){
             throw new TestFailureException(afe);
         }
     }

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java Tue Jan 23 22:44:36 2007
@@ -18,6 +18,8 @@
 
 import org.apache.openejb.test.entity.bmp.BasicBmpHome;
 import org.apache.openejb.test.stateless.BasicStatelessHome;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessLocal;
+import org.apache.openejb.test.stateless.BasicStatelessBusinessRemote;
 import org.apache.openejb.test.TestFailureException;
 
 import javax.ejb.SessionBean;
@@ -59,6 +61,43 @@
     private EntityManager emField;
     private EntityManager eemField;
     private EntityManager pemField;
+    private BasicStatelessBusinessLocal statelessBusinessLocalField;
+    private BasicStatelessBusinessRemote statelessBusinessRemoteField;
+    private BasicStatefulBusinessLocal statefulBusinessLocalField;
+    private BasicStatefulBusinessRemote statefulBusinessRemoteField;
+
+    public BasicStatefulBusinessLocal getStatefulBusinessLocal() {
+        return statefulBusinessLocalField;
+    }
+
+    public void setStatefulBusinessLocal(BasicStatefulBusinessLocal statefulBusinessLocal) {
+        this.statefulBusinessLocalField = statefulBusinessLocal;
+    }
+
+    public BasicStatefulBusinessRemote getStatefulBusinessRemote() {
+        return statefulBusinessRemoteField;
+    }
+
+    public void setStatefulBusinessRemote(BasicStatefulBusinessRemote statefulBusinessRemote) {
+        this.statefulBusinessRemoteField = statefulBusinessRemote;
+    }
+
+    public BasicStatelessBusinessLocal getStatelessBusinessLocal() {
+        return statelessBusinessLocalField;
+    }
+
+    public void setStatelessBusinessLocal(BasicStatelessBusinessLocal statelessBusinessLocal) {
+        this.statelessBusinessLocalField = statelessBusinessLocal;
+    }
+
+    public BasicStatelessBusinessRemote getStatelessBusinessRemote() {
+        return statelessBusinessRemoteField;
+    }
+
+    public void setStatelessBusinessRemote(BasicStatelessBusinessRemote statelessBusinessRemote) {
+        this.statelessBusinessRemoteField = statelessBusinessRemote;
+    }
+
 
 
     public BasicBmpHome getBmpHome() {
@@ -254,6 +293,38 @@
         try {
             Assert.assertNotNull("The EJBObject is null", statelessHomeField);
         } catch (AssertionFailedError afe) {
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            Assert.assertNotNull("The EJB BusinessLocal is null", statelessBusinessLocalField );
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            Assert.assertNotNull("The EJB BusinessRemote is null", statelessBusinessRemoteField );
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            Assert.assertNotNull("The EJB BusinessLocal is null", statefulBusinessLocalField );
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            Assert.assertNotNull("The EJB BusinessRemote is null", statefulBusinessRemoteField );
+        } catch (AssertionFailedError afe){
             throw new TestFailureException(afe);
         }
     }

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java Tue Jan 23 22:44:36 2007
@@ -23,6 +23,8 @@
 import org.apache.openejb.test.entity.bmp.BasicBmpObject;
 import org.apache.openejb.test.stateful.BasicStatefulHome;
 import org.apache.openejb.test.stateful.BasicStatefulObject;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessLocal;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessRemote;
 
 import javax.ejb.EJBContext;
 import javax.ejb.EJBException;
@@ -97,6 +99,58 @@
                 Assert.fail("Received Exception " + e.getClass() + " : " + e.getMessage());
             }
         } catch (AssertionFailedError afe) {
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessLocal object = (BasicStatelessBusinessLocal) ejbContext.lookup("stateless/beanReferences/stateless-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessRemote object = (BasicStatelessBusinessRemote) ejbContext.lookup("stateless/beanReferences/stateless-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessLocal object = (BasicStatefulBusinessLocal) ejbContext.lookup("stateless/beanReferences/stateful-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessRemote object = (BasicStatefulBusinessRemote) ejbContext.lookup("stateless/beanReferences/stateful-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
             throw new TestFailureException(afe);
         }
     }

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java?view=diff&rev=499281&r1=499280&r2=499281
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java Tue Jan 23 22:44:36 2007
@@ -19,6 +19,8 @@
 import org.apache.openejb.test.TestFailureException;
 import org.apache.openejb.test.stateful.BasicStatefulHome;
 import org.apache.openejb.test.stateful.BasicStatefulObject;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessLocal;
+import org.apache.openejb.test.stateful.BasicStatefulBusinessRemote;
 import org.apache.openejb.test.entity.bmp.BasicBmpHome;
 import org.apache.openejb.test.entity.bmp.BasicBmpObject;
 
@@ -38,8 +40,6 @@
 
 public class ContextLookupStatelessPojoBean {
 
-    
-
     public void lookupEntityBean() throws TestFailureException {
         try {
             try {
@@ -87,6 +87,59 @@
             throw new TestFailureException(afe);
         }
     }
+
+    public void lookupStatelessBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessLocal object = (BasicStatelessBusinessLocal) getSessionContext().lookup("stateless/beanReferences/stateless-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatelessBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatelessBusinessRemote object = (BasicStatelessBusinessRemote) getSessionContext().lookup("stateless/beanReferences/stateless-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessLocal() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessLocal object = (BasicStatefulBusinessLocal) getSessionContext().lookup("stateless/beanReferences/stateful-business-local");
+            Assert.assertNotNull("The EJB BusinessLocal is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
+    public void lookupStatefulBusinessRemote() throws TestFailureException{
+        try{
+            try{
+            BasicStatefulBusinessRemote object = (BasicStatefulBusinessRemote) getSessionContext().lookup("stateless/beanReferences/stateful-business-remote");
+            Assert.assertNotNull("The EJB BusinessRemote is null", object );
+            } catch (Exception e){
+                Assert.fail("Received Exception "+e.getClass()+ " : "+e.getMessage());
+            }
+        } catch (AssertionFailedError afe){
+            throw new TestFailureException(afe);
+        }
+    }
+
 
     public void lookupStringEntry() throws TestFailureException {
         try {