Replace all instances of component with bean

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@150 1c488680-804c-0410-94cd-c6b725194a0e
weld · Oct 25, 2008 · cc98f43 · cc98f43
1 parent c555f05
commit cc98f43
Show file tree

Hide file tree

Showing 41 changed files with 380 additions and 450 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java b/webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java
@@ -7,6 +7,7 @@
 import javax.webbeans.manager.Bean;
 import javax.webbeans.manager.Context;
 import javax.webbeans.manager.Manager;
+
 import org.jboss.webbeans.util.MapWrapper;
 
 /**
@@ -64,7 +65,7 @@ public <T> T get(Bean<T> bean, boolean create)
          return null;
       }
 
-      // TODO should component creation be synchronized?
+      // TODO should bean creation be synchronized?
 
       instance = bean.create();
 
@@ -89,7 +90,7 @@ public <T> void remove(Manager manager, Bean<T> bean)
       else
       {
          // TODO is this the correct exception to throw? See section 9.1 of spec
-         throw new RuntimeException("Component " + bean.getName() + " cannot be removed as it " + "does not exist in [" + scopeType + "] context.");
+         throw new RuntimeException("Bean " + bean.getName() + " cannot be removed as it " + "does not exist in [" + scopeType + "] context.");
       }
    }
 

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java
@@ -5,27 +5,27 @@
 
 import javax.webbeans.manager.Bean;
 
-import org.jboss.webbeans.model.AbstractComponentModel;
+import org.jboss.webbeans.model.bean.BeanModel;
 
 public class BeanImpl<T> extends Bean<T>
 {
 
-public static final String LOGGER_NAME = "componentMetaModel";
+   public static final String LOGGER_NAME = "bean";
 
-   private AbstractComponentModel<T, ?> model;
+   private BeanModel<T, ?> beanModel;
 
    private ManagerImpl manager;
 
-   public BeanImpl(AbstractComponentModel<T, ?> model, ManagerImpl manager)
+   public BeanImpl(BeanModel<T, ?> model, ManagerImpl manager)
    {
       super(manager);
-      this.model = model;
+      this.beanModel = model;
    }
 
    @Override
    public T create()
    {
-      return model.getConstructor().invoke(manager);
+      return beanModel.getConstructor().invoke(manager);
    }
 
    @Override
@@ -38,31 +38,31 @@ public void destroy(T instance)
    @Override
    public Set<Annotation> getBindingTypes()
    {
-      return model.getBindingTypes();
+      return beanModel.getBindingTypes();
    }
 
    @Override
    public Class<? extends Annotation> getDeploymentType()
    {
-     return model.getDeploymentType();
+     return beanModel.getDeploymentType();
    }
 
    @Override
    public String getName()
    {
-      return model.getName();
+      return beanModel.getName();
    }
 
    @Override
    public Class<? extends Annotation> getScopeType()
    {
-      return model.getScopeType();
+      return beanModel.getScopeType();
    }
 
    @Override
    public Set<Class<?>> getTypes()
    {
-      return model.getApiTypes();
+      return beanModel.getApiTypes();
    }
 
    @Override
@@ -82,12 +82,12 @@ public boolean isSerializable()
    @Override
    public String toString()
    {
-      return model.toString();
+      return beanModel.toString();
    }
 
-   public AbstractComponentModel<T, ?> getModel()
+   public BeanModel<T, ?> getModel()
    {
-      return model;
+      return beanModel;
    }
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ModelManager.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ModelManager.java
@@ -4,9 +4,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jboss.webbeans.model.AbstractComponentModel;
 import org.jboss.webbeans.model.ScopeModel;
 import org.jboss.webbeans.model.StereotypeModel;
+import org.jboss.webbeans.model.bean.BeanModel;
 import org.jboss.webbeans.util.MapWrapper;
 
 public class ModelManager
@@ -29,7 +29,7 @@ public <T extends Annotation> ScopeModel<T> get(Class<T> key)
 
    private Map<Class<? extends Annotation>, StereotypeModel<?>> stereotypes = new HashMap<Class<? extends Annotation>, StereotypeModel<?>>();
 
-   private Map<Class<?>, AbstractComponentModel<?, ?>> componentModels = new HashMap<Class<?>, AbstractComponentModel<?,?>>();
+   private Map<Class<?>, BeanModel<?, ?>> beanModels = new HashMap<Class<?>, BeanModel<?,?>>();
 
    private ScopeModelMap scopes = new ScopeModelMap(); 
 
@@ -44,14 +44,14 @@ public StereotypeModel<?> getStereotype(Class<? extends Annotation> annotationTy
       return stereotypes.get(annotationType);
    }
 
-   public void addComponentModel(AbstractComponentModel<?, ?> componentModel)
+   public void addBeanModel(BeanModel<?, ?> beanModel)
    {
-      componentModels.put(componentModel.getType(), componentModel);
+      beanModels.put(beanModel.getType(), beanModel);
    }
 
-   public AbstractComponentModel<?, ?> getComponentModel(Class<?> clazz)
+   public BeanModel<?, ?> getBeanModel(Class<?> clazz)
    {
-      return componentModels.get(clazz);
+      return beanModels.get(clazz);
    }
 
    public <T extends Annotation> ScopeModel<T> getScopeModel(Class<T> scopeType)

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
@@ -116,7 +116,7 @@ private void addAnnotationBindings(Set<Annotation> bindingsSet,
 
    private Collection<? extends Annotation> getBindingTypes()
    {
-      // Get the binding types directly from the model for the component
+      // Get the binding types directly from the model for the bean
       return this.eventBindings;
    }
 

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
@@ -9,7 +9,7 @@
 import org.jboss.webbeans.injectable.InjectableMethod;
 import org.jboss.webbeans.injectable.InjectableParameter;
 import org.jboss.webbeans.injectable.InjectableParameterWrapper;
-import org.jboss.webbeans.model.AbstractComponentModel;
+import org.jboss.webbeans.model.bean.BeanModel;
 
 /**
  * <p>
@@ -31,21 +31,21 @@
 public class ObserverImpl<T> implements Observer<T>
 {
 
-   private final AbstractComponentModel<?, ?> componentModel;
+   private final BeanModel<?, ?> beanModel;
    private final InjectableMethod<? extends Object> observerMethod;
    private final Class<T> eventType;
 
    /**
     * Creates an Observer which describes and encapsulates an observer method (7.3).
     * 
-    * @param componentModel The model for the component which defines the
+    * @param beanModel The model for the bean which defines the
     *           observer method
     * @param observer The observer method to notify
     * @param eventType The type of event being observed
     */
-   public ObserverImpl(AbstractComponentModel<?, ?> componentModel, InjectableMethod<?> observer, Class<T> eventType)
+   public ObserverImpl(BeanModel<?, ?> beanModel, InjectableMethod<?> observer, Class<T> eventType)
    {
-      this.componentModel = componentModel;
+      this.beanModel = beanModel;
       this.observerMethod = observer;
       this.eventType = eventType;
    }
@@ -68,7 +68,7 @@ public Class<T> getEventType()
     */
    public void notify(final T event)
    {
-      // Get the most specialized instance of the component
+      // Get the most specialized instance of the bean
       Object instance = null /*getInstance(manager)*/;
       if (instance != null)
       {
@@ -104,7 +104,7 @@ public Object getValue(ManagerImpl manager)
     */
    protected Object getInstance(Manager manager)
    {
-      // Return the most specialized instance of the component
-      return manager.getInstanceByType(componentModel.getType(), componentModel.getBindingTypes().toArray(new Annotation[0]));
+      // Return the most specialized instance of the bean
+      return manager.getInstanceByType(beanModel.getType(), beanModel.getBindingTypes().toArray(new Annotation[0]));
    }
 }
diff --git a/...eans/injectable/ComponentConstructor.java → .../webbeans/injectable/BeanConstructor.java b/...eans/injectable/ComponentConstructor.java → .../webbeans/injectable/BeanConstructor.java
@@ -2,7 +2,7 @@
 
 import org.jboss.webbeans.ManagerImpl;
 
-public interface ComponentConstructor<T>
+public interface BeanConstructor<T>
 {
 
    public T invoke(ManagerImpl manager);

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java b/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java
@@ -4,7 +4,7 @@
 import org.jboss.webbeans.ejb.EjbMetaData;
 
 
-public class EnterpriseConstructor<T> implements ComponentConstructor<T>
+public class EnterpriseConstructor<T> implements BeanConstructor<T>
 {
 
    private EjbMetaData<T> ejbMetaData;

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/JMSConstructor.java b/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/JMSConstructor.java
@@ -3,7 +3,7 @@
 import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.util.JNDI;
 
-public class JMSConstructor<T> implements ComponentConstructor<T>
+public class JMSConstructor<T> implements BeanConstructor<T>
 {
 
    Class<? extends T> type;

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/MethodConstructor.java b/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/MethodConstructor.java
@@ -5,7 +5,7 @@
 import org.jboss.webbeans.ManagerImpl;
 
 public class MethodConstructor<T> extends InjectableMethod<T> implements
-      ComponentConstructor<T>
+      BeanConstructor<T>
 {
 
    public MethodConstructor(Method method)

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java b/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java
@@ -9,10 +9,10 @@
 import org.jboss.webbeans.introspector.SimpleAnnotatedConstructor;
 import org.jboss.webbeans.util.LoggerUtil;
 
-public class SimpleConstructor<T> extends Unit<T, Constructor<T>> implements ComponentConstructor<T>
+public class SimpleConstructor<T> extends Unit<T, Constructor<T>> implements BeanConstructor<T>
 {
 
-   public static final String LOGGER_NAME = "componentConstructor";
+   public static final String LOGGER_NAME = "beanConstructor";
 
    private static Logger log = LoggerUtil.getLogger(LOGGER_NAME);
 

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractProducerComponentModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractProducerComponentModel.java
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/MergedStereotypesModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/MergedStereotypesModel.java
@@ -12,7 +12,7 @@
 import org.jboss.webbeans.introspector.AnnotatedItem;
 
 /**
- * Meta model for the merged stereotype for a component
+ * Meta model for the merged stereotype for a bean
  * @author pmuir
  *
  */
@@ -21,7 +21,7 @@ public class MergedStereotypesModel<T, E>
 
    private Map<Class<? extends Annotation>, Annotation> possibleDeploymentTypes;
    private Set<Annotation> possibleScopeTypes;
-   private boolean componentNameDefaulted;
+   private boolean beanNameDefaulted;
    private Set<Class<?>> requiredTypes;
    private Set<Class<? extends Annotation>> supportedScopes;
 
@@ -55,9 +55,9 @@ public MergedStereotypesModel(AnnotatedItem<T, E> annotatedItem, AnnotatedItem<T
          }
          requiredTypes.addAll(stereotype.getRequiredTypes());
          supportedScopes.addAll(stereotype.getSupportedScopes());
-         if (stereotype.isComponentNameDefaulted()) 
+         if (stereotype.isBeanNameDefaulted()) 
          {
-            componentNameDefaulted = true;
+            beanNameDefaulted = true;
          }
       }
    }
@@ -72,9 +72,9 @@ public Set<Annotation> getPossibleScopeTypes()
       return possibleScopeTypes;
    }
 
-   public boolean isComponentNameDefaulted()
+   public boolean isBeanNameDefaulted()
    {
-      return componentNameDefaulted;
+      return beanNameDefaulted;
    }
 
    public Set<Class<?>> getRequiredTypes()