openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1429716 - in /openwebbeans/trunk: webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/ webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/ webbeans-impl/src/main/java/org/apache/webbeans/component/ webbeans-impl...
Date Mon, 07 Jan 2013 09:12:32 GMT
Author: arne
Date: Mon Jan  7 09:12:31 2013
New Revision: 1429716

URL: http://svn.apache.org/viewvc?rev=1429716&view=rev
Log:
OWB-747: Renamed *Creator to *Builder

Added:
    openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java
      - copied, changed from r1429688, openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanCreatorImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java
      - copied, changed from r1429694, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectionTargetBeanBuilder.java
      - copied, changed from r1429699, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
      - copied, changed from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanBuilder.java
      - copied, changed from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanCreatorImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
      - copied, changed from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanCreatorImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
      - copied, changed from r1429701, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java
      - copied, changed from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanCreatorImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java
      - copied, changed from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java
      - copied, changed from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java
      - copied, changed from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanCreator.java
Removed:
    openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanCreatorImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanCreatorImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanCreatorImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanCreatorImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanCreator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanCreator.java
Modified:
    openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java

Copied: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java
(from r1429688, openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanCreatorImpl.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java?p2=openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java&p1=openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanCreatorImpl.java&r1=1429688&r2=1429716&rev=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanCreatorImpl.java
(original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java
Mon Jan  7 09:12:31 2013
@@ -23,7 +23,7 @@ import java.util.Set;
 
 import javax.enterprise.inject.spi.ObserverMethod;
 
-import org.apache.webbeans.component.creation.AbstractInjecionTargetBeanCreator;
+import org.apache.webbeans.component.creation.AbstractInjectionTargetBeanBuilder;
 import org.apache.webbeans.ejb.common.util.EjbValidator;
 
 /**
@@ -33,9 +33,9 @@ import org.apache.webbeans.ejb.common.ut
  *
  * @param <T> ejb class type
  */
-public class EjbBeanCreatorImpl<T> extends AbstractInjecionTargetBeanCreator<T>
+public class EjbBeanBuilder<T> extends AbstractInjectionTargetBeanBuilder<T>
 {
-    public EjbBeanCreatorImpl(BaseEjbBean<T> ejbBean)
+    public EjbBeanBuilder(BaseEjbBean<T> ejbBean)
     {
         super(ejbBean);
     }
@@ -46,7 +46,7 @@ public class EjbBeanCreatorImpl<T> exten
     @Override
     public void checkCreateConditions()
     {        
-        EjbValidator.validateDecoratorOrInterceptor(getBean().getReturnType());
+        EjbValidator.validateDecoratorOrInterceptor(getBeanType());
     }
     
     /**
@@ -58,7 +58,7 @@ public class EjbBeanCreatorImpl<T> exten
         super.defineScopeType(errorMessage, allowLazyInit);
 
         EjbValidator.validateEjbScopeType(getBean());
-        EjbValidator.validateGenericBeanType(getBean().getReturnType(), getBean().getScope());
+        EjbValidator.validateGenericBeanType(getBeanType(), getScope());
     }
     
     

Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java?rev=1429716&r1=1429715&r2=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
(original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
Mon Jan  7 09:12:31 2013
@@ -39,7 +39,7 @@ import org.apache.webbeans.component.Pro
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.ejb.common.component.BaseEjbBean;
-import org.apache.webbeans.ejb.common.component.EjbBeanCreatorImpl;
+import org.apache.webbeans.ejb.common.component.EjbBeanBuilder;
 import org.apache.webbeans.event.ObserverMethodImpl;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.WebBeansException;
@@ -68,7 +68,7 @@ public final class EjbUtility
         
         //Fires ProcessAnnotatedType
         ProcessAnnotatedTypeImpl<T> processAnnotatedEvent = (ProcessAnnotatedTypeImpl<T>)event;
            
-        EjbBeanCreatorImpl<T> ejbBeanCreator = new EjbBeanCreatorImpl<T>(ejbBean);
+        EjbBeanBuilder<T> ejbBeanCreator = new EjbBeanBuilder<T>(ejbBean);
         ejbBeanCreator.checkCreateConditions();
         
         if(processAnnotatedEvent.isVeto())
@@ -177,7 +177,7 @@ public final class EjbUtility
 
         final AnnotatedType<T> annotatedType = ejbBean.getAnnotatedType();
 
-        final EjbBeanCreatorImpl<T> ejbBeanCreator = new EjbBeanCreatorImpl<T>(ejbBean);
+        final EjbBeanBuilder<T> ejbBeanCreator = new EjbBeanBuilder<T>(ejbBean);
 
         final Set<ProducerMethodBean<?>> producerMethodBeans = ejbBeanCreator.defineProducerMethods();
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java?rev=1429716&r1=1429715&r2=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
Mon Jan  7 09:12:31 2013
@@ -28,7 +28,7 @@ import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.Decorator;
 
-import org.apache.webbeans.component.creation.ManagedBeanCreatorImpl;
+import org.apache.webbeans.component.creation.ManagedBeanBuilder;
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.decorator.AbstractDecoratorMethodHandler;
 import org.apache.webbeans.inject.InjectableConstructor;
@@ -108,7 +108,7 @@ public class ManagedBean<T> extends Abst
         if (!fullInit)
         {
             fullInit = true;
-            ManagedBeanCreatorImpl.lazyInitializeManagedBean(this);
+            ManagedBeanBuilder.lazyInitializeManagedBean(this);
         }
     }
 

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java
(from r1429694, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java&r1=1429694&r2=1429716&rev=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java
Mon Jan  7 09:12:31 2013
@@ -63,7 +63,7 @@ import org.apache.webbeans.util.WebBeans
  *
  * @param <T> bean class info
  */
-public abstract class AbstractBeanCreator<T>
+public abstract class AbstractBeanBuilder<T>
 {
     /**Bean instance*/
     private final AbstractOwbBean<T> bean;    
@@ -82,7 +82,7 @@ public abstract class AbstractBeanCreato
     
     private boolean serializable = false;
 
-    public AbstractBeanCreator(AbstractOwbBean<T> bean, Annotated annotated)
+    public AbstractBeanBuilder(AbstractOwbBean<T> bean, Annotated annotated)
     {
         this(bean, annotated, null);
     }
@@ -93,7 +93,7 @@ public abstract class AbstractBeanCreato
      * @param bean bean instance
      * @param annotated
      */
-    public AbstractBeanCreator(AbstractOwbBean<T> bean, Annotated annotated, Class<?
extends Annotation> scopeType)
+    public AbstractBeanBuilder(AbstractOwbBean<T> bean, Annotated annotated, Class<?
extends Annotation> scopeType)
     {
         this.bean = bean;
         this.annotated = annotated;

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectionTargetBeanBuilder.java
(from r1429699, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectionTargetBeanBuilder.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectionTargetBeanBuilder.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java&r1=1429699&r2=1429716&rev=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjecionTargetBeanCreator.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectionTargetBeanBuilder.java
Mon Jan  7 09:12:31 2013
@@ -64,13 +64,13 @@ import org.apache.webbeans.util.ClassUti
 import org.apache.webbeans.util.WebBeansUtil;
 
 /**
- * Abstract implementation of {@link AbstractBeanCreator}.
+ * Abstract implementation of {@link AbstractBeanBuilder}.
  * 
  * @version $Rev$ $Date$
  *
  * @param <T> bean class type
  */
-public abstract class AbstractInjecionTargetBeanCreator<T> extends AbstractBeanCreator<T>
+public abstract class AbstractInjectionTargetBeanBuilder<T> extends AbstractBeanBuilder<T>
 {    
     
     private WebBeansContext webBeansContext;
@@ -81,13 +81,13 @@ public abstract class AbstractInjecionTa
      * 
      * @param bean bean instance
      */
-    public AbstractInjecionTargetBeanCreator(AbstractInjectionTargetBean<T> bean, Class<?
extends Annotation> scopeType)
+    public AbstractInjectionTargetBeanBuilder(AbstractInjectionTargetBean<T> bean,
Class<? extends Annotation> scopeType)
     {
         super(bean, bean.getAnnotatedType(), scopeType);
         webBeansContext = bean.getWebBeansContext();
     }
         
-    public AbstractInjecionTargetBeanCreator(AbstractInjectionTargetBean<T> bean)
+    public AbstractInjectionTargetBeanBuilder(AbstractInjectionTargetBean<T> bean)
     {
         this(bean, null);
     }
@@ -468,8 +468,8 @@ public abstract class AbstractInjecionTa
                             throw new WebBeansConfigurationException("Resource producer annotated
field : " + annotatedField + " can not define EL name");
                         }
                         
-                        ResourceBeanCreator<T, Annotation> resourceBeanCreator
-                            = new ResourceBeanCreator<T, Annotation>(getBean(), resourceRef,
annotatedField);
+                        ResourceBeanBuilder<T, Annotation> resourceBeanCreator
+                            = new ResourceBeanBuilder<T, Annotation>(getBean(), resourceRef,
annotatedField);
                         ResourceBean<T, Annotation> resourceBean = resourceBeanCreator.getBean();
                         
                         resourceBean.getTypes().addAll(annotatedField.getTypeClosure());
@@ -482,7 +482,7 @@ public abstract class AbstractInjecionTa
                 }
                 else
                 {
-                    ProducerFieldBeanCreator<T> producerFieldBeanCreator = new ProducerFieldBeanCreator<T>(getBean(),
annotatedField);
+                    ProducerFieldBeanBuilder<T> producerFieldBeanCreator = new ProducerFieldBeanBuilder<T>(getBean(),
annotatedField);
                     ProducerFieldBean<T> producerFieldBean = producerFieldBeanCreator.getBean();
                     producerFieldBean.setProducerField(field);
                     
@@ -542,7 +542,7 @@ public abstract class AbstractInjecionTa
                     specialize = true;
                 }
                 
-                ProducerMethodBeanCreator<T> producerMethodBeanCreator = new ProducerMethodBeanCreator<T>(getBean(),
annotatedMethod);
+                ProducerMethodBeanBuilder<T> producerMethodBeanCreator = new ProducerMethodBeanBuilder<T>(getBean(),
annotatedMethod);
                 ProducerMethodBean<T> producerMethodBean = producerMethodBeanCreator.getBean();
                 producerMethodBean.setCreatorMethod(annotatedMethod.getJavaMember());
                 

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
(from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanCreator.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanCreator.java&r1=1429688&r2=1429716&rev=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanCreator.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
Mon Jan  7 09:12:31 2013
@@ -22,10 +22,10 @@ import javax.enterprise.inject.spi.Annot
 
 import org.apache.webbeans.component.AbstractProducerBean;
 
-public abstract class AbstractProducerBeanCreator<T> extends AbstractBeanCreator<T>
+public abstract class AbstractProducerBeanBuilder<T> extends AbstractBeanBuilder<T>
 {
 
-    public AbstractProducerBeanCreator(AbstractProducerBean<T> bean, Annotated annotated)
+    public AbstractProducerBeanBuilder(AbstractProducerBean<T> bean, Annotated annotated)
     {
         super(bean, annotated);
     }

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanBuilder.java
(from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanCreatorImpl.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanBuilder.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanBuilder.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanCreatorImpl.java&r1=1429688&r2=1429716&rev=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanCreatorImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AnnotatedTypeBeanBuilder.java
Mon Jan  7 09:12:31 2013
@@ -27,11 +27,11 @@ import org.apache.webbeans.config.OWBLog
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 
-public class AnnotatedTypeBeanCreatorImpl<T> extends ManagedBeanCreatorImpl<T>
+public class AnnotatedTypeBeanBuilder<T> extends ManagedBeanBuilder<T>
 {
-    private final static Logger logger = WebBeansLoggerFacade.getLogger(AnnotatedTypeBeanCreatorImpl.class);
+    private final static Logger logger = WebBeansLoggerFacade.getLogger(AnnotatedTypeBeanBuilder.class);
 
-    public AnnotatedTypeBeanCreatorImpl(AnnotatedType<T> annotatedType, WebBeansContext
context)
+    public AnnotatedTypeBeanBuilder(AnnotatedType<T> annotatedType, WebBeansContext
context)
     {
         super(annotatedType, context);
     }

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
(from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanCreatorImpl.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanCreatorImpl.java&r1=1429688&r2=1429716&rev=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanCreatorImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
Mon Jan  7 09:12:31 2013
@@ -23,10 +23,10 @@ import javax.enterprise.context.Applicat
 import org.apache.webbeans.component.ExtensionBean;
 import org.apache.webbeans.config.WebBeansContext;
 
-public class ExtensionBeanCreatorImpl<T> extends AbstractInjecionTargetBeanCreator<T>
+public class ExtensionBeanBuilder<T> extends AbstractInjectionTargetBeanBuilder<T>
 {
 
-    public ExtensionBeanCreatorImpl(Class<T> type, WebBeansContext webBeansContext)
+    public ExtensionBeanBuilder(Class<T> type, WebBeansContext webBeansContext)
     {
         super(new ExtensionBean<T>(type, webBeansContext), ApplicationScoped.class);
     }

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
(from r1429701, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java&r1=1429701&r2=1429716&rev=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
Mon Jan  7 09:12:31 2013
@@ -67,7 +67,7 @@ import org.apache.webbeans.util.WebBeans
  *
  * @param <T> bean type info
  */
-public class ManagedBeanCreatorImpl<T> extends AbstractInjecionTargetBeanCreator<T>
+public class ManagedBeanBuilder<T> extends AbstractInjectionTargetBeanBuilder<T>
 {
     private final WebBeansContext webBeansContext;
     
@@ -76,12 +76,12 @@ public class ManagedBeanCreatorImpl<T> e
     /**
      * Creates a new creator.
      */
-    public ManagedBeanCreatorImpl(AnnotatedType<T> annotatedType, WebBeansContext webBeansContext)
+    public ManagedBeanBuilder(AnnotatedType<T> annotatedType, WebBeansContext webBeansContext)
     {
         this(new ManagedBean<T>(annotatedType.getJavaClass(), annotatedType, webBeansContext),
null);
     }
 
-    protected ManagedBeanCreatorImpl(ManagedBean<T> managedBean, Class<? extends
Annotation> scopeType)
+    protected ManagedBeanBuilder(ManagedBean<T> managedBean, Class<? extends Annotation>
scopeType)
     {
         super(managedBean, scopeType);
         webBeansContext = managedBean.getWebBeansContext();
@@ -120,7 +120,7 @@ public class ManagedBeanCreatorImpl<T> e
 
     public static <T> void lazyInitializeManagedBean(ManagedBean<T> bean)
     {
-        ManagedBeanCreatorImpl<T> managedBeanCreator = new ManagedBeanCreatorImpl<T>(bean,
bean.getScope());
+        ManagedBeanBuilder<T> managedBeanCreator = new ManagedBeanBuilder<T>(bean,
bean.getScope());
 
         managedBeanCreator.lazyInitializeManagedBean(bean.getBeanClass(), bean);
     }

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java
(from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanCreatorImpl.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanCreatorImpl.java&r1=1429688&r2=1429716&rev=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanCreatorImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java
Mon Jan  7 09:12:31 2013
@@ -25,10 +25,10 @@ import org.apache.webbeans.component.New
 import org.apache.webbeans.component.WebBeansType;
 import org.apache.webbeans.config.WebBeansContext;
 
-public class NewManagedBeanCreatorImpl<T> extends ManagedBeanCreatorImpl<T>
+public class NewManagedBeanBuilder<T> extends ManagedBeanBuilder<T>
 {
 
-    public NewManagedBeanCreatorImpl(AnnotatedType<T> annotatedType, WebBeansContext
webBeansContext)
+    public NewManagedBeanBuilder(AnnotatedType<T> annotatedType, WebBeansContext webBeansContext)
     {
         super(new NewManagedBean<T>(annotatedType.getJavaClass(), WebBeansType.MANAGED,
annotatedType, webBeansContext), Dependent.class);
     }

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java
(from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanCreator.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanCreator.java&r1=1429688&r2=1429716&rev=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanCreator.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeanBuilder.java
Mon Jan  7 09:12:31 2013
@@ -24,15 +24,15 @@ import org.apache.webbeans.component.Inj
 import org.apache.webbeans.component.ProducerFieldBean;
 import org.apache.webbeans.util.ClassUtil;
 
-public class ProducerFieldBeanCreator<T> extends AbstractProducerBeanCreator<T>
+public class ProducerFieldBeanBuilder<T> extends AbstractProducerBeanBuilder<T>
 {
 
-    public ProducerFieldBeanCreator(InjectionTargetBean<T> parent, AnnotatedField<?
super T> annotatedField)
+    public ProducerFieldBeanBuilder(InjectionTargetBean<T> parent, AnnotatedField<?
super T> annotatedField)
     {
         super(new ProducerFieldBean<T>(parent, (Class<T>)ClassUtil.getClass(annotatedField.getBaseType())),
annotatedField);
     }
 
-    protected ProducerFieldBeanCreator(ProducerFieldBean<T> bean, AnnotatedField<?
super T> annotatedField)
+    protected ProducerFieldBeanBuilder(ProducerFieldBean<T> bean, AnnotatedField<?
super T> annotatedField)
     {
         super(bean, annotatedField);
     }

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java
(from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanCreator.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanCreator.java&r1=1429688&r2=1429716&rev=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanCreator.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeanBuilder.java
Mon Jan  7 09:12:31 2013
@@ -32,10 +32,10 @@ import org.apache.webbeans.exception.Web
 import org.apache.webbeans.util.AnnotationUtil;
 import org.apache.webbeans.util.ClassUtil;
 
-public class ProducerMethodBeanCreator<T> extends AbstractProducerBeanCreator<T>
+public class ProducerMethodBeanBuilder<T> extends AbstractProducerBeanBuilder<T>
 {
 
-    public ProducerMethodBeanCreator(InjectionTargetBean<T> parent, AnnotatedMethod<?
super T> annotatedMethod)
+    public ProducerMethodBeanBuilder(InjectionTargetBean<T> parent, AnnotatedMethod<?
super T> annotatedMethod)
     {
         super(new ProducerMethodBean<T>(parent, (Class<T>)ClassUtil.getClass(annotatedMethod.getBaseType())),
annotatedMethod);
     }

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java
(from r1429688, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanCreator.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanCreator.java&r1=1429688&r2=1429716&rev=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanCreator.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ResourceBeanBuilder.java
Mon Jan  7 09:12:31 2013
@@ -26,10 +26,10 @@ import org.apache.webbeans.component.Inj
 import org.apache.webbeans.component.ResourceBean;
 import org.apache.webbeans.spi.api.ResourceReference;
 
-public class ResourceBeanCreator<T, R extends Annotation> extends ProducerFieldBeanCreator<T>
+public class ResourceBeanBuilder<T, R extends Annotation> extends ProducerFieldBeanBuilder<T>
 {
 
-    public ResourceBeanCreator(InjectionTargetBean<T> parent, ResourceReference<T,
R> resourceRef, AnnotatedField<? super T> annotatedField)
+    public ResourceBeanBuilder(InjectionTargetBean<T> parent, ResourceReference<T,
R> resourceRef, AnnotatedField<? super T> annotatedField)
     {
         super(new ResourceBean<T, R>((Class<T>)annotatedField.getJavaMember().getType(),
parent, resourceRef), annotatedField);
     }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1429716&r1=1429715&r2=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Mon Jan  7 09:12:31 2013
@@ -50,7 +50,7 @@ import org.apache.webbeans.component.Inj
 import org.apache.webbeans.component.InterceptedMarker;
 import org.apache.webbeans.component.NewBean;
 import org.apache.webbeans.component.OwbBean;
-import org.apache.webbeans.component.creation.ManagedBeanCreatorImpl;
+import org.apache.webbeans.component.creation.ManagedBeanBuilder;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.container.InjectableBeanManager;
 import org.apache.webbeans.container.InjectionResolver;
@@ -830,7 +830,7 @@ public class BeansDeployer
             //Check conditions
             webBeansContext.getWebBeansUtil().checkManagedBeanCondition(clazz);
 
-            ManagedBeanCreatorImpl<T> managedBeanCreator = new ManagedBeanCreatorImpl<T>(annotatedType,
webBeansContext);
+            ManagedBeanBuilder<T> managedBeanCreator = new ManagedBeanBuilder<T>(annotatedType,
webBeansContext);
 
             boolean annotationTypeSet = false;
             if(processAnnotatedEvent.isModifiedAnnotatedType())

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1429716&r1=1429715&r2=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Mon Jan  7 09:12:31 2013
@@ -113,10 +113,10 @@ import org.apache.webbeans.component.Pro
 import org.apache.webbeans.component.ProducerMethodBean;
 import org.apache.webbeans.component.ResourceBean;
 import org.apache.webbeans.component.WebBeansType;
-import org.apache.webbeans.component.creation.AnnotatedTypeBeanCreatorImpl;
-import org.apache.webbeans.component.creation.ExtensionBeanCreatorImpl;
-import org.apache.webbeans.component.creation.ManagedBeanCreatorImpl;
-import org.apache.webbeans.component.creation.NewManagedBeanCreatorImpl;
+import org.apache.webbeans.component.creation.AnnotatedTypeBeanBuilder;
+import org.apache.webbeans.component.creation.ExtensionBeanBuilder;
+import org.apache.webbeans.component.creation.ManagedBeanBuilder;
+import org.apache.webbeans.component.creation.NewManagedBeanBuilder;
 import org.apache.webbeans.config.DefinitionUtil;
 import org.apache.webbeans.config.EJBWebBeansConfigurator;
 import org.apache.webbeans.config.OWBLogConst;
@@ -592,8 +592,8 @@ public final class WebBeansUtil
 
         if (webBeansContext.getWebBeansUtil().isManagedBean(clazz))
         {
-            NewManagedBeanCreatorImpl<T> newBeanCreator
-                = new NewManagedBeanCreatorImpl<T>(webBeansContext.getAnnotatedElementFactory().newAnnotatedType(clazz),
webBeansContext);
+            NewManagedBeanBuilder<T> newBeanCreator
+                = new NewManagedBeanBuilder<T>(webBeansContext.getAnnotatedElementFactory().newAnnotatedType(clazz),
webBeansContext);
             comp = newBeanCreator.getBean();
             comp.setImplScopeType(Dependent.class);
             comp.setConstructor(defineConstructor(clazz));
@@ -639,7 +639,7 @@ public final class WebBeansUtil
     public <T> ExtensionBean<T> createExtensionComponent(Class<T> clazz)
     {
         Asserts.nullCheckForClass(clazz);
-        ExtensionBeanCreatorImpl<T> extensionBeanCreator = new ExtensionBeanCreatorImpl<T>(clazz,
webBeansContext);
+        ExtensionBeanBuilder<T> extensionBeanCreator = new ExtensionBeanBuilder<T>(clazz,
webBeansContext);
         extensionBeanCreator.defineObserverMethods();
         return extensionBeanCreator.getBean();
     }
@@ -2336,7 +2336,7 @@ public final class WebBeansUtil
     {
         Class<T> clazz = type.getJavaClass();
 
-        ManagedBeanCreatorImpl<T> managedBeanCreator = new ManagedBeanCreatorImpl<T>(type,
webBeansContext);
+        ManagedBeanBuilder<T> managedBeanCreator = new ManagedBeanBuilder<T>(type,
webBeansContext);
 
         managedBeanCreator.defineApiType();
 
@@ -2480,7 +2480,7 @@ public final class WebBeansUtil
     {
         Class<T> clazz = type.getJavaClass();
 
-        AnnotatedTypeBeanCreatorImpl<T> managedBeanCreator = new AnnotatedTypeBeanCreatorImpl<T>(type,
webBeansContext);
+        AnnotatedTypeBeanBuilder<T> managedBeanCreator = new AnnotatedTypeBeanBuilder<T>(type,
webBeansContext);
 
         managedBeanCreator.defineApiType();
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java?rev=1429716&r1=1429715&r2=1429716&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
Mon Jan  7 09:12:31 2013
@@ -44,7 +44,7 @@ import org.apache.webbeans.component.Man
 import org.apache.webbeans.component.ProducerFieldBean;
 import org.apache.webbeans.component.ProducerMethodBean;
 import org.apache.webbeans.component.WebBeansType;
-import org.apache.webbeans.component.creation.ManagedBeanCreatorImpl;
+import org.apache.webbeans.component.creation.ManagedBeanBuilder;
 import org.apache.webbeans.config.DefinitionUtil;
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.container.BeanManagerImpl;
@@ -522,7 +522,7 @@ public abstract class TestContext implem
             throw new WebBeansConfigurationException("ManagedBean implementation class :
" + clazz.getName() + " may not _defined as interface");
         }
 
-        ManagedBeanCreatorImpl<T> managedBeanCreator = new ManagedBeanCreatorImpl<T>(anntotatedType,
webBeansContext);
+        ManagedBeanBuilder<T> managedBeanCreator = new ManagedBeanBuilder<T>(anntotatedType,
webBeansContext);
         ManagedBean<T> component = managedBeanCreator.getBean();
         component.setProducer(new InjectionTargetProducer(component));
 



Mime
View raw message