[webbeans-commits] Webbeans SVN: r646 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bootstrap and 3 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Sun Dec 21 00:24:52 EST 2008
Author: gavin.king at jboss.com
Date: 2008-12-21 00:24:52 -0500 (Sun, 21 Dec 2008)
New Revision: 646
Removed:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java
Log:
EnterpriseBeanLookup stuff is gone from spec
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-12-21 05:16:08 UTC (rev 645)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-12-21 05:24:52 UTC (rev 646)
@@ -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 @@
{
@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
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-12-21 05:16:08 UTC (rev 645)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-12-21 05:24:52 UTC (rev 646)
@@ -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,10 +266,13 @@
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
{
DependentContext.INSTANCE.setActive(false);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2008-12-21 05:16:08 UTC (rev 645)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2008-12-21 05:24:52 UTC (rev 646)
@@ -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 @@
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;
}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java 2008-12-21 05:16:08 UTC (rev 645)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java 2008-12-21 05:24:52 UTC (rev 646)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.webbeans.ejb;
-
-import javax.webbeans.CreationException;
-import javax.webbeans.Current;
-import javax.webbeans.Initializer;
-import javax.webbeans.Standard;
-import javax.webbeans.manager.EnterpriseBeanLookup;
-
-import org.jboss.webbeans.ManagerImpl;
-import org.jboss.webbeans.bootstrap.spi.EjbDescriptor;
-import org.jboss.webbeans.util.JNDI;
-
-/**
- * Provides lookup and metadata registration services for EJBs
- *
- * @author Pete Muir
- * @see java.webbeans.manager.EnterpriseBeanLookup
- */
- at Standard
-public class DefaultEnterpriseBeanLookup implements EnterpriseBeanLookup
-{
-
- private ManagerImpl manager;
-
- @Initializer
- public DefaultEnterpriseBeanLookup(@Current ManagerImpl manager)
- {
- this.manager = manager;
- }
-
- /**
- * Looks up and EJB based on the name
- *
- * @param ejbName The EJB name
- * @return The EJB reference
- */
- public Object lookup(String ejbName)
- {
- if (ejbName == null)
- {
- throw new NullPointerException("No EJB name supplied for lookup");
- }
- return lookup(manager.getEjbDescriptorCache().get(ejbName));
- }
-
- /**
- * Looks up an EJB based on the EJB descriptor
- *
- * @param <T> The type of the EJB
- * @param ejbDescriptor The EJB descriptor
- * @return The EJB reference
- */
- @SuppressWarnings("unchecked")
- public <T> T lookup(EjbDescriptor<T> ejbDescriptor)
- {
- try
- {
- // TODO Implement enterprise 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);
- }
- }
-
-}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java 2008-12-21 05:16:08 UTC (rev 645)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java 2008-12-21 05:24:52 UTC (rev 646)
@@ -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 @@
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);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java 2008-12-21 05:16:08 UTC (rev 645)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java 2008-12-21 05:24:52 UTC (rev 646)
@@ -5,6 +5,6 @@
public class MockManagerImpl extends ManagerImpl
{
- public static int BUILT_IN_BEANS = 4;
+ public static int BUILT_IN_BEANS = 3;
}
More information about the weld-commits
mailing list