openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r791061 [1/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
Author: gerdogdu
Date: Sat Jul  4 06:20:35 2009
New Revision: 791061

URL: http://svn.apache.org/viewvc?rev=791061&view=rev
Log:
Reflecting API and some class names changes.

Added:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java
      - copied, changed from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesBean.java
      - copied, changed from r788940, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java   (with props)
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java
      - copied, changed from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/Component.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java   (with props)
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
      - copied, changed from r788743, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
      - copied, changed from r790729, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java
      - copied, changed from r788743, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IComponentHasParent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java   (with props)
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java
      - copied, changed from r789094, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
      - copied, changed from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewBean.java
      - copied, changed from r788743, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableBean.java
      - copied, changed from r788940, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservesMethodsOwnerBean.java
      - copied, changed from r789057, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservesMethodsOwner.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
      - copied, changed from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
      - copied, changed from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLManagedBean.java
      - copied, changed from r788743, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerBean.java
      - copied, changed from r788743, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
      - copied, changed from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java
Removed:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/Component.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IComponentHasParent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagerComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservesMethodsOwner.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java
Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ChildActivityManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/activity/ActivityManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableConstructor.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableField.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableMethods.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/CurrentInjectedComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/DisposalInjectedComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/InjectedComponentTestWithMember.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PaymentProcessorComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PostConstructComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/PreDestroyComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/Producer1ConsumerComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ProducerComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/ScopeAdapterTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/SingletonComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/TypedInjectedComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/UserComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureInterceptorComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/library/LibraryComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/newcomp/NewComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/StaticProducerTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/resolution/ManagerResolutionTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java (from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java&r1=790362&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java Sat Jul  4 06:20:35 2009
@@ -29,7 +29,7 @@
 
 import org.apache.webbeans.config.inheritance.BeanInheritedMetaData;
 import org.apache.webbeans.config.inheritance.IBeanInheritedMetaData;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.creational.CreationalContextImpl;
 import org.apache.webbeans.deployment.DeploymentTypeManager;
 import org.apache.webbeans.intercept.InterceptorData;
@@ -37,14 +37,14 @@
 import org.apache.webbeans.util.ClassUtil;
 
 /**
- * Abstract implementation of the {@link Component} contract. 
+ * Abstract implementation of the {@link BaseBean} contract. 
  * 
  * @version $Rev$ $Date$
  * 
- * @see Component
+ * @see BaseBean
  * @see Bean
  */
-public abstract class AbstractComponent<T> extends Component<T>
+public abstract class AbstractBean<T> extends BaseBean<T>
 {
     /**Logger instance*/
     private final WebBeansLogger logger = WebBeansLogger.getLogger(getClass());
@@ -110,9 +110,9 @@
      * @param name name of the component
      * @param webBeansType web beans type
      */
-    protected AbstractComponent(WebBeansType webBeansType, Class<T> returnType)
+    protected AbstractBean(WebBeansType webBeansType, Class<T> returnType)
     {
-        super(ManagerImpl.getManager());
+        super(BeanManagerImpl.getManager());
         this.webBeansType = webBeansType;
         this.returnType = returnType;
     }
@@ -122,9 +122,9 @@
      * 
      * @param webBeanType beans type
      */
-    protected AbstractComponent(WebBeansType webBeanType)
+    protected AbstractBean(WebBeansType webBeanType)
     {
-        super(ManagerImpl.getManager());
+        super(BeanManagerImpl.getManager());
         this.webBeansType = webBeanType;
         
     }
@@ -235,9 +235,9 @@
      */
     public Class<?> getBeanClass()
     {
-        if(IComponentHasParent.class.isAssignableFrom(getClass()))
+        if(IBeanHasParent.class.isAssignableFrom(getClass()))
         {
-            IComponentHasParent comp = (IComponentHasParent)this;
+            IBeanHasParent comp = (IBeanHasParent)this;
             
             return comp.getParent().getBeanClass();
         }
@@ -425,11 +425,11 @@
         Object object = null;
         
         //Setting injection point owner
-        AbstractComponent<?> dependent = (AbstractComponent<?>)dependentComponent;
+        AbstractBean<?> dependent = (AbstractBean<?>)dependentComponent;
         dependent.setDependentOwnerInjectionPoint(injectionPoint);        
         
         //Get dependent instance
-        object = ManagerImpl.getManager().getInstance(dependentComponent);
+        object = BeanManagerImpl.getManager().getInstance(dependentComponent);
         
         CreationalContextImpl<T> cc = (CreationalContextImpl<T>)this.creationalContext;
 

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesBean.java (from r788940, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java&r1=788940&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesBean.java Sat Jul  4 06:20:35 2009
@@ -38,7 +38,7 @@
  *
  * @param <T> bean class
  */
-public abstract class AbstractObservesComponent<T> extends AbstractComponent<T> implements ObservesMethodsOwner<T>
+public abstract class AbstractObservesBean<T> extends AbstractBean<T> implements ObservesMethodsOwnerBean<T>
 {
     /**Logger instance*/
     private final WebBeansLogger logger = WebBeansLogger.getLogger(getClass());
@@ -61,7 +61,7 @@
      * @param webBeansType webbean type
      * @param returnType bean class type
      */
-    protected AbstractObservesComponent(WebBeansType webBeansType, Class<T> returnType)
+    protected AbstractObservesBean(WebBeansType webBeansType, Class<T> returnType)
     {
         super(webBeansType, returnType);
     }

Added: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java?rev=791061&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java (added)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java Sat Jul  4 06:20:35 2009
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.webbeans.component;
+
+/**
+ * Abstract class for producer components.
+ * 
+ * @version $Rev$ $Date$
+ *
+ * @param <T> bean type info
+ */
+public abstract class AbstractProducerBean<T> extends AbstractBean<T> implements IBeanHasParent
+{
+    /**Owner of the producer field component*/
+    protected AbstractBean<?> ownerComponent;
+
+    /**
+     * Create a new instance.
+     * 
+     * @param type webbeans typr
+     * @param returnType bean type info
+     * @param ownerComponent owner bean
+     */
+    protected AbstractProducerBean(WebBeansType type, Class<T> returnType, AbstractBean<?> ownerComponent)
+    {
+        super(type,returnType);
+        this.ownerComponent = ownerComponent;
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    public AbstractBean<?> getParent()
+    {
+        return this.ownerComponent;
+    }
+    
+    
+}
\ No newline at end of file

Propchange: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java (from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/Component.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/Component.java&r1=790362&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/Component.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BaseBean.java Sat Jul  4 06:20:35 2009
@@ -32,7 +32,7 @@
  * @version $Rev$ $Date$
  * <T> bean class
  */
-public abstract class Component<T> implements Bean<T>
+public abstract class BaseBean<T> implements Bean<T>
 {
 	/**Bean Manager*/
     private final BeanManager manager;
@@ -42,7 +42,7 @@
      * 
      * @param manager bean manager
      */
-    protected Component(BeanManager manager)
+    protected BaseBean(BeanManager manager)
     {
         this.manager = manager;
     }

Added: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java?rev=791061&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java (added)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java Sat Jul  4 06:20:35 2009
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.webbeans.component;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.apache.webbeans.container.BeanManagerImpl;
+
+public class BeanManagerBean extends AbstractBean<BeanManager>
+{
+    private BeanManager manager = null;
+
+    public BeanManagerBean()
+    {
+        super(WebBeansType.MANAGER, BeanManager.class);
+    }
+
+    @Override
+    protected BeanManager createInstance(CreationalContext<BeanManager> creationalContext)
+    {
+        if (this.manager == null)
+        {
+            manager = BeanManagerImpl.getManager();
+        }
+
+        return manager;
+    }
+
+    @Override
+    protected void destroyInstance(BeanManager instance)
+    {
+        this.manager = null;
+    }
+
+}

Propchange: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java (from r788743, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java&r1=788743&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java Sat Jul  4 06:20:35 2009
@@ -21,10 +21,10 @@
 import org.apache.webbeans.spi.ServiceLoader;
 import org.apache.webbeans.spi.conversation.ConversationService;
 
-public class ConversationComponent extends AbstractComponent<Conversation>
+public class ConversationBean extends AbstractBean<Conversation>
 {
 
-    public ConversationComponent()
+    public ConversationBean()
     {
         super(WebBeansType.CONVERSATION, Conversation.class);
     }

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java (from r790729, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionComponent.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionComponent.java&r1=790729&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java Sat Jul  4 06:20:35 2009
@@ -24,14 +24,14 @@
  *
  * @param <T> type info
  */
-public class ExtensionComponent<T> extends AbstractObservesComponent<T>
+public class ExtensionBean<T> extends AbstractObservesBean<T>
 {
     /**
      * Creates a new extesion bean.
      * 
      * @param returnType return type
      */
-    public ExtensionComponent(Class<T> returnType)
+    public ExtensionBean(Class<T> returnType)
     {
         super(WebBeansType.EXTENSION,returnType);
     }

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java (from r788743, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IComponentHasParent.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IComponentHasParent.java&r1=788743&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IComponentHasParent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/IBeanHasParent.java Sat Jul  4 06:20:35 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.webbeans.component;
 
-public interface IComponentHasParent
+public interface IBeanHasParent
 {
-    public AbstractComponent<?> getParent();
+    public AbstractBean<?> getParent();
 }

Added: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java?rev=791061&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java (added)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java Sat Jul  4 06:20:35 2009
@@ -0,0 +1,56 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ * 
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.webbeans.component;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.apache.webbeans.annotation.CurrentLiteral;
+import org.apache.webbeans.annotation.DependentScopeLiteral;
+import org.apache.webbeans.annotation.StandardLiteral;
+
+
+public class InjectionPointBean extends AbstractBean<InjectionPoint>
+{
+    private InjectionPoint injectionPoint = null;
+    
+    public InjectionPointBean(InjectionPoint injectionPoint)
+    {
+        super(WebBeansType.INJECTIONPOINT,InjectionPoint.class);
+        this.injectionPoint = injectionPoint;
+        
+        addBindingType(new CurrentLiteral());
+        setImplScopeType(new DependentScopeLiteral());
+        setType(new StandardLiteral());
+        addApiType(InjectionPoint.class);
+        addApiType(Object.class);
+    }
+
+    @Override
+    protected InjectionPoint createInstance(CreationalContext<InjectionPoint> creationalContext)
+    {
+        return injectionPoint;
+    }
+
+    @Override
+    protected void destroyInstance(InjectionPoint instance)
+    {
+        this.injectionPoint = null;
+    }
+    
+    
+}

Propchange: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java (from r789094, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceComponentImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceComponentImpl.java&r1=789094&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InstanceBean.java Sat Jul  4 06:20:35 2009
@@ -24,11 +24,11 @@
 
 import org.apache.webbeans.inject.instance.InstanceFactory;
 
-public class InstanceComponentImpl<T> extends AbstractComponent<Instance<T>>
+public class InstanceBean<T> extends AbstractBean<Instance<T>>
 {
     private Type injectedType;
     
-    public InstanceComponentImpl(Class<Instance<T>> returnType, Type injectedType)
+    public InstanceBean(Class<Instance<T>> returnType, Type injectedType)
     {
         super(WebBeansType.INSTANCE, returnType);
         this.injectedType = injectedType;

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java (from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java&r1=790362&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java Sat Jul  4 06:20:35 2009
@@ -30,12 +30,12 @@
  * 
  * @version $Rev$ $Date$
  */
-public class ComponentImpl<T> extends AbstractObservesComponent<T>
+public class ManagedBean<T> extends AbstractObservesBean<T>
 {
     /** Constructor of the web bean component */
     private Constructor<T> constructor;
 
-    public ComponentImpl(Class<T> returnType)
+    public ManagedBean(Class<T> returnType)
     {
         this(returnType, WebBeansType.SIMPLE);
     }
@@ -46,7 +46,7 @@
      * @param returnType bean class
      * @param type webbeans type
      */
-    public ComponentImpl(Class<T> returnType, WebBeansType type)
+    public ManagedBean(Class<T> returnType, WebBeansType type)
     {
         super(type, returnType);
         

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewBean.java (from r788743, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewComponentImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewComponentImpl.java&r1=788743&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewBean.java Sat Jul  4 06:20:35 2009
@@ -24,11 +24,11 @@
  * </p>
  * 
  */
-public class NewComponentImpl<T> extends ComponentImpl<T>
+public class NewBean<T> extends ManagedBean<T>
 {
     private WebBeansType definedType;
 
-    public NewComponentImpl(Class<T> returnType, WebBeansType definedType)
+    public NewBean(Class<T> returnType, WebBeansType definedType)
     {
         super(returnType);
         this.definedType = definedType;        

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableBean.java (from r788940, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java&r1=788940&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableBean.java Sat Jul  4 06:20:35 2009
@@ -25,13 +25,13 @@
  * 
  * @version $Rev$ $Date$
  */
-public class ObservableComponentImpl<T, K> extends ComponentImpl<T>
+public class ObservableBean<T, K> extends ManagedBean<T>
 {
     private WebBeansType definedType;
 
     private Class<K> eventType = null;
 
-    public ObservableComponentImpl(Class<T> returnType, Class<K> eventType, WebBeansType definedType)
+    public ObservableBean(Class<T> returnType, Class<K> eventType, WebBeansType definedType)
     {
         super(returnType);
         this.definedType = definedType;

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservesMethodsOwnerBean.java (from r789057, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservesMethodsOwner.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservesMethodsOwnerBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservesMethodsOwnerBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservesMethodsOwner.java&r1=789057&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservesMethodsOwner.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservesMethodsOwnerBean.java Sat Jul  4 06:20:35 2009
@@ -24,7 +24,7 @@
  *
  * @param <T> bean type
  */
-public interface ObservesMethodsOwner<T>
+public interface ObservesMethodsOwnerBean<T>
 {
     /**
      * Returns set of observable methods.

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java (from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldComponent.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldComponent.java&r1=790362&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java Sat Jul  4 06:20:35 2009
@@ -34,13 +34,11 @@
  * 
  * @param <T> Type of the field decleration
  */
-public class ProducerFieldComponent<T> extends AbstractComponent<T> implements IComponentHasParent
+public class ProducerFieldBean<T> extends AbstractProducerBean<T> implements IBeanHasParent
 {
     /**Producer field that defines the component*/
     private Field producerField;
     
-    /**Owner of the producer field component*/
-    private AbstractComponent<?> ownerComponent;
     
     
     /**
@@ -48,10 +46,9 @@
      * 
      * @param returnType type of the field decleration 
      */
-    public ProducerFieldComponent(AbstractComponent<?> ownerComponent, Class<T> returnType)
+    public ProducerFieldBean(AbstractBean<?> ownerComponent, Class<T> returnType)
     {
-        super(WebBeansType.PRODUCERFIELD,returnType);
-        this.ownerComponent = ownerComponent;
+        super(WebBeansType.PRODUCERFIELD,returnType,ownerComponent);
     }
 
     @Override
@@ -139,7 +136,7 @@
         Annotation[] anns = new Annotation[this.ownerComponent.getBindings().size()];
         anns = this.ownerComponent.getBindings().toArray(anns);
         
-        Bean<?> specialize = WebBeansUtil.getMostSpecializedBean(getManager(), (AbstractComponent<T>)this.ownerComponent);
+        Bean<?> specialize = WebBeansUtil.getMostSpecializedBean(getManager(), (AbstractBean<T>)this.ownerComponent);
         
         if(specialize != null)
         {
@@ -177,14 +174,6 @@
         WebBeansUtil.checkSerializableScopeType(this.getScopeType(), this.isSerializable(), errorMessage);
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.webbeans.component.IComponentHasParent#getParent()
-     */
-    public AbstractComponent<?> getParent()
-    {
-        return this.ownerComponent;
-    }
-    
     public String toString()
     {
         return super.toString();

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java (from r790362, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java&r1=790362&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java Sat Jul  4 06:20:35 2009
@@ -28,7 +28,7 @@
 import org.apache.webbeans.util.WebBeansUtil;
 
 /**
- * Concrete implementation of the {@link AbstractComponent}.
+ * Concrete implementation of the {@link AbstractBean}.
  * <p>
  * It is defined as producer method component.
  * </p>
@@ -36,10 +36,10 @@
  * @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
  * @since 1.0
  */
-public class ProducerComponentImpl<T> extends AbstractComponent<T> implements IComponentHasParent
+public class ProducerMethodBean<T> extends AbstractBean<T> implements IBeanHasParent
 {
     /** Parent component that this producer method belongs */
-    protected AbstractComponent<?> parent;
+    protected AbstractBean<?> parent;
 
     /** Creator method of the parent component */
     protected Method creatorMethod;
@@ -52,7 +52,7 @@
     /*
      * Constructor
      */
-    public ProducerComponentImpl(AbstractComponent<?> parent, Class<T> returnType)
+    public ProducerMethodBean(AbstractBean<?> parent, Class<T> returnType)
     {
         super(WebBeansType.PRODUCER, returnType);
         this.parent = parent;
@@ -83,7 +83,7 @@
      * 
      * @return web bean component defines producer method
      */
-    public AbstractComponent<?> getParent()
+    public AbstractBean<?> getParent()
     {
         return parent;
     }
@@ -223,7 +223,7 @@
         Annotation[] anns = new Annotation[this.parent.getBindings().size()];
         anns = this.parent.getBindings().toArray(anns);
         
-        Bean<?> specialize = WebBeansUtil.getMostSpecializedBean(getManager(), (AbstractComponent<T>)this.parent);
+        Bean<?> specialize = WebBeansUtil.getMostSpecializedBean(getManager(), (AbstractBean<T>)this.parent);
         
         if(specialize != null)
         {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java Sat Jul  4 06:20:35 2009
@@ -24,13 +24,13 @@
  * </ul>
  * <p>
  * Bean Implementation Class Components are defined with annotating the ordinary
- * classes with {@link Component} annotation. It maybe defined within the
+ * classes with {@link BaseBean} annotation. It maybe defined within the
  * web-beans.xml file using &lt;class&gt; element. It is possible to mix these
  * two definitions.
  * </p>
  * <p>
  * Producer Method Components are defined within the class that is annotated
- * with {@link Component} annotation. In these classes, there are methods that
+ * with {@link BaseBean} annotation. In these classes, there are methods that
  * are annotated with {@link Produces} annotation. These methods become the
  * producer method components of this web beans component. It maybe defined
  * using the web-beans.xml file using the &lt;producer&gt; element. It is

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java Sat Jul  4 06:20:35 2009
@@ -24,10 +24,10 @@
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.component.WebBeansType;
 
-public class ThirdpartyBeanImpl<T> extends AbstractComponent<T>
+public class ThirdpartyBeanImpl<T> extends AbstractBean<T>
 {
     private Bean<T> bean = null;
     

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLManagedBean.java (from r788743, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLManagedBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLManagedBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java&r1=788743&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLManagedBean.java Sat Jul  4 06:20:35 2009
@@ -24,7 +24,7 @@
 
 import javax.enterprise.context.spi.CreationalContext;
 
-import org.apache.webbeans.component.ComponentImpl;
+import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.inject.xml.XMLInjectableConstructor;
 import org.apache.webbeans.inject.xml.XMLInjectableField;
@@ -33,10 +33,10 @@
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.util.Asserts;
 
-public class XMLComponentImpl<T> extends ComponentImpl<T>
+public class XMLManagedBean<T> extends ManagedBean<T>
 {
     /**Logger instance*/
-    private static WebBeansLogger logger = WebBeansLogger.getLogger(XMLComponentImpl.class);
+    private static WebBeansLogger logger = WebBeansLogger.getLogger(XMLManagedBean.class);
 
     /** Constructor injection point decleration */
     private XMLInjectableConstructor<T> injectableConstructor = null;
@@ -55,7 +55,7 @@
      * 
      * @param returnType type of the webbeans component
      */
-    public XMLComponentImpl(Class<T> returnType)
+    public XMLManagedBean(Class<T> returnType)
     {
         super(returnType);
     }

Copied: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerBean.java (from r788743, incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java)
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerBean.java?p2=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerBean.java&p1=incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java&r1=788743&r2=791061&rev=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerBean.java Sat Jul  4 06:20:35 2009
@@ -20,13 +20,13 @@
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.spi.CreationalContext;
 
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.ProducerComponentImpl;
+import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.ProducerMethodBean;
 import org.apache.webbeans.inject.xml.XMLInjectableMethods;
 import org.apache.webbeans.inject.xml.XMLInjectionPointModel;
 import org.apache.webbeans.util.Asserts;
 
-public class XMLProducerComponentImpl<T> extends ProducerComponentImpl<T>
+public class XMLProducerBean<T> extends ProducerMethodBean<T>
 {
     private List<XMLInjectionPointModel> producerMethodParameters = new ArrayList<XMLInjectionPointModel>();
 
@@ -36,7 +36,7 @@
     
     private CreationalContext<?> creationalContext;
 
-    public XMLProducerComponentImpl(AbstractComponent<?> parent, Class<T> returnType)
+    public XMLProducerBean(AbstractBean<?> parent, Class<T> returnType)
     {
         super(parent, returnType);
         this.parent = parent;

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java Sat Jul  4 06:20:35 2009
@@ -49,13 +49,13 @@
 import org.apache.webbeans.annotation.DependentScopeLiteral;
 import org.apache.webbeans.annotation.ProductionLiteral;
 import org.apache.webbeans.annotation.specific.Realizes;
-import org.apache.webbeans.component.AbstractComponent;
-import org.apache.webbeans.component.Component;
-import org.apache.webbeans.component.ComponentImpl;
-import org.apache.webbeans.component.IComponentHasParent;
-import org.apache.webbeans.component.ObservesMethodsOwner;
-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.IBeanHasParent;
+import org.apache.webbeans.component.ObservesMethodsOwnerBean;
+import org.apache.webbeans.component.ProducerMethodBean;
+import org.apache.webbeans.component.ProducerFieldBean;
 import org.apache.webbeans.config.inheritance.IBeanInheritedMetaData;
 import org.apache.webbeans.container.InjectionResolver;
 import org.apache.webbeans.decorator.WebBeansDecoratorConfig;
@@ -83,7 +83,7 @@
 
     }
     
-    public static <T> Class<? extends Annotation> defineDeploymentType(AbstractComponent<T> component, Annotation[] beanAnnotations, String errorMessage)
+    public static <T> Class<? extends Annotation> defineDeploymentType(AbstractBean<T> component, Annotation[] beanAnnotations, String errorMessage)
     {
         boolean found = false;
         for (Annotation annotation : beanAnnotations)
@@ -130,9 +130,9 @@
             if (result == null)
             {
                 //From parent
-                if (!found && (component instanceof IComponentHasParent))
+                if (!found && (component instanceof IBeanHasParent))
                 {
-                    IComponentHasParent child = (IComponentHasParent) component;
+                    IBeanHasParent child = (IBeanHasParent) component;
                     component.setType(child.getParent().getType());
                 }
                 
@@ -165,7 +165,7 @@
      * @param component configuring web beans component
      * @param clazz bean implementation class
      */
-    public static <T> void defineApiTypes(AbstractComponent<T> component, Class<T> clazz)
+    public static <T> void defineApiTypes(AbstractBean<T> component, Class<T> clazz)
     {
         ClassUtil.setTypeHierarchy(component.getTypes(), clazz);
     }
@@ -177,7 +177,7 @@
      * @param component configuring web beans component
      * @param clazz bean implementation class
      */
-    public static <T> void defineProducerMethodApiTypes(AbstractComponent<T> component, Type type)
+    public static <T> void defineProducerMethodApiTypes(AbstractBean<T> component, Type type)
     {
         Set<Type> types = component.getTypes();
         types.add(Object.class);
@@ -201,7 +201,7 @@
      * @param component configuring web beans component
      * @param annotations annotations
      */
-    public static <T> void defineBindingTypes(AbstractComponent<T> component, Annotation[] annotations)
+    public static <T> void defineBindingTypes(AbstractBean<T> component, Annotation[] annotations)
     {
         boolean find = false;
         for (Annotation annotation : annotations)
@@ -279,7 +279,7 @@
      * @param component configuring web beans component
      * @param annotations annotations
      */
-    public static <T> void defineScopeType(AbstractComponent<T> component, Annotation[] annotations, String exceptionMessage)
+    public static <T> void defineScopeType(AbstractBean<T> component, Annotation[] annotations, String exceptionMessage)
     {
         boolean found = false;
 
@@ -307,7 +307,7 @@
         }
     }
 
-    public static <T> void defineStereoTypes(Component<?> component, Annotation[] anns)
+    public static <T> void defineStereoTypes(BaseBean<?> component, Annotation[] anns)
     {
         if (AnnotationUtil.isStereoTypeMetaAnnotationExist(anns))
         {
@@ -345,7 +345,7 @@
         
     }
 
-    public static void defineDefaultScopeType(Component<?> component, String exceptionMessage)
+    public static void defineDefaultScopeType(BaseBean<?> component, String exceptionMessage)
     {
         // Frist look for inherited scope
         IBeanInheritedMetaData metaData = component.getInheritedMetaData();
@@ -410,7 +410,7 @@
      * @param component configuring web beans component
      * @param defaultName default name of the web bean
      */
-    public static <T> void defineName(AbstractComponent<T> component, Annotation[] anns, String defaultName)
+    public static <T> void defineName(AbstractBean<T> component, Annotation[] anns, String defaultName)
     {
         Named nameAnnot = null;
         boolean isDefault = false;
@@ -454,14 +454,14 @@
     }
 
     /**
-     * Defines the set of {@link ProducerFieldComponent} components.
+     * Defines the set of {@link ProducerFieldBean} components.
      * 
      * @param component producer field owner component
      * @return the set of producer field components
      */
-    public static Set<ProducerFieldComponent<?>> defineProduerFields(AbstractComponent<?> component)
+    public static Set<ProducerFieldBean<?>> defineProduerFields(AbstractBean<?> component)
     {
-        Set<ProducerFieldComponent<?>> producerFields = new HashSet<ProducerFieldComponent<?>>();
+        Set<ProducerFieldBean<?>> producerFields = new HashSet<ProducerFieldBean<?>>();
         Field[] fields = component.getReturnType().getDeclaredFields();
 
         // From normal class
@@ -481,7 +481,7 @@
         return producerFields;
     }
 
-    private static void createProducerFieldWithRealizations(AbstractComponent<?> component, Set<ProducerFieldComponent<?>> producerFields, Field[] fields, boolean isRealizes)
+    private static void createProducerFieldWithRealizations(AbstractBean<?> component, Set<ProducerFieldBean<?>> producerFields, Field[] fields, boolean isRealizes)
     {
         for (Field field : fields)
         {            
@@ -510,7 +510,7 @@
                     }
                 }
                 
-                ProducerFieldComponent<?> newComponent = createProducerFieldComponent(field.getType(), field, component);
+                ProducerFieldBean<?> newComponent = createProducerFieldComponent(field.getType(), field, component);
 
                 if (newComponent != null)
                 {
@@ -561,11 +561,11 @@
      * @return the set of producer components
      * @throws WebBeansConfigurationException if any exception occurs
      */
-    public static Set<ProducerComponentImpl<?>> defineProducerMethods(AbstractComponent<?> component)
+    public static Set<ProducerMethodBean<?>> defineProducerMethods(AbstractBean<?> component)
     {
         Asserts.assertNotNull(component, "component parameter can not be null");
 
-        Set<ProducerComponentImpl<?>> producerComponents = new HashSet<ProducerComponentImpl<?>>();
+        Set<ProducerMethodBean<?>> producerComponents = new HashSet<ProducerMethodBean<?>>();
 
         Class<?> clazz = component.getReturnType();
         Method[] declaredMethods = clazz.getDeclaredMethods();
@@ -603,7 +603,7 @@
 
     }
 
-    private static <T> void createProducerComponentsWithReliazes(AbstractComponent<T> component, Set<ProducerComponentImpl<?>> producerComponents, Method declaredMethod, Class<?> clazz, boolean isSpecializes, boolean isRealizes)
+    private static <T> void createProducerComponentsWithReliazes(AbstractBean<T> component, Set<ProducerMethodBean<?>> producerComponents, Method declaredMethod, Class<?> clazz, boolean isSpecializes, boolean isRealizes)
     {
         // Producer Method
         if (AnnotationUtil.isMethodHasAnnotation(declaredMethod, Produces.class))
@@ -620,7 +620,7 @@
                 isSpecializes = true;
             }
 
-            ProducerComponentImpl<?> newComponent = createProducerComponent(declaredMethod.getReturnType(), declaredMethod, component, isSpecializes);
+            ProducerMethodBean<?> newComponent = createProducerComponent(declaredMethod.getReturnType(), declaredMethod, component, isSpecializes);
 
             if (newComponent != null)
             {
@@ -661,9 +661,9 @@
 
     }
 
-    public static <T> ProducerComponentImpl<T> createProducerComponent(Class<T> returnType, Method method, AbstractComponent<?> parent, boolean isSpecializes)
+    public static <T> ProducerMethodBean<T> createProducerComponent(Class<T> returnType, Method method, AbstractBean<?> parent, boolean isSpecializes)
     {
-        ProducerComponentImpl<T> component = new ProducerComponentImpl<T>(parent, returnType);
+        ProducerMethodBean<T> component = new ProducerMethodBean<T>(parent, returnType);
         component.setCreatorMethod(method);
 
         if (isSpecializes)
@@ -701,9 +701,9 @@
         return component;
     }
 
-    private static <T> ProducerFieldComponent<T> createProducerFieldComponent(Class<T> returnType, Field field, AbstractComponent<?> parent)
+    private static <T> ProducerFieldBean<T> createProducerFieldComponent(Class<T> returnType, Field field, AbstractBean<?> parent)
     {
-        ProducerFieldComponent<T> component = new ProducerFieldComponent<T>(parent, returnType);
+        ProducerFieldBean<T> component = new ProducerFieldBean<T>(parent, returnType);
         component.setProducerField(field);
 
         if (returnType.isPrimitive())
@@ -737,7 +737,7 @@
         return component;
     }
 
-    public static <T> void defineDisposalMethods(AbstractComponent<T> component)
+    public static <T> void defineDisposalMethods(AbstractBean<T> component)
     {
         Class<?> clazz = component.getReturnType();
 
@@ -756,9 +756,9 @@
         createDisposalMethodsWithRealizations(component, genericMethods, clazz.getSuperclass(), true);
     }
 
-    private static <T> void createDisposalMethodsWithRealizations(AbstractComponent<T> component, Method[] methods, Class<?> clazz, boolean isRealizes)
+    private static <T> void createDisposalMethodsWithRealizations(AbstractBean<T> component, Method[] methods, Class<?> clazz, boolean isRealizes)
     {
-        ProducerComponentImpl<?> previous = null;
+        ProducerMethodBean<?> previous = null;
         for (Method declaredMethod : methods)
         {
             if (isRealizes)
@@ -784,16 +784,16 @@
 
             Set<Bean<?>> set = InjectionResolver.getInstance().implResolveByType(type, annot);
             Bean<?> bean = set.iterator().next();
-            ProducerComponentImpl<?> pr = null;
+            ProducerMethodBean<?> pr = null;
 
-            if (bean == null || !(bean instanceof ProducerComponentImpl))
+            if (bean == null || !(bean instanceof ProducerMethodBean))
             {
                 throw new UnsatisfiedResolutionException("Producer method component of the disposal method : " + declaredMethod.getName() + " in class : " + clazz.getName() + "is not found");
             }
 
             else
             {
-                pr = (ProducerComponentImpl<?>) bean;
+                pr = (ProducerMethodBean<?>) bean;
             }
 
             if (previous == null)
@@ -816,7 +816,7 @@
         }
     }
 
-    public static <T> void defineInjectedFields(ComponentImpl<T> component)
+    public static <T> void defineInjectedFields(ManagedBean<T> component)
     {
         Class<T> clazz = component.getReturnType();
 
@@ -829,7 +829,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> void defineInternalInjectedFieldsRecursively(ComponentImpl<T> component, Class<T> clazz)
+    private static <T> void defineInternalInjectedFieldsRecursively(ManagedBean<T> component, Class<T> clazz)
     {
         // From inheritance
         Class<?> superClazz = clazz.getSuperclass();
@@ -844,7 +844,7 @@
 
     }
 
-    private static <T> void defineInternalInjectedFields(ComponentImpl<T> component, Class<T> clazz, boolean fromSuperClazz)
+    private static <T> void defineInternalInjectedFields(ManagedBean<T> component, Class<T> clazz, boolean fromSuperClazz)
     {
 
         Field[] fields = clazz.getDeclaredFields();
@@ -933,7 +933,7 @@
 
     }
 
-    public static <T> void defineInjectedMethods(ComponentImpl<T> component)
+    public static <T> void defineInjectedMethods(ManagedBean<T> component)
     {
         Asserts.assertNotNull(component, "component parameter can not be null");
 
@@ -947,7 +947,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> void defineInternalInjectedMethodsRecursively(ComponentImpl<T> component, Class<T> clazz)
+    private static <T> void defineInternalInjectedMethodsRecursively(ManagedBean<T> component, Class<T> clazz)
     {
         // From inheritance
         Class<?> superClazz = clazz.getSuperclass();
@@ -962,7 +962,7 @@
 
     }
 
-    private static <T> void defineInternalInjectedMethods(ComponentImpl<T> component, Class<T> clazz, boolean fromInherited)
+    private static <T> void defineInternalInjectedMethods(ManagedBean<T> component, Class<T> clazz, boolean fromInherited)
     {
 
         Method[] methods = clazz.getDeclaredMethods();
@@ -1032,7 +1032,7 @@
     /**
      * add the definitions for a &#x0040;Initializer method.
      */
-    private static <T> void checkForInjectedInitializerMethod(ComponentImpl<T> component, Class<T> clazz, Method method)
+    private static <T> void checkForInjectedInitializerMethod(ManagedBean<T> component, Class<T> clazz, Method method)
     {
         Annotation[][] anns = method.getParameterAnnotations();
         Type[] type = method.getGenericParameterTypes();
@@ -1056,7 +1056,7 @@
     /**
      * add the definitions for a &#x0040;Initializer method.
      */
-    private static <T> void checkForValidResourceMethod(ComponentImpl<T> component, Class<T> clazz, Method method)
+    private static <T> void checkForValidResourceMethod(ManagedBean<T> component, Class<T> clazz, Method method)
     {
         Class<?>[] parameterTypes = method.getParameterTypes();
         if (parameterTypes == null || parameterTypes.length != 1)
@@ -1068,7 +1068,7 @@
         WebBeansUtil.checkForValidResources(parameterTypes[0], clazz, method.getName(), anns);
     }
 
-    public static void defineSimpleWebBeanInterceptorStack(AbstractComponent<?> component)
+    public static void defineSimpleWebBeanInterceptorStack(AbstractBean<?> component)
     {
         Asserts.assertNotNull(component, "component parameter can no be null");
 
@@ -1079,12 +1079,12 @@
         WebBeansInterceptorConfig.configure(component, component.getInterceptorStack());
     }
 
-    public static void defineWebBeanDecoratorStack(AbstractComponent<?> component, Object object)
+    public static void defineWebBeanDecoratorStack(AbstractBean<?> component, Object object)
     {
         WebBeansDecoratorConfig.configureDecarotors(component, object);
     }
 
-    public static <T> void defineObserverMethods(ObservesMethodsOwner<T> component, Class<T> clazz)
+    public static <T> void defineObserverMethods(ObservesMethodsOwnerBean<T> component, Class<T> clazz)
     {
         Asserts.assertNotNull(component, "component parameter can not be null");
         Asserts.nullCheckForClass(clazz);
@@ -1111,7 +1111,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> void createObserverMethodsWithRealizes(ObservesMethodsOwner<T> component, Class<?> clazz, Method[] candidateMethods, boolean isRealizes)
+    private static <T> void createObserverMethodsWithRealizes(ObservesMethodsOwnerBean<T> component, Class<?> clazz, Method[] candidateMethods, boolean isRealizes)
     {
 
         for (Method candidateMethod : candidateMethods)
@@ -1131,12 +1131,12 @@
             component.addObservableMethod(candidateMethod);
             component.setFromRealizes(isRealizes);
 
-            addMethodInjectionPointMetaData((AbstractComponent<T>) component, candidateMethod);
+            addMethodInjectionPointMetaData((AbstractBean<T>) component, candidateMethod);
         }
 
     }
 
-    public static <T> void defineSerializable(AbstractComponent<T> component)
+    public static <T> void defineSerializable(AbstractBean<T> component)
     {
         Asserts.assertNotNull(component, "component parameter can not be null");
         if (ClassUtil.isAssignable(Serializable.class, component.getReturnType()))
@@ -1145,7 +1145,7 @@
         }
     }
 
-    public static <T> void addFieldInjectionPointMetaData(AbstractComponent<T> owner, Field field)
+    public static <T> void addFieldInjectionPointMetaData(AbstractBean<T> owner, Field field)
     {
         InjectionPoint injectionPoint = InjectionPointFactory.getFieldInjectionPointData(owner, field);
         if (injectionPoint != null)
@@ -1155,7 +1155,7 @@
         }
     }
 
-    public static <T> void addMethodInjectionPointMetaData(AbstractComponent<T> owner, Method method)
+    public static <T> void addMethodInjectionPointMetaData(AbstractBean<T> owner, Method method)
     {
         List<InjectionPoint> injectionPoints = InjectionPointFactory.getMethodInjectionPointData(owner, method);
         for (InjectionPoint injectionPoint : injectionPoints)
@@ -1165,7 +1165,7 @@
         }
     }
 
-    public static <T> void addConstructorInjectionPointMetaData(AbstractComponent<T> owner, Constructor<T> constructor)
+    public static <T> void addConstructorInjectionPointMetaData(AbstractBean<T> owner, Constructor<T> constructor)
     {
         List<InjectionPoint> injectionPoints = InjectionPointFactory.getConstructorInjectionPointData(owner, constructor);
         for (InjectionPoint injectionPoint : injectionPoints)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java Sat Jul  4 06:20:35 2009
@@ -18,11 +18,11 @@
 import javax.enterprise.context.ScopeType;
 import javax.interceptor.Interceptor;
 
-import org.apache.webbeans.component.ComponentImpl;
-import org.apache.webbeans.component.ProducerComponentImpl;
-import org.apache.webbeans.component.ProducerFieldComponent;
+import org.apache.webbeans.component.ManagedBean;
+import org.apache.webbeans.component.ProducerMethodBean;
+import org.apache.webbeans.component.ProducerFieldBean;
 import org.apache.webbeans.component.WebBeansType;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.intercept.InterceptorUtil;
 import org.apache.webbeans.util.AnnotationUtil;
@@ -102,13 +102,13 @@
      * @return the newly created Simple WebBean Component
      * @throws WebBeansConfigurationException if any configuration exception occurs
      */
-    public static <T> ComponentImpl<T> define(Class<T> clazz, WebBeansType type) throws WebBeansConfigurationException
+    public static <T> ManagedBean<T> define(Class<T> clazz, WebBeansType type) throws WebBeansConfigurationException
     {
-        ManagerImpl manager = ManagerImpl.getManager();
+        BeanManagerImpl manager = BeanManagerImpl.getManager();
 
         checkSimpleWebBeanCondition(clazz);
 
-        ComponentImpl<T> component = new ComponentImpl<T>(clazz, type);
+        ManagedBean<T> component = new ManagedBean<T>(clazz, type);
 
         DefinitionUtil.defineSerializable(component);
         DefinitionUtil.defineStereoTypes(component, clazz.getDeclaredAnnotations());
@@ -138,10 +138,10 @@
         //Dropped from the speicification
         //WebBeansUtil.checkSteroTypeRequirements(component, clazz.getDeclaredAnnotations(), "Simple WebBean Component implementation class : " + clazz.getName());
 
-        Set<ProducerComponentImpl<?>> producerComponents = DefinitionUtil.defineProducerMethods(component);
+        Set<ProducerMethodBean<?>> producerComponents = DefinitionUtil.defineProducerMethods(component);
         manager.getBeans().addAll(producerComponents);
 
-        Set<ProducerFieldComponent<?>> producerFields = DefinitionUtil.defineProduerFields(component);
+        Set<ProducerFieldBean<?>> producerFields = DefinitionUtil.defineProduerFields(component);
         manager.getBeans().addAll(producerFields);
 
         DefinitionUtil.defineDisposalMethods(component);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java Sat Jul  4 06:20:35 2009
@@ -31,9 +31,9 @@
 import javax.interceptor.Interceptor;
 
 import org.apache.webbeans.WebBeansConstants;
-import org.apache.webbeans.component.ComponentImpl;
+import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.component.WebBeansType;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.decorator.DecoratorUtil;
 import org.apache.webbeans.decorator.WebBeansDecorator;
 import org.apache.webbeans.deployment.StereoTypeManager;
@@ -87,17 +87,17 @@
             if (!deployed)
             {
                 // Register Manager built-in component
-                ManagerImpl.getManager().addBean(WebBeansUtil.getManagerComponent());
+                BeanManagerImpl.getManager().addBean(WebBeansUtil.getManagerComponent());
 
                 // Register Conversation built-in component
-                ManagerImpl.getManager().addBean(WebBeansUtil.getConversationComponent());
+                BeanManagerImpl.getManager().addBean(WebBeansUtil.getConversationComponent());
                 
                 // Register InjectionPoint bean
-                ManagerImpl.getManager().addBean(WebBeansUtil.getInjectionPointComponent());
+                BeanManagerImpl.getManager().addBean(WebBeansUtil.getInjectionPointComponent());
 
                 // Bind manager
                 JNDIService service = ServiceLoader.getService(JNDIService.class);
-                service.bind(WebBeansConstants.WEB_BEANS_MANAGER_JNDI_NAME, ManagerImpl.getManager());
+                service.bind(WebBeansConstants.WEB_BEANS_MANAGER_JNDI_NAME, BeanManagerImpl.getManager());
 
                 deployFromXML(scanner);
                 checkStereoTypes(scanner);
@@ -155,7 +155,7 @@
     {
         logger.info("Validation of injection points are started");
 
-        ManagerImpl manager = ManagerImpl.getManager();        
+        BeanManagerImpl manager = BeanManagerImpl.getManager();        
         Set<Bean<?>> beans = new HashSet<Bean<?>>();
         
         //Adding decorators to validate
@@ -199,7 +199,7 @@
 
     private void validate(Set<Bean<?>> beans)
     {
-        ManagerImpl manager = ManagerImpl.getManager();
+        BeanManagerImpl manager = BeanManagerImpl.getManager();
         
         if (beans != null && beans.size() > 0)
         {
@@ -429,7 +429,7 @@
 
     protected void checkPassivationScopes()
     {
-        Set<Bean<?>> beans = ManagerImpl.getManager().getBeans();
+        Set<Bean<?>> beans = BeanManagerImpl.getManager().getBeans();
 
         if (beans != null && beans.size() > 0)
         {
@@ -437,9 +437,9 @@
             while (itBeans.hasNext())
             {
                 Object beanObj = itBeans.next();
-                if (beanObj instanceof ComponentImpl)
+                if (beanObj instanceof ManagedBean)
                 {
-                    ComponentImpl<?> component = (ComponentImpl<?>) beanObj;
+                    ManagedBean<?> component = (ManagedBean<?>) beanObj;
                     ScopeType scope = component.getScopeType().getAnnotation(ScopeType.class);
                     if (scope.passivating())
                     {
@@ -502,20 +502,20 @@
     
     protected <T> void defineSimpleWebBeans(Class<T> clazz)
     {
-        ComponentImpl<T> component = null;
+        ManagedBean<T> component = null;
 
         if (!AnnotationUtil.isAnnotationExistOnClass(clazz, Interceptor.class) && !AnnotationUtil.isAnnotationExistOnClass(clazz, javax.decorator.Decorator.class))
         {
             component = SimpleWebBeansConfigurator.define(clazz, WebBeansType.SIMPLE);
             if (component != null)
             {
-                ManagerImpl.getManager().addBean(WebBeansUtil.createNewSimpleBeanComponent(component));
+                BeanManagerImpl.getManager().addBean(WebBeansUtil.createNewSimpleBeanComponent(component));
                 
                 DecoratorUtil.checkSimpleWebBeanDecoratorConditions(component);
 
                 /* I have added this into the ComponentImpl.afterCreate(); */
                 // DefinitionUtil.defineSimpleWebBeanInterceptorStack(component);
-                ManagerImpl.getManager().addBean(component);
+                BeanManagerImpl.getManager().addBean(component);
             }
         }
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java Sat Jul  4 06:20:35 2009
@@ -16,7 +16,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.SessionContextManager;
 import org.apache.webbeans.context.creational.CreationalContextFactory;
 import org.apache.webbeans.conversation.ConversationManager;
@@ -33,7 +33,7 @@
 
 public class WebBeansFinder
 {
-    public static final String SINGLETON_MANAGER = ManagerImpl.class.getName();
+    public static final String SINGLETON_MANAGER = BeanManagerImpl.class.getName();
 
     public static final String SINGLETON_DECORATORS_MANAGER = DecoratorsManager.class.getName();
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java Sat Jul  4 06:20:35 2009
@@ -21,7 +21,7 @@
 import java.util.Set;
 
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 
 /**
  * Defines the bean inherited meta-datas.
@@ -29,7 +29,7 @@
 abstract class AbstractBeanInheritedMetaData<T> implements IBeanInheritedMetaData
 {
     /**Component that inherits the meta-datas*/
-    protected AbstractComponent<T> component;
+    protected AbstractBean<T> component;
     
     /**Inherited class*/
     protected Class<?> inheritedClazz;
@@ -55,7 +55,7 @@
      * @param component webbeans component
      * @param inheritedClazz inherited class
      */
-    protected AbstractBeanInheritedMetaData(AbstractComponent<T> component, Class<?> inheritedClazz)
+    protected AbstractBeanInheritedMetaData(AbstractBean<T> component, Class<?> inheritedClazz)
     {
         this.component = component;
         this.inheritedClazz = inheritedClazz;
@@ -93,7 +93,7 @@
         return this.inheritedDeploymentType;
     }
     
-    protected AbstractComponent<T> getComponent()
+    protected AbstractBean<T> getComponent()
     {
         return this.component;
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java?rev=791061&r1=791060&r2=791061&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java Sat Jul  4 06:20:35 2009
@@ -26,12 +26,12 @@
 import javax.enterprise.inject.stereotype.Stereotype;
 import javax.interceptor.InterceptorBindingType;
 
-import org.apache.webbeans.component.AbstractComponent;
+import org.apache.webbeans.component.AbstractBean;
 import org.apache.webbeans.util.AnnotationUtil;
 
 public class BeanInheritedMetaData<T> extends AbstractBeanInheritedMetaData<T>
 {
-    public BeanInheritedMetaData(AbstractComponent<T> component)
+    public BeanInheritedMetaData(AbstractBean<T> component)
     {
         super(component, component.getReturnType().getSuperclass());
     }



Mime
View raw message