EnterpriseBeanLookup stuff is gone from spec

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@646 1c488680-804c-0410-94cd-c6b725194a0e
weld · Dec 21, 2008 · 90460b1 · 90460b1
1 parent 0ca7a03
commit 90460b1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 95 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
@@ -39,7 +39,6 @@
 
 import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.bindings.CurrentBinding;
-import org.jboss.webbeans.ejb.DefaultEnterpriseBeanLookup;
 import org.jboss.webbeans.introspector.AnnotatedItem;
 import org.jboss.webbeans.introspector.jlr.AbstractAnnotatedItem.AnnotationMap;
 import org.jboss.webbeans.log.LogProvider;
@@ -60,7 +59,7 @@ public abstract class AbstractBean<T, E> extends Bean<T>
 {
 
    @SuppressWarnings("unchecked")
-   private static Set<Class<?>> STANDARD_WEB_BEAN_CLASSES = new HashSet<Class<?>>(Arrays.asList(DefaultEnterpriseBeanLookup.class, Event.class, ManagerImpl.class));
+   private static Set<Class<?>> STANDARD_WEB_BEAN_CLASSES = new HashSet<Class<?>>(Arrays.asList(Event.class, ManagerImpl.class));
 
    /**
     * Helper class for getting deployment type

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
@@ -21,6 +21,7 @@
 import java.util.Set;
 
 import javax.webbeans.ApplicationScoped;
+import javax.webbeans.CreationException;
 import javax.webbeans.Decorator;
 import javax.webbeans.DefinitionException;
 import javax.webbeans.Dependent;
@@ -37,12 +38,12 @@
 import org.jboss.webbeans.bootstrap.spi.EjbDescriptor;
 import org.jboss.webbeans.bootstrap.spi.MethodDescriptor;
 import org.jboss.webbeans.contexts.DependentContext;
-import org.jboss.webbeans.ejb.DefaultEnterpriseBeanLookup;
 import org.jboss.webbeans.introspector.AnnotatedField;
 import org.jboss.webbeans.introspector.AnnotatedMethod;
 import org.jboss.webbeans.introspector.AnnotatedParameter;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
+import org.jboss.webbeans.util.JNDI;
 
 /**
  * An enterprise bean representation
@@ -265,9 +266,12 @@ public T create()
       try
       {
          DependentContext.INSTANCE.setActive(true);
-         T instance = (T) manager.getInstanceByType(DefaultEnterpriseBeanLookup.class).lookup(ejbDescriptor);
-         // TODO Return enterprise proxy
-         return instance;
+         // TODO Implement enterprise bean proxies and select the correct jndiName
+         return (T) JNDI.lookup(ejbDescriptor.getLocalJndiName());
+      }
+      catch (Exception e)
+      {
+         throw new CreationException("could not find the name in JNDI " + ejbDescriptor.getLocalJndiName(), e);
       }
       finally
       {

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
@@ -59,7 +59,6 @@
 import org.jboss.webbeans.bindings.InitializedBinding;
 import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
 import org.jboss.webbeans.contexts.DependentContext;
-import org.jboss.webbeans.ejb.DefaultEnterpriseBeanLookup;
 import org.jboss.webbeans.event.ObserverImpl;
 import org.jboss.webbeans.introspector.AnnotatedField;
 import org.jboss.webbeans.introspector.AnnotatedItem;
@@ -141,7 +140,6 @@ protected void registerBeans(Iterable<Class<?>> classes)
       Set<AbstractBean<?, ?>> beans = new HashSet<AbstractBean<?, ?>>();
       createBean(BeanFactory.createSimpleBean(Transaction.class, manager), beans);
       createBean(BeanFactory.createSimpleBean(ManagerImpl.class, manager), beans);
-      createBean(BeanFactory.createSimpleBean(DefaultEnterpriseBeanLookup.class, manager), beans);
       return beans;
    }
 

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java
diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java
@@ -12,7 +12,6 @@
 import org.jboss.webbeans.bean.EnterpriseBean;
 import org.jboss.webbeans.bean.ProducerMethodBean;
 import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.ejb.DefaultEnterpriseBeanLookup;
 import org.jboss.webbeans.test.beans.Elephant;
 import org.jboss.webbeans.test.beans.InitializedObserver;
 import org.jboss.webbeans.test.beans.InitializedObserverWhichUsesApplicationContext;
@@ -205,7 +204,6 @@ public void testRegisterMultipleEnterpriseAndSimpleBean()
             classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
          }
       }
-      assert classes.containsKey(DefaultEnterpriseBeanLookup.class);
       assert classes.containsKey(Hound.class);
       assert classes.containsKey(Elephant.class);
       assert classes.containsKey(Panther.class);

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java
@@ -5,6 +5,6 @@
 public class MockManagerImpl extends ManagerImpl
 {
 
-   public static int BUILT_IN_BEANS = 4;
+   public static int BUILT_IN_BEANS = 3;
 
 }