openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r791061 [2/4] - in /incubator/openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/component/ main/java/org/apache/webbeans/component/third/ main/java/org/apache/webbeans/component/xml/ main/java/org/apache/webbeans/config/ m...
Date Sat, 04 Jul 2009 06:20:38 GMT
Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java&r1=790362&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Sat Jul  4 06:20:35 2009
@@ -46,16 +46,18 @@
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.Decorator;
 import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.InjectionTarget;
 import javax.enterprise.inject.spi.InterceptionType;
 import javax.enterprise.inject.spi.Interceptor;
 import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.ObserverMethod;
 import javax.enterprise.inject.stereotype.Stereotype;
 import javax.naming.NamingException;
 import javax.naming.Reference;
 import javax.naming.Referenceable;
 import javax.naming.StringRefAddr;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.component.third.ThirdpartyBeanImpl;
 import org.apache.webbeans.container.activity.ActivityManager;
 import org.apache.webbeans.context.ContextFactory;
@@ -79,14 +81,18 @@
 import org.apache.webbeans.xml.WebBeansXMLConfigurator;
 
 /**
- * Implementation of the {@link WebBeansManager} contract of the web beans
+ * Implementation of the {@link BeanManager} contract of the web beans
  * container.
  * 
- * @since 1.0
- * @see java.webbeans.WebBeansManager
+ * <p>
+ * It is written as thread-safe.
+ * </p>
+ * 
+ * @version $Rev$ $Date$
+ * @see BeanManager 
  */
 @SuppressWarnings("unchecked")
-public class ManagerImpl implements BeanManager, Referenceable
+public class BeanManagerImpl implements BeanManager, Referenceable
 {
     /**Holds the context with key scope*/
     private static Map<Class<? extends Annotation>, List<Context>> contextMap = new ConcurrentHashMap<Class<? extends Annotation>, List<Context>>();
@@ -115,25 +121,25 @@
     /**
      * The parent Manager this child is depending from.
      */
-    private ManagerImpl parent;
+    private BeanManagerImpl parent;
     
     /**
      * Creates a new {@link BeanManager} instance.
      * Called by the system. Do not use outside of the
      * system.
      */
-    public ManagerImpl()
+    public BeanManagerImpl()
     {
         injectionResolver = new InjectionResolver(this);
         notificationManager = new NotificationManager();
     }    
     
-    public ManagerImpl getParent()
+    public BeanManagerImpl getParent()
     {
         return this.parent;
     }
     
-    public synchronized void setParent(ManagerImpl parent)
+    public synchronized void setParent(BeanManagerImpl parent)
     {
        this.parent = parent;
     }
@@ -164,11 +170,11 @@
      * 
      * @return the current activity
      */
-    public static ManagerImpl getManager()
+    public static BeanManagerImpl getManager()
     {
         ActivityManager activityManager = ActivityManager.getInstance();
         
-        ManagerImpl currentManager = activityManager.getCurrentActivity();
+        BeanManagerImpl currentManager = activityManager.getCurrentActivity();
         
         return currentManager;
     }
@@ -215,7 +221,7 @@
             }
         }
         
-        List<Context> others = ManagerImpl.contextMap.get(scopeType);
+        List<Context> others = BeanManagerImpl.contextMap.get(scopeType);
         if(others != null)
         {
             for(Context otherContext : others)
@@ -251,7 +257,7 @@
     
     public BeanManager addBean(Bean<?> component)
     {
-        if(component instanceof AbstractComponent)
+        if(component instanceof AbstractBean)
         {
             this.components.add(component);    
         }
@@ -290,7 +296,7 @@
     
     public Object getInstanceByName(String name)
     {
-        AbstractComponent<?> component = null;
+        AbstractBean<?> component = null;
         Object object = null;
 
         Set<Bean<?>> set = this.injectionResolver.implResolveByName(name);
@@ -304,7 +310,7 @@
             throw new AmbiguousResolutionException("There are more than one WebBeans with name : " + name);
         }
 
-        component = (AbstractComponent<?>) set.iterator().next();
+        component = (AbstractBean<?>) set.iterator().next();
 
         object = getInstance(component);
 
@@ -531,14 +537,14 @@
         Asserts.assertNotNull(scopeType, "scopeType parameter can not be null");
         Asserts.assertNotNull(context, "context parameter can not be null");
 
-        List<Context> contextList = ManagerImpl.contextMap.get(scopeType);
+        List<Context> contextList = BeanManagerImpl.contextMap.get(scopeType);
         
         if(contextList == null)
         {
             contextList = new CopyOnWriteArrayList<Context>();
             contextList.add(context);
             
-            ManagerImpl.contextMap.put(scopeType, contextList);
+            BeanManagerImpl.contextMap.put(scopeType, contextList);
         }
         else
         {
@@ -549,7 +555,7 @@
 
     public Reference getReference() throws NamingException
     {
-        return new Reference(ManagerImpl.class.getName(), new StringRefAddr("ManagerImpl", "ManagerImpl"), ManagerObjectFactory.class.getName(), null);
+        return new Reference(BeanManagerImpl.class.getName(), new StringRefAddr("ManagerImpl", "ManagerImpl"), ManagerObjectFactory.class.getName(), null);
     }
 
     /**
@@ -871,6 +877,26 @@
         {
             this.injectionResolver.checkInjectionPoints(injectionPoint);
         }        
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public <T> Set<ObserverMethod<?, T>> resolveObserverMethods(T event, Annotation... bindings)
+    {
+        // TODO Auto-generated method stub
+        return null;
     }    
         
 }
\ No newline at end of file

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ChildActivityManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ChildActivityManager.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ChildActivityManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ChildActivityManager.java Sat Jul  4 06:20:35 2009
@@ -43,14 +43,14 @@
  */
 @SuppressWarnings("unchecked")
 @Deprecated/*Activities are removed from specification*/
-public class ChildActivityManager extends ManagerImpl
+public class ChildActivityManager extends BeanManagerImpl
 {    
     
     /**
      * the ct will be called by {@code Manager#createActivity()}
      * @param parent is the Manager calling this ct
      */
-    public ChildActivityManager(ManagerImpl parent)
+    public ChildActivityManager(BeanManagerImpl parent)
     {
         super();
         
@@ -75,7 +75,7 @@
      * @param parent parent or the child or null if root
      * @return true if bean exist in parent false owise.
      */
-    private boolean checkBean(Bean<?> bean, ManagerImpl parent)
+    private boolean checkBean(Bean<?> bean, BeanManagerImpl parent)
     {
         if(parent == null)
         {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Sat Jul  4 06:20:35 2009
@@ -25,7 +25,7 @@
 import javax.enterprise.inject.spi.InjectionPoint;
 
 import org.apache.webbeans.annotation.CurrentLiteral;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.config.WebBeansFinder;
 import org.apache.webbeans.container.activity.ActivityManager;
 import org.apache.webbeans.deployment.DeploymentTypeManager;
@@ -50,14 +50,14 @@
 public class InjectionResolver
 {
     /**Bean Manager*/
-    private ManagerImpl manager;
+    private BeanManagerImpl manager;
     
     /**
      * Creates a new injection resolve for given bean manager.
      * 
      * @param manager bean manager
      */
-    public InjectionResolver(ManagerImpl manager)
+    public InjectionResolver(BeanManagerImpl manager)
     {
         this.manager = manager;
 
@@ -254,7 +254,7 @@
         {
             for(Bean<?> bean : resolvedComponents)
             {
-                AbstractComponent<?> component = (AbstractComponent<?>)bean;
+                AbstractBean<?> component = (AbstractBean<?>)bean;
                 
                 if(component.isSpecializedBean())
                 {
@@ -357,7 +357,7 @@
         
         while(it.hasNext())
         {
-            AbstractComponent<?> component = (AbstractComponent<?>)it.next();
+            AbstractBean<?> component = (AbstractBean<?>)it.next();
             if(component.isSpecializedBean())
             {
                 res.add(component);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java Sat Jul  4 06:20:35 2009
@@ -24,7 +24,7 @@
 
     public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable<?, ?> environment) throws Exception
     {
-        return ManagerImpl.getManager();
+        return BeanManagerImpl.getManager();
     }
 
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/activity/ActivityManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/activity/ActivityManager.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/activity/ActivityManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/activity/ActivityManager.java Sat Jul  4 06:20:35 2009
@@ -26,7 +26,7 @@
 import javax.enterprise.context.spi.Context;
 
 import org.apache.webbeans.config.WebBeansFinder;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.exception.WebBeansException;
 
 /**
@@ -41,10 +41,10 @@
 public class ActivityManager
 {
     /**Root activity*/
-    private ManagerImpl rootActivity = null;
+    private BeanManagerImpl rootActivity = null;
     
     /**Setted current activities*/
-    private Map<Context, ManagerImpl> currentActivityMap = new ConcurrentHashMap<Context, ManagerImpl>();
+    private Map<Context, BeanManagerImpl> currentActivityMap = new ConcurrentHashMap<Context, BeanManagerImpl>();
     
     /**
      * Used by the system. Do not
@@ -73,7 +73,7 @@
      * 
      * @param rootActivity root activity
      */
-    public synchronized void  setRootActivity(ManagerImpl rootActivity)
+    public synchronized void  setRootActivity(BeanManagerImpl rootActivity)
     {
         this.rootActivity = rootActivity;
     }
@@ -83,7 +83,7 @@
      * 
      * @return the root activity
      */
-    public ManagerImpl getRootActivity()
+    public BeanManagerImpl getRootActivity()
     {
         return this.rootActivity;
     }
@@ -95,7 +95,7 @@
      * @param context
      * @param currentManager
      */
-    public void addCurrentActivity(Context context, ManagerImpl currentManager)
+    public void addCurrentActivity(Context context, BeanManagerImpl currentManager)
     {
         this.currentActivityMap.put(context, currentManager); 
     }
@@ -111,12 +111,12 @@
      * @return the current activity
      * @throws WebBeansException if more than one current activity exist
      */
-    public ManagerImpl getCurrentActivity()
+    public BeanManagerImpl getCurrentActivity()
     {
-        ManagerImpl currentActivity = null;
+        BeanManagerImpl currentActivity = null;
         
         Set<Context> contexts = this.currentActivityMap.keySet();
-        List<ManagerImpl> managers = new ArrayList<ManagerImpl>(); 
+        List<BeanManagerImpl> managers = new ArrayList<BeanManagerImpl>(); 
         for(Context context : contexts)
         {
             if(context.isActive())

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java Sat Jul  4 06:20:35 2009
@@ -16,7 +16,7 @@
 import javax.enterprise.context.Conversation;
 import javax.enterprise.context.ConversationScoped;
 
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ConversationContext;
 import org.apache.webbeans.util.Asserts;
 import org.apache.webbeans.util.StringUtil;
@@ -50,7 +50,7 @@
         this.longRunning = true;
         this.id = StringUtil.generateUUIDStringWithoutDash();
 
-        ConversationManager.getInstance().addConversationContext(this, (ConversationContext) ManagerImpl.getManager().getContext(ConversationScoped.class));
+        ConversationManager.getInstance().addConversationContext(this, (ConversationContext) BeanManagerImpl.getManager().getContext(ConversationScoped.class));
     }
 
     public void begin(String id)
@@ -58,7 +58,7 @@
         this.longRunning = true;
         this.id = id;
 
-        ConversationManager.getInstance().addConversationContext(this, (ConversationContext) ManagerImpl.getManager().getContext(ConversationScoped.class));
+        ConversationManager.getInstance().addConversationContext(this, (ConversationContext) BeanManagerImpl.getManager().getContext(ConversationScoped.class));
     }
 
     public void end()

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java Sat Jul  4 06:20:35 2009
@@ -23,7 +23,7 @@
 
 import org.apache.webbeans.annotation.CurrentLiteral;
 import org.apache.webbeans.config.WebBeansFinder;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ConversationContext;
 import org.apache.webbeans.util.Asserts;
 
@@ -116,8 +116,8 @@
     public Conversation getCurrentConversation()
     {
 
-        Bean<Conversation> bean = (Bean<Conversation>)ManagerImpl.getManager().resolveByType(Conversation.class, new CurrentLiteral()).iterator().next();
-        Conversation conversation = ManagerImpl.getManager().getInstance(bean);
+        Bean<Conversation> bean = (Bean<Conversation>)BeanManagerImpl.getManager().resolveByType(Conversation.class, new CurrentLiteral()).iterator().next();
+        Conversation conversation = BeanManagerImpl.getManager().getInstance(bean);
 
         return conversation;
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java Sat Jul  4 06:20:35 2009
@@ -25,8 +25,8 @@
 import javax.decorator.Decorates;
 import javax.enterprise.inject.spi.Decorator;
 
-import org.apache.webbeans.component.ComponentImpl;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.ManagedBean;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.logger.WebBeansLogger;
@@ -116,7 +116,7 @@
         
     }
 
-    public static void checkSimpleWebBeanDecoratorConditions(ComponentImpl<?> component)
+    public static void checkSimpleWebBeanDecoratorConditions(ManagedBean<?> component)
     {
         Asserts.assertNotNull("component", "component parameter can not be null");
 
@@ -124,7 +124,7 @@
         Annotation[] anns = new Annotation[annSet.size()];
         anns = annSet.toArray(anns);
 
-        List<Decorator<?>> decoratorList = ManagerImpl.getManager().resolveDecorators(component.getTypes(), anns);
+        List<Decorator<?>> decoratorList = BeanManagerImpl.getManager().resolveDecorators(component.getTypes(), anns);
         if (!decoratorList.isEmpty())
         {
             Class<?> clazz = component.getReturnType();

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java Sat Jul  4 06:20:35 2009
@@ -26,8 +26,8 @@
 import javax.enterprise.inject.spi.Decorator;
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.ComponentImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.inject.InjectableField;
 import org.apache.webbeans.inject.InjectableMethods;
@@ -53,11 +53,11 @@
     protected Set<Annotation> delegateBindingTypes = new HashSet<Annotation>();
 
     /** Delegated component */
-    private AbstractComponent<T> delegateComponent;
+    private AbstractBean<T> delegateComponent;
     
     private CreationalContext<Object> creationalContext;
 
-    public WebBeansDecorator(AbstractComponent<T> delegateComponent)
+    public WebBeansDecorator(AbstractBean<T> delegateComponent)
     {
         this.delegateComponent = delegateComponent;
         this.clazz = delegateComponent.getReturnType();
@@ -221,7 +221,7 @@
     public void setInjections(Object proxy)
     {
         // Set injected fields
-        ComponentImpl<T> delegate = (ComponentImpl<T>) this.delegateComponent;
+        ManagedBean<T> delegate = (ManagedBean<T>) this.delegateComponent;
 
         Set<Field> injectedFields = delegate.getInjectedFields();
         for (Field injectedField : injectedFields)
@@ -294,7 +294,7 @@
     /**
      * @return the delegateComponent
      */
-    public AbstractComponent<T> getDelegateComponent()
+    public AbstractBean<T> getDelegateComponent()
     {
         return delegateComponent;
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java Sat Jul  4 06:20:35 2009
@@ -25,8 +25,8 @@
 import javax.enterprise.inject.spi.Decorator;
 
 import org.apache.webbeans.annotation.CurrentLiteral;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.decorator.xml.WebBeansXMLDecorator;
 import org.apache.webbeans.inject.xml.XMLInjectionPointModel;
 import org.apache.webbeans.logger.WebBeansLogger;
@@ -40,7 +40,7 @@
 
     }
 
-    public static <T> void configureDecoratorClass(AbstractComponent<T> delegate)
+    public static <T> void configureDecoratorClass(AbstractBean<T> delegate)
     {
         logger.info("Configuring the Web Beans Annoatated Decorator Class : " + delegate.getReturnType().getName() + " started");
 
@@ -48,10 +48,10 @@
 
         logger.info("Configuring the Web Beans Annotated Decorator Class : " + delegate.getReturnType() + " ended");
 
-        ManagerImpl.getManager().addDecorator(decorator);
+        BeanManagerImpl.getManager().addDecorator(decorator);
     }
 
-    public static <T> void configureXMLDecoratorClass(AbstractComponent<T> delegate, XMLInjectionPointModel model)
+    public static <T> void configureXMLDecoratorClass(AbstractBean<T> delegate, XMLInjectionPointModel model)
     {
         logger.info("Configuring the Web Beans XML based Decorator Class : " + delegate.getReturnType().getName() + " started");
 
@@ -59,23 +59,23 @@
 
         logger.info("Configuring the Web Beans XML based Decorator Class : " + delegate.getReturnType() + " ended");
 
-        ManagerImpl.getManager().addDecorator(decorator);
+        BeanManagerImpl.getManager().addDecorator(decorator);
     }
 
-    public static void configureDecarotors(AbstractComponent<?> component, Object instance)
+    public static void configureDecarotors(AbstractBean<?> component, Object instance)
     {
         Set<Annotation> bindingTypes = component.getBindings();
         Annotation[] anns = new Annotation[bindingTypes.size()];
         anns = bindingTypes.toArray(anns);
 
-        List<Decorator<?>> decoratorList = ManagerImpl.getManager().resolveDecorators(component.getTypes(), anns);
+        List<Decorator<?>> decoratorList = BeanManagerImpl.getManager().resolveDecorators(component.getTypes(), anns);
         Iterator<Decorator<?>> itList = decoratorList.iterator();
 
         while (itList.hasNext())
         {
             WebBeansDecorator<?> decorator = (WebBeansDecorator<?>) itList.next();
 
-            Object decoratorInstance = ManagerImpl.getManager().getInstance(decorator);
+            Object decoratorInstance = BeanManagerImpl.getManager().getInstance(decorator);
 
             decorator.setInjections(decoratorInstance);
             decorator.setDelegate(decoratorInstance, instance);
@@ -86,7 +86,7 @@
 
     private static Set<Decorator<?>> getWebBeansDecorators()
     {
-        return Collections.unmodifiableSet(ManagerImpl.getManager().getDecorators());
+        return Collections.unmodifiableSet(BeanManagerImpl.getManager().getDecorators());
     }
 
     public static Set<Decorator<?>> findDeployedWebBeansDecorator(Set<Type> apiType, Annotation... anns)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java Sat Jul  4 06:20:35 2009
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.decorator.xml;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.decorator.WebBeansDecorator;
 import org.apache.webbeans.inject.xml.XMLInjectionPointModel;
 
@@ -21,7 +21,7 @@
 {
     private XMLInjectionPointModel decoratesModel = null;
 
-    public WebBeansXMLDecorator(AbstractComponent<T> delegateComponent, XMLInjectionPointModel model)
+    public WebBeansXMLDecorator(AbstractBean<T> delegateComponent, XMLInjectionPointModel model)
     {
         super(delegateComponent);
         this.decoratesModel = model;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java Sat Jul  4 06:20:35 2009
@@ -25,7 +25,7 @@
 import javax.enterprise.inject.spi.Bean;
 import javax.servlet.jsp.JspApplicationContext;
 
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 
 /**
  * JSF or JSP expression language a.k.a EL resolver.
@@ -80,7 +80,7 @@
     @Override
     public Object getValue(ELContext context, Object obj, Object property) throws NullPointerException, PropertyNotFoundException, ELException
     {
-        ManagerImpl manager = ManagerImpl.getManager();
+        BeanManagerImpl manager = BeanManagerImpl.getManager();
 
         Object object = null;
         Bean<?> bean = null;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java Sat Jul  4 06:20:35 2009
@@ -26,10 +26,10 @@
 import javax.enterprise.event.Observes;
 
 import org.apache.webbeans.annotation.CurrentLiteral;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.ObservesMethodsOwner;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.ObservesMethodsOwnerBean;
 import org.apache.webbeans.container.InjectionResolver;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.container.activity.ActivityManager;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.logger.WebBeansLogger;
@@ -64,7 +64,7 @@
     private static final WebBeansLogger logger = WebBeansLogger.getLogger(BeanObserverImpl.class);
 
     /**Observer owner bean that defines observer method*/
-    private final ObservesMethodsOwner<?> bean;
+    private final ObservesMethodsOwnerBean<?> bean;
 
     /**Event observer method*/
     private final Method observerMethod;
@@ -83,7 +83,7 @@
      * @param ifExist if exist parameter
      * @param type transaction type
      */
-    public BeanObserverImpl(ObservesMethodsOwner<?> bean, Method observerMethod, boolean ifExist, TransactionalObserverType type)
+    public BeanObserverImpl(ObservesMethodsOwnerBean<?> bean, Method observerMethod, boolean ifExist, TransactionalObserverType type)
     {
         this.bean = bean;
         this.observerMethod = observerMethod;
@@ -97,14 +97,14 @@
     @SuppressWarnings("unchecked")
     public void notify(T event)
     {
-        AbstractComponent<Object> baseComponent = (AbstractComponent<Object>) bean;
-        AbstractComponent<Object> specializedComponent = null;
+        AbstractBean<Object> baseComponent = (AbstractBean<Object>) bean;
+        AbstractBean<Object> specializedComponent = null;
         Object object = null;
 
         try
         {
-            ManagerImpl manager = ActivityManager.getInstance().getCurrentActivity();
-            specializedComponent = (AbstractComponent<Object>)WebBeansUtil.getMostSpecializedBean(manager, baseComponent);        
+            BeanManagerImpl manager = ActivityManager.getInstance().getCurrentActivity();
+            specializedComponent = (AbstractBean<Object>)WebBeansUtil.getMostSpecializedBean(manager, baseComponent);        
             Context context = manager.getContext(specializedComponent.getScopeType());
             
             if(this.ifExist)
@@ -181,7 +181,7 @@
 
         List<Object> list = new ArrayList<Object>();
 
-        ManagerImpl manager = ActivityManager.getInstance().getCurrentActivity();
+        BeanManagerImpl manager = ActivityManager.getInstance().getCurrentActivity();
 
         if (types.length > 0)
         {
@@ -237,7 +237,7 @@
      * 
      * @return the bean
      */
-    public ObservesMethodsOwner<?> getBean()
+    public ObservesMethodsOwnerBean<?> getBean()
     {
         return bean;
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java Sat Jul  4 06:20:35 2009
@@ -21,7 +21,7 @@
 import javax.enterprise.event.Observer;
 import javax.event.Fires;
 
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 
 public class EventImpl<T> implements Event<T>
 {
@@ -29,13 +29,13 @@
 
     private Class<T> eventType;
 
-    private ManagerImpl manager = null;
+    private BeanManagerImpl manager = null;
 
     public EventImpl(Annotation[] injectedBindings, Class<T> eventType)
     {
         this.injectedBindings = injectedBindings;
         this.eventType = eventType;
-        this.manager = ManagerImpl.getManager();
+        this.manager = BeanManagerImpl.getManager();
     }
 
     public void fire(T event, Annotation... bindings)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Sat Jul  4 06:20:35 2009
@@ -32,8 +32,8 @@
 import javax.transaction.Synchronization;
 import javax.transaction.Transaction;
 
-import org.apache.webbeans.component.ObservesMethodsOwner;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.ObservesMethodsOwnerBean;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.container.activity.ActivityManager;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.logger.WebBeansLogger;
@@ -60,7 +60,7 @@
 
     public static NotificationManager getInstance()
     {
-        ManagerImpl manager =  ActivityManager.getInstance().getCurrentActivity();
+        BeanManagerImpl manager =  ActivityManager.getInstance().getCurrentActivity();
         
         return manager.getNotificationManager();
     }
@@ -286,7 +286,7 @@
         }
     }
 
-    public <T> void addObservableComponentMethods(ObservesMethodsOwner<?> component)
+    public <T> void addObservableComponentMethods(ObservesMethodsOwnerBean<?> component)
     {
         Asserts.assertNotNull(component, "component parameter can not be null");
         Set<Method> observableMethods = component.getObservableMethods();

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java Sat Jul  4 06:20:35 2009
@@ -19,9 +19,9 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.webbeans.component.ObservesMethodsOwner;
+import org.apache.webbeans.component.ObservesMethodsOwnerBean;
 import org.apache.webbeans.container.InjectionResolver;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.event.BeanObserverImpl;
 import org.apache.webbeans.event.TransactionalObserverType;
 import org.apache.webbeans.inject.xml.XMLInjectionPointModel;
@@ -30,7 +30,7 @@
 {
     private List<XMLInjectionPointModel> observersParameters = new ArrayList<XMLInjectionPointModel>();
 
-    public BeanObserverXMLImpl(ObservesMethodsOwner<?> bean, Method observerMethod, boolean ifExist, TransactionalObserverType type)
+    public BeanObserverXMLImpl(ObservesMethodsOwnerBean<?> bean, Method observerMethod, boolean ifExist, TransactionalObserverType type)
     {
         super(bean, observerMethod, ifExist, type);
     }
@@ -45,7 +45,7 @@
     protected List<Object> getMethodArguments(Object event)
     {
         List<Object> params = new ArrayList<Object>();
-        ManagerImpl manager = ManagerImpl.getManager();
+        BeanManagerImpl manager = BeanManagerImpl.getManager();
         for (XMLInjectionPointModel model : observersParameters)
         {
             Set<Annotation> setBindingTypes = model.getBindingTypes();

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java Sat Jul  4 06:20:35 2009
@@ -24,9 +24,9 @@
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.event.Fires;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.container.InjectionResolver;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.plugins.OpenWebBeansPlugin;
 import org.apache.webbeans.plugins.PluginLoader;
 import org.apache.webbeans.util.AnnotationUtil;
@@ -46,7 +46,7 @@
 public abstract class AbstractInjectable implements Injectable
 {
     /** Owner bean of the injection point*/
-    protected AbstractComponent<?> injectionOwnerComponent;
+    protected AbstractBean<?> injectionOwnerComponent;
     
     /**Creational context instance that is passed to bean's create*/
     protected CreationalContext<?> creationalContext;
@@ -60,7 +60,7 @@
      * @param bean owner bean
      * @param creaitonalContext creational context instance
      */
-    protected AbstractInjectable(AbstractComponent<?> bean, CreationalContext<?> creaitonalContext)
+    protected AbstractInjectable(AbstractBean<?> bean, CreationalContext<?> creaitonalContext)
     {
         this.injectionOwnerComponent = bean;
         this.creationalContext = creaitonalContext;
@@ -125,7 +125,7 @@
      */
     protected Object injectDependentOwnerInjectionPoint()
     {
-        AbstractComponent<?> dependentComponent = this.injectionOwnerComponent;
+        AbstractBean<?> dependentComponent = this.injectionOwnerComponent;
         InjectionPoint injectionPointOfOwner = dependentComponent.getDependentOwnerInjectionPoint();
         
         if(injectionPointOfOwner != null)
@@ -198,7 +198,7 @@
 
     private <T> Object injectForComponent(InjectionPoint injectionPoint)
     {
-        Object object = ManagerImpl.getManager().getInstanceToInject(injectionPoint,this.creationalContext);
+        Object object = BeanManagerImpl.getManager().getInstanceToInject(injectionPoint,this.creationalContext);
                 
         return object;
     }
@@ -216,7 +216,7 @@
      * 
      * @return the component
      */
-    public AbstractComponent<?> getInjectionOwnerComponent()
+    public AbstractBean<?> getInjectionOwnerComponent()
     {
         return injectionOwnerComponent;
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java Sat Jul  4 06:20:35 2009
@@ -21,13 +21,13 @@
 import javax.enterprise.inject.spi.AnnotatedParameter;
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.ComponentImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.ejb.EJBUtil;
 import org.apache.webbeans.exception.WebBeansException;
 
 /**
- * Injects the parameters of the {@link ComponentImpl} constructor and returns
+ * Injects the parameters of the {@link ManagedBean} constructor and returns
  * the created instance.
  * 
  * @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
@@ -44,7 +44,7 @@
      * 
      * @param cons injectable constructor
      */
-    public InjectableConstructor(Constructor<T> cons, AbstractComponent<?> owner,CreationalContext<?> creationalContext)
+    public InjectableConstructor(Constructor<T> cons, AbstractBean<?> owner,CreationalContext<?> creationalContext)
     {
         super(owner,creationalContext);
         this.con = cons;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java Sat Jul  4 06:20:35 2009
@@ -18,7 +18,7 @@
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.exception.WebBeansException;
 
 /**
@@ -32,7 +32,7 @@
     protected Field field;
     protected Object instance;
 
-    public InjectableField(Field field, Object instance, AbstractComponent<?> owner,CreationalContext<?> creationalContext)
+    public InjectableField(Field field, Object instance, AbstractBean<?> owner,CreationalContext<?> creationalContext)
     {
         super(owner,creationalContext);
         this.field = field;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java Sat Jul  4 06:20:35 2009
@@ -21,7 +21,7 @@
 import javax.enterprise.inject.spi.AnnotatedParameter;
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.exception.WebBeansException;
 
 @SuppressWarnings("unchecked")
@@ -39,7 +39,7 @@
      * @param m injectable method
      * @param instance component instance
      */
-    public InjectableMethods(Method m, Object instance, AbstractComponent<?> owner,CreationalContext<?> creationalContext)
+    public InjectableMethods(Method m, Object instance, AbstractBean<?> owner,CreationalContext<?> creationalContext)
     {
         super(owner,creationalContext);
         this.method = m;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java Sat Jul  4 06:20:35 2009
@@ -24,7 +24,7 @@
 import javax.enterprise.inject.spi.Bean;
 
 import org.apache.webbeans.container.InjectionResolver;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.container.ResolutionUtil;
 import org.apache.webbeans.util.AnnotationUtil;
 import org.apache.webbeans.util.ClassUtil;
@@ -78,7 +78,7 @@
         ResolutionUtil.checkResolvedBeans(beans, ClassUtil.getClazz(this.injectionClazz),anns);
 
         Bean<?> bean = beans.iterator().next();
-        instance = (T)ManagerImpl.getManager().getInstance(bean);
+        instance = (T)BeanManagerImpl.getManager().getInstance(bean);
 
         return instance;
     }
@@ -204,7 +204,7 @@
         Set<T> instances = new HashSet<T>();
         for(Bean<?> bean : beans)
         {
-            T instance = (T)ManagerImpl.getManager().getInstance(bean);
+            T instance = (T)BeanManagerImpl.getManager().getInstance(bean);
             instances.add(instance);
         }
         

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableConstructor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableConstructor.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableConstructor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableConstructor.java Sat Jul  4 06:20:35 2009
@@ -21,7 +21,7 @@
 
 import javax.enterprise.context.spi.CreationalContext;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.ejb.EJBUtil;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.inject.InjectableConstructor;
@@ -41,7 +41,7 @@
      * @param constructor bean constructor
      * @param owner constructor owner beans
      */
-    public XMLInjectableConstructor(Constructor<T> constructor, AbstractComponent<?> owner,CreationalContext<?> creationalContext)
+    public XMLInjectableConstructor(Constructor<T> constructor, AbstractBean<?> owner,CreationalContext<?> creationalContext)
     {
         super(constructor, owner,creationalContext);
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableField.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableField.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableField.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableField.java Sat Jul  4 06:20:35 2009
@@ -18,7 +18,7 @@
 
 import javax.enterprise.context.spi.CreationalContext;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.inject.InjectableField;
 
@@ -26,7 +26,7 @@
 {
     private XMLInjectionPointModel injectionPointModel = null;
 
-    public XMLInjectableField(Field field, Object instance, AbstractComponent<?> owner, XMLInjectionPointModel model,CreationalContext<?> creationalContext)
+    public XMLInjectableField(Field field, Object instance, AbstractBean<?> owner, XMLInjectionPointModel model,CreationalContext<?> creationalContext)
     {
         super(field, instance, owner,creationalContext);
         this.injectionPointModel = model;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableMethods.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableMethods.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableMethods.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableMethods.java Sat Jul  4 06:20:35 2009
@@ -21,14 +21,14 @@
 
 import javax.enterprise.context.spi.CreationalContext;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.inject.InjectableMethods;
 
 public class XMLInjectableMethods<T> extends InjectableMethods<T>
 {
     private List<XMLInjectionPointModel> injectionPointModelList = new ArrayList<XMLInjectionPointModel>();
 
-    public XMLInjectableMethods(Method m, Object instance, AbstractComponent<?> owner, List<XMLInjectionPointModel> injectionPointModelList,CreationalContext<?> creationalContext)
+    public XMLInjectableMethods(Method m, Object instance, AbstractBean<?> owner, List<XMLInjectionPointModel> injectionPointModelList,CreationalContext<?> creationalContext)
     {
         super(m, instance, owner,creationalContext);
         this.injectionPointModelList = injectionPointModelList;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java Sat Jul  4 06:20:35 2009
@@ -26,8 +26,8 @@
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.Interceptors;
 
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.creational.CreationalContextFactory;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.logger.WebBeansLogger;
@@ -43,7 +43,7 @@
 
     private transient static WebBeansLogger logger = WebBeansLogger.getLogger(InterceptorHandler.class);
 
-    private AbstractComponent<?> component = null;
+    private AbstractBean<?> component = null;
 
     private transient Method calledMethod = null;
 
@@ -51,7 +51,7 @@
     
     private transient boolean isInDecoratorCall = false;
 
-    public InterceptorHandler(AbstractComponent<?> component)
+    public InterceptorHandler(AbstractBean<?> component)
     {
         this.component = component;
     }
@@ -59,7 +59,7 @@
     @SuppressWarnings("unchecked")
     public Object invoke(Object instance, Method method, Method proceed, Object[] arguments) throws Exception
     {
-        Context webbeansContext = ManagerImpl.getManager().getContext(component.getScopeType());
+        Context webbeansContext = BeanManagerImpl.getManager().getContext(component.getScopeType());
         
         Object webbeansInstance = webbeansContext.get((Contextual<Object>)this.component, (CreationalContext<Object>)CreationalContextFactory.getInstance().getCreationalContext(this.component));
         

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java Sat Jul  4 06:20:35 2009
@@ -25,7 +25,7 @@
 import javax.enterprise.inject.spi.Bean;
 import javax.interceptor.InvocationContext;
 
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.creational.CreationalContextFactory;
 
 /**
@@ -88,7 +88,7 @@
     @SuppressWarnings("unchecked")
     private void configureTarget(Bean<?> bean)
     {
-        Context webbeansContext = ManagerImpl.getManager().getContext(bean.getScopeType());
+        Context webbeansContext = BeanManagerImpl.getManager().getContext(bean.getScopeType());
         
         this.target = webbeansContext.get((Contextual<Object>)bean, (CreationalContext<Object>)CreationalContextFactory.getInstance().getCreationalContext(bean));        
         

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java Sat Jul  4 06:20:35 2009
@@ -27,10 +27,10 @@
 import javax.enterprise.inject.spi.Interceptor;
 import javax.interceptor.AroundInvoke;
 
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.Component;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.BaseBean;
 import org.apache.webbeans.config.inheritance.IBeanInheritedMetaData;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.util.AnnotationUtil;
@@ -61,7 +61,7 @@
      * 
      * @param interceptorClazz interceptor class
      */
-    public static <T> void configureInterceptorClass(AbstractComponent<T> delegate, Annotation[] interceptorBindingTypes)
+    public static <T> void configureInterceptorClass(AbstractBean<T> delegate, Annotation[] interceptorBindingTypes)
     {
         logger.info("Configuring the Web Beans Interceptor Class : " + delegate.getReturnType().getName() + " started");
 
@@ -74,7 +74,7 @@
 
         logger.info("Configuring the Web Beans Interceptor Class : " + delegate.getReturnType() + " ended");
 
-        ManagerImpl.getManager().addInterceptor(interceptor);
+        BeanManagerImpl.getManager().addInterceptor(interceptor);
 
     }
 
@@ -83,7 +83,7 @@
      * 
      * @param clazz configuration interceptors for this
      */
-    public static void configure(Component<?> component, List<InterceptorData> stack)
+    public static void configure(BaseBean<?> component, List<InterceptorData> stack)
     {
         Class<?> clazz = component.getReturnType();
         
@@ -218,7 +218,7 @@
      */
     private static Set<Interceptor<?>> getWebBeansInterceptors()
     {
-        return Collections.unmodifiableSet(ManagerImpl.getManager().getInterceptors());
+        return Collections.unmodifiableSet(BeanManagerImpl.getManager().getInterceptors());
     }
 
     /*

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java Sat Jul  4 06:20:35 2009
@@ -32,8 +32,8 @@
 import javax.interceptor.InterceptorBindingType;
 import javax.interceptor.InvocationContext;
 
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.ComponentImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.inject.InjectableField;
@@ -69,18 +69,18 @@
     private Class<?> clazz;
 
     /** Simple Web Beans component */
-    private AbstractComponent<T> delegateComponent;
+    private AbstractBean<T> delegateComponent;
     
     private CreationalContext<T> creationalContext;
 
-    public WebBeansInterceptor(AbstractComponent<T> delegateComponent)
+    public WebBeansInterceptor(AbstractBean<T> delegateComponent)
     {
         this.delegateComponent = delegateComponent;
         this.clazz = getDelegate().getReturnType();
 
     }
 
-    public AbstractComponent<T> getDelegate()
+    public AbstractBean<T> getDelegate()
     {
         return this.delegateComponent;
     }
@@ -262,7 +262,7 @@
     public void setInjections(Object proxy)
     {
         // Set injected fields
-        ComponentImpl<T> delegate = (ComponentImpl<T>) this.delegateComponent;
+        ManagedBean<T> delegate = (ManagedBean<T>) this.delegateComponent;
 
         Set<Field> injectedFields = delegate.getInjectedFields();
         for (Field injectedField : injectedFields)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java Sat Jul  4 06:20:35 2009
@@ -31,7 +31,7 @@
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.config.WebBeansContainerDeployer;
 import org.apache.webbeans.config.WebBeansFinder;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.container.activity.ActivityManager;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.conversation.ConversationManager;
@@ -80,7 +80,7 @@
     
     /**Root container.*/
     //Activities are removed from the specification.
-    private final ManagerImpl rootManager;
+    private final BeanManagerImpl rootManager;
 
     /**
      * Creates a new lifecycle instance and initializes
@@ -88,7 +88,7 @@
      */
     public WebBeansLifeCycle()
     {
-        this.rootManager = new ManagerImpl();
+        this.rootManager = new BeanManagerImpl();
         this.xmlDeployer = new WebBeansXMLConfigurator();
         this.deployer = new WebBeansContainerDeployer(xmlDeployer);
         this.jndiService = ServiceLoader.getService(JNDIService.class);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java Sat Jul  4 06:20:35 2009
@@ -23,7 +23,7 @@
 import javax.enterprise.inject.spi.Extension;
 
 import org.apache.webbeans.config.WebBeansFinder;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.util.Asserts;
 import org.apache.webbeans.util.WebBeansUtil;
@@ -60,7 +60,9 @@
         return loader;
     }
     
-    
+    /**
+     * Load extension services.
+     */
     public void loadExtensionServices()
     {
         ServiceLoader<Extension> loader = ServiceLoader.load(Extension.class, WebBeansUtil.getCurrentClassLoader());
@@ -75,7 +77,7 @@
                 Bean<?> bean = WebBeansUtil.createExtensionComponent(ext.getClass());                
                 map.put(bean, ext);
                 
-                ManagerImpl.getManager().addBean(bean);
+                BeanManagerImpl.getManager().addBean(bean);
             }
             catch (Exception e)
             {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java Sat Jul  4 06:20:35 2009
@@ -23,7 +23,7 @@
 import javax.enterprise.inject.spi.Bean;
 
 import org.apache.webbeans.annotation.WebBeansAnnotation;
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.decorator.WebBeansDecorator;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.intercept.InterceptorHandler;
@@ -76,7 +76,7 @@
 
             if (!(bean instanceof WebBeansDecorator) && !(bean instanceof WebBeansInterceptor))
             {
-                fact.setHandler(new InterceptorHandler((AbstractComponent<?>) bean));
+                fact.setHandler(new InterceptorHandler((AbstractBean<?>) bean));
             }
 
             result = fact.createClass().newInstance();

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Sat Jul  4 06:20:35 2009
@@ -78,23 +78,23 @@
 import org.apache.webbeans.annotation.ProductionLiteral;
 import org.apache.webbeans.annotation.RequestedScopeLiteral;
 import org.apache.webbeans.annotation.StandardLiteral;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.Component;
-import org.apache.webbeans.component.ComponentImpl;
-import org.apache.webbeans.component.ConversationComponent;
-import org.apache.webbeans.component.ExtensionComponent;
-import org.apache.webbeans.component.InjectionPointComponentImpl;
-import org.apache.webbeans.component.InstanceComponentImpl;
-import org.apache.webbeans.component.ManagerComponentImpl;
-import org.apache.webbeans.component.NewComponentImpl;
-import org.apache.webbeans.component.ObservableComponentImpl;
-import org.apache.webbeans.component.ProducerComponentImpl;
-import org.apache.webbeans.component.ProducerFieldComponent;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.BaseBean;
+import org.apache.webbeans.component.ManagedBean;
+import org.apache.webbeans.component.ConversationBean;
+import org.apache.webbeans.component.ExtensionBean;
+import org.apache.webbeans.component.InjectionPointBean;
+import org.apache.webbeans.component.InstanceBean;
+import org.apache.webbeans.component.BeanManagerBean;
+import org.apache.webbeans.component.NewBean;
+import org.apache.webbeans.component.ObservableBean;
+import org.apache.webbeans.component.ProducerMethodBean;
+import org.apache.webbeans.component.ProducerFieldBean;
 import org.apache.webbeans.component.WebBeansType;
 import org.apache.webbeans.config.DefinitionUtil;
 import org.apache.webbeans.config.EJBWebBeansConfigurator;
 import org.apache.webbeans.config.SimpleWebBeansConfigurator;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.conversation.ConversationImpl;
 import org.apache.webbeans.decorator.DecoratorUtil;
 import org.apache.webbeans.decorator.DecoratorsManager;
@@ -198,13 +198,13 @@
     	
     	Type type = null;
     	
-    	if(component instanceof ProducerComponentImpl)
+    	if(component instanceof ProducerMethodBean)
     	{
-    		type = ((ProducerComponentImpl<?>)component).getCreatorMethod().getGenericReturnType();
+    		type = ((ProducerMethodBean<?>)component).getCreatorMethod().getGenericReturnType();
     	}
-    	else if(component instanceof ProducerFieldComponent)
+    	else if(component instanceof ProducerFieldBean)
     	{
-    		type = ((ProducerFieldComponent<?>)component).getCreatorField().getGenericType();
+    		type = ((ProducerFieldBean<?>)component).getCreatorField().getGenericType();
     	}
     	else
     	{
@@ -600,15 +600,15 @@
      * @param clazz impl. class
      * @return the new component
      */
-    public static <T> NewComponentImpl<T> createNewComponent(Class<T> clazz)
+    public static <T> NewBean<T> createNewComponent(Class<T> clazz)
     {
         Asserts.assertNotNull(clazz, "Clazz argument can not be null");
 
-        NewComponentImpl<T> comp = null;
+        NewBean<T> comp = null;
 
         if (SimpleWebBeansConfigurator.isSimpleWebBean(clazz))
         {
-            comp = new NewComponentImpl<T>(clazz, WebBeansType.SIMPLE);
+            comp = new NewBean<T>(clazz, WebBeansType.SIMPLE);
             comp.setConstructor(WebBeansUtil.defineConstructor(clazz));
 
             DefinitionUtil.defineInjectedFields(comp);
@@ -616,7 +616,7 @@
         }
         else if (EJBWebBeansConfigurator.isEJBWebBean(clazz))
         {
-            comp = new NewComponentImpl<T>(clazz, WebBeansType.ENTERPRISE);
+            comp = new NewBean<T>(clazz, WebBeansType.ENTERPRISE);
         }
         else
         {
@@ -640,12 +640,12 @@
      * @param clazz impl. class
      * @return a new extension service bean
      */
-    public static <T> ExtensionComponent<T> createExtensionComponent(Class<T> clazz)
+    public static <T> ExtensionBean<T> createExtensionComponent(Class<T> clazz)
     {
         Asserts.assertNotNull(clazz, "Clazz argument can not be null");
 
-        ExtensionComponent<T> comp = null;
-        comp = new ExtensionComponent<T>(clazz);
+        ExtensionBean<T> comp = null;
+        comp = new ExtensionBean<T>(clazz);
         
         DefinitionUtil.defineApiTypes(comp, clazz);
         
@@ -666,13 +666,13 @@
      * @param component managed bean
      * @return the new bean from given managed bean
      */
-    public static <T> NewComponentImpl<T> createNewSimpleBeanComponent(ComponentImpl<T> component)
+    public static <T> NewBean<T> createNewSimpleBeanComponent(ManagedBean<T> component)
     {
         Asserts.assertNotNull(component, "component argument can not be null");
 
-        NewComponentImpl<T> comp = null;
+        NewBean<T> comp = null;
 
-        comp = new NewComponentImpl<T>(component.getReturnType(), WebBeansType.NEW);
+        comp = new NewBean<T>(component.getReturnType(), WebBeansType.NEW);
         
         DefinitionUtil.defineApiTypes(comp, component.getReturnType());
         comp.setConstructor(component.getConstructor());
@@ -708,9 +708,9 @@
         return comp;
     }    
     
-    public static <T, K> ObservableComponentImpl<T, K> createObservableImplicitComponent(Class<T> returnType, Class<K> eventType, Annotation... annotations)
+    public static <T, K> ObservableBean<T, K> createObservableImplicitComponent(Class<T> returnType, Class<K> eventType, Annotation... annotations)
     {
-        ObservableComponentImpl<T, K> component = new ObservableComponentImpl<T, K>(returnType, eventType, WebBeansType.OBSERVABLE);
+        ObservableBean<T, K> component = new ObservableBean<T, K>(returnType, eventType, WebBeansType.OBSERVABLE);
 
         DefinitionUtil.defineApiTypes(component, returnType);
         DefinitionUtil.defineBindingTypes(component, annotations);
@@ -739,9 +739,9 @@
         return component;
     }
 
-    public static ManagerComponentImpl getManagerComponent()
+    public static BeanManagerBean getManagerComponent()
     {
-        ManagerComponentImpl managerComponent = new ManagerComponentImpl();
+        BeanManagerBean managerComponent = new BeanManagerBean();
 
         managerComponent.setImplScopeType(new DependentScopeLiteral());
         managerComponent.setType(new StandardLiteral());
@@ -752,9 +752,9 @@
         return managerComponent;
     }
     
-    public static <T> InstanceComponentImpl<T> createInstanceComponent(ParameterizedType instance,Class<Instance<T>> clazz, Type injectedType, Annotation...obtainsBindings)
+    public static <T> InstanceBean<T> createInstanceComponent(ParameterizedType instance,Class<Instance<T>> clazz, Type injectedType, Annotation...obtainsBindings)
     {
-        InstanceComponentImpl<T> instanceComponent = new InstanceComponentImpl<T>(clazz,injectedType);
+        InstanceBean<T> instanceComponent = new InstanceBean<T>(clazz,injectedType);
         
         instanceComponent.addApiType(clazz);
         instanceComponent.addApiType(Object.class);
@@ -768,9 +768,9 @@
         return instanceComponent;
     }
 
-    public static ConversationComponent getConversationComponent()
+    public static ConversationBean getConversationComponent()
     {
-        ConversationComponent conversationComp = new ConversationComponent();
+        ConversationBean conversationComp = new ConversationBean();
 
         conversationComp.addApiType(Conversation.class);
         conversationComp.addApiType(ConversationImpl.class);
@@ -783,9 +783,9 @@
         return conversationComp;
     }
     
-    public static InjectionPointComponentImpl getInjectionPointComponent()
+    public static InjectionPointBean getInjectionPointComponent()
     {
-        return new InjectionPointComponentImpl(null);
+        return new InjectionPointBean(null);
     }
 
     /**
@@ -987,7 +987,7 @@
                 {
                     if (isDefinedWithWebBeans)
                     {
-                        Object interceptorProxy = ManagerImpl.getManager().getInstance(webBeansInterceptor);
+                        Object interceptorProxy = BeanManagerImpl.getManager().getInstance(webBeansInterceptor);
                         WebBeansInterceptor<?> interceptor = (WebBeansInterceptor<?>) webBeansInterceptor;
                         interceptor.setInjections(interceptorProxy);
 
@@ -1133,7 +1133,7 @@
      * @param anns annotation array
      * @return true if array contains the StereoType meta annotation
      */
-    public static boolean isComponentHasStereoType(Component<?> component)
+    public static boolean isComponentHasStereoType(BaseBean<?> component)
     {
         Asserts.assertNotNull(component, "component parameter can not be null");
 
@@ -1148,7 +1148,7 @@
         return false;
     }
 
-    public static Annotation[] getComponentStereoTypes(Component<?> component)
+    public static Annotation[] getComponentStereoTypes(BaseBean<?> component)
     {
         Asserts.assertNotNull(component, "component parameter can not be null");
         if (isComponentHasStereoType(component))
@@ -1163,7 +1163,7 @@
         return new Annotation[] {};
     }
 
-    public static boolean isNamedExistOnStereoTypes(Component<?> component)
+    public static boolean isNamedExistOnStereoTypes(BaseBean<?> component)
     {
         Annotation[] types = getComponentStereoTypes(component);
 
@@ -1178,7 +1178,7 @@
         return false;
     }
 
-    public static Annotation getMaxPrecedenceSteroTypeDeploymentType(Component<?> component)
+    public static Annotation getMaxPrecedenceSteroTypeDeploymentType(BaseBean<?> component)
     {
         Annotation[] deploymentTypes = getComponentStereoTypes(component);
         Class<? extends Annotation> maxPrecedDeploymentType = null;
@@ -1362,9 +1362,9 @@
             
             for(Bean<?> candidates : resolvers)
             {
-                AbstractComponent<?> candidate = (AbstractComponent<?>)candidates;
+                AbstractBean<?> candidate = (AbstractBean<?>)candidates;
                 
-                if(!(candidate instanceof NewComponentImpl))
+                if(!(candidate instanceof NewBean))
                 {
                     if(candidate.getReturnType().equals(superClass))
                     {
@@ -1382,7 +1382,7 @@
                     throw new InconsistentSpecializationException("@Specializes exception. Class : " + specializedClass.getName() + " must have higher deployment type precedence from the class : " + superClass.getName());
                 }
                 
-                AbstractComponent<?> comp = (AbstractComponent<?>)specialized;
+                AbstractBean<?> comp = (AbstractBean<?>)specialized;
 
                 if(superBean.getName() != null)
                 {
@@ -1412,12 +1412,12 @@
         
         Set<Bean<?>> beans = new HashSet<Bean<?>>();
         
-        Set<Bean<?>> components = ManagerImpl.getManager().getComponents();
+        Set<Bean<?>> components = BeanManagerImpl.getManager().getComponents();
         Iterator<Bean<?>> it = components.iterator();
 
         while (it.hasNext())
         {
-            AbstractComponent<?> bean = (AbstractComponent<?>)it.next();
+            AbstractBean<?> bean = (AbstractBean<?>)it.next();
             
             if (bean.getTypes().contains(clazz))
             {
@@ -1425,7 +1425,7 @@
                 {
                     if(bean.getReturnType().isAnnotationPresent(Specializes.class))
                     {
-                        if(!(bean instanceof NewComponentImpl))
+                        if(!(bean instanceof NewBean))
                         {
                             if(DeploymentTypeManager.getInstance().isDeploymentTypeEnabled(bean.getDeploymentType()))
                             {
@@ -1455,7 +1455,7 @@
      * @param errorMessage
      * @deprecated
      */
-    public static void checkSteroTypeRequirements(Component<?> component, Annotation[] anns, String errorMessage)
+    public static void checkSteroTypeRequirements(BaseBean<?> component, Annotation[] anns, String errorMessage)
     {
         Set<Class<? extends Annotation>> allSupportedScopes = new HashSet<Class<? extends Annotation>>();
         Annotation[] stereoTypes = getComponentStereoTypes(component);        
@@ -1534,7 +1534,7 @@
 
     }
 
-    public static void checkNullable(Class<?> type, AbstractComponent<?> component)
+    public static void checkNullable(Class<?> type, AbstractBean<?> component)
     {
         Asserts.assertNotNull(type, "type parameter can not be null");
         Asserts.assertNotNull(component, "component parameter can not be null");
@@ -1558,7 +1558,7 @@
      *         parent also has name
      * @throws WebBeansConfigurationException any other exceptions
      */
-    public static void configureProducerSpecialization(AbstractComponent<?> component, Method method, Class<?> superClass)
+    public static void configureProducerSpecialization(AbstractBean<?> component, Method method, Class<?> superClass)
     {
         Method superMethod = ClassUtil.getClassMethodWithTypes(superClass, method.getName(), Arrays.asList(method.getParameterTypes()));
         if (superMethod == null)
@@ -1591,7 +1591,7 @@
      * @param method specialized producer method
      * @param superMethod overriden super producer method
      */
-    public static void configuredProducerSpecializedName(AbstractComponent<?> component,Method method,Method superMethod)
+    public static void configuredProducerSpecializedName(AbstractBean<?> component,Method method,Method superMethod)
     {
         Asserts.assertNotNull(component,"component parameter can not be null");
         Asserts.assertNotNull(method,"method parameter can not be null");
@@ -1789,7 +1789,7 @@
         return true;
     }
 
-    public static <T> void checkPassivationScope(AbstractComponent<T> component, ScopeType scope)
+    public static <T> void checkPassivationScope(AbstractBean<T> component, ScopeType scope)
     {
         Asserts.assertNotNull(component, "component parameter can not be null");
         Asserts.assertNotNull(scope, "scope type parameter can not be null");
@@ -1811,14 +1811,14 @@
     {
         if (InterceptorsManager.getInstance().isInterceptorEnabled(clazz))
         {
-            ComponentImpl<T> component = null;
+            ManagedBean<T> component = null;
 
             InterceptorUtil.checkInterceptorConditions(clazz);
             component = SimpleWebBeansConfigurator.define(clazz, WebBeansType.INTERCEPTOR);
 
             if (component != null)
             {
-                WebBeansInterceptorConfig.configureInterceptorClass((ComponentImpl<Object>) component, clazz.getDeclaredAnnotations());
+                WebBeansInterceptorConfig.configureInterceptorClass((ManagedBean<Object>) component, clazz.getDeclaredAnnotations());
             }
         }
 
@@ -1829,14 +1829,14 @@
     {
         if (DecoratorsManager.getInstance().isDecoratorEnabled(clazz))
         {
-            ComponentImpl<T> component = null;
+            ManagedBean<T> component = null;
 
             DecoratorUtil.checkDecoratorConditions(clazz);
             component = SimpleWebBeansConfigurator.define(clazz, WebBeansType.DECORATOR);
 
             if (component != null)
             {
-                WebBeansDecoratorConfig.configureDecoratorClass((ComponentImpl<Object>) component);
+                WebBeansDecoratorConfig.configureDecoratorClass((ManagedBean<Object>) component);
             }
         }
     }
@@ -1889,7 +1889,7 @@
         }
     }
     
-    public static boolean isSimpleWebBeans(AbstractComponent<?> component)
+    public static boolean isSimpleWebBeans(AbstractBean<?> component)
     {
         if(component.getWebBeansType().equals(WebBeansType.SIMPLE) ||
                 component.getWebBeansType().equals(WebBeansType.INTERCEPTOR) ||
@@ -1924,7 +1924,7 @@
             bindings = injectionPoint.getBindings().toArray(bindings);
             
             Bean<?> bean = createObservableImplicitComponent(EventImpl.class, clazz, bindings);
-            ManagerImpl.getManager().addBean(bean);                  
+            BeanManagerImpl.getManager().addBean(bean);                  
         }      
     }
     
@@ -1939,7 +1939,7 @@
         bindings = injectionPoint.getBindings().toArray(bindings);
         
         Bean<Instance<T>> bean = createInstanceComponent(genericType,clazz, genericType.getActualTypeArguments()[0], bindings);
-        ManagerImpl.getManager().addBean(bean);
+        BeanManagerImpl.getManager().addBean(bean);
         
     }
     



Mime
View raw message