openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r909778 [2/2] - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/component/ main/java/org/apache/webbeans/component/creation/ main/java/org/apache/webbeans/component/third/ main/java/org/apache/webbeans/component/xml/...
Date Sat, 13 Feb 2010 09:14:57 GMT
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java Sat Feb 13 09:14:54 2010
@@ -28,7 +28,7 @@
 import javax.enterprise.inject.spi.Decorator;
 
 import org.apache.webbeans.annotation.WebBeansAnnotation;
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.InjectionTargetBean;
 import org.apache.webbeans.decorator.WebBeansDecorator;
 import org.apache.webbeans.exception.WebBeansException;
@@ -45,7 +45,7 @@
 
     }
 
-    public static Object createNormalScopedBeanProxy(AbstractBean<?> bean, CreationalContext<?> creationalContext)
+    public static Object createNormalScopedBeanProxy(AbstractOwbBean<?> bean, CreationalContext<?> creationalContext)
     {
         Object result = null;
         try
@@ -54,7 +54,7 @@
 
             if (!(bean instanceof WebBeansDecorator) && !(bean instanceof WebBeansInterceptor))
             {
-                fact.setHandler(new NormalScopedBeanInterceptorHandler((AbstractBean<?>) bean, creationalContext));
+                fact.setHandler(new NormalScopedBeanInterceptorHandler((AbstractOwbBean<?>) bean, creationalContext));
             }
 
             result = fact.createClass().newInstance();
@@ -67,7 +67,7 @@
         return result;
     }
     
-    public static Object createDependentScopedBeanProxy(AbstractBean<?> bean, Object actualInstance)
+    public static Object createDependentScopedBeanProxy(AbstractOwbBean<?> bean, Object actualInstance)
     {
         Object result = null;
         

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansAnnotatedTypeUtil.java Sat Feb 13 09:14:54 2010
@@ -53,8 +53,9 @@
 import javax.interceptor.Interceptor;
 
 import org.apache.webbeans.annotation.DependentScopeLiteral;
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.AbstractInjectionTargetBean;
+import org.apache.webbeans.component.InjectionTargetBean;
 import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.component.ProducerFieldBean;
 import org.apache.webbeans.component.ProducerMethodBean;
@@ -142,7 +143,7 @@
         return result;
     }
     
-    public static <T> void addConstructorInjectionPointMetaData(AbstractBean<T> owner, AnnotatedConstructor<T> constructor)
+    public static <T> void addConstructorInjectionPointMetaData(AbstractOwbBean<T> owner, AnnotatedConstructor<T> constructor)
     {
         List<InjectionPoint> injectionPoints = InjectionPointFactory.getConstructorInjectionPointData(owner, constructor);
         for (InjectionPoint injectionPoint : injectionPoints)
@@ -152,7 +153,7 @@
         }
     }
     
-    public static <T,X> void addMethodInjectionPointMetaData(AbstractBean<T> owner, AnnotatedMethod<X> method)
+    public static <T,X> void addMethodInjectionPointMetaData(InjectionTargetBean<T> owner, AnnotatedMethod<X> method)
     {
         List<InjectionPoint> injectionPoints = InjectionPointFactory.getMethodInjectionPointData(owner, method);
         for (InjectionPoint injectionPoint : injectionPoints)
@@ -162,7 +163,7 @@
         }
     }
     
-    public static <T,X> void addFieldInjectionPointMetaData(AbstractBean<T> owner, AnnotatedField<X> annotField)
+    public static <T,X> void addFieldInjectionPointMetaData(AbstractOwbBean<T> owner, AnnotatedField<X> annotField)
     {
         owner.addInjectionPoint(InjectionPointFactory.getFieldInjectionPointData(owner, annotField));        
     }
@@ -385,7 +386,7 @@
     
     
     @SuppressWarnings("unchecked")
-    public static <X> Set<ProducerFieldBean<?>> defineProducerFields(AbstractBean<X> bean, AnnotatedType<X> annotatedType)
+    public static <X> Set<ProducerFieldBean<?>> defineProducerFields(InjectionTargetBean<X> bean, AnnotatedType<X> annotatedType)
     {
         Set<ProducerFieldBean<?>> producerBeans = new HashSet<ProducerFieldBean<?>>();
         Set<AnnotatedField<? super X>> annotatedFields = annotatedType.getFields();        
@@ -453,7 +454,7 @@
     
     
     @SuppressWarnings("unchecked")
-    public static <X> Set<ProducerMethodBean<?>> defineProducerMethods(AbstractBean<X> bean, AnnotatedType<X> annotatedType)
+    public static <X> Set<ProducerMethodBean<?>> defineProducerMethods(InjectionTargetBean<X> bean, AnnotatedType<X> annotatedType)
     {
         Set<ProducerMethodBean<?>> producerBeans = new HashSet<ProducerMethodBean<?>>();
         Set<AnnotatedMethod<? super X>> annotatedMethods = annotatedType.getMethods();
@@ -529,7 +530,7 @@
     }
     
     
-    public static <X> void configureProducerSpecialization(AbstractBean<X> bean,AnnotatedMethod<X> annotatedMethod)
+    public static <X> void configureProducerSpecialization(AbstractOwbBean<X> bean,AnnotatedMethod<X> annotatedMethod)
     {
         List<AnnotatedParameter<X>> annotatedParameters = annotatedMethod.getParameters();
         List<Class<?>> parameters = new ArrayList<Class<?>>();

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=909778&r1=909777&r2=909778&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 Sat Feb 13 09:14:54 2010
@@ -98,10 +98,10 @@
 import org.apache.webbeans.annotation.DependentScopeLiteral;
 import org.apache.webbeans.annotation.NewLiteral;
 import org.apache.webbeans.annotation.RequestedScopeLiteral;
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.AbstractInjectionTargetBean;
 import org.apache.webbeans.component.AbstractProducerBean;
-import org.apache.webbeans.component.BaseBean;
+import org.apache.webbeans.component.OwbBean;
 import org.apache.webbeans.component.BeanManagerBean;
 import org.apache.webbeans.component.ConversationBean;
 import org.apache.webbeans.component.EnterpriseBeanMarker;
@@ -1394,7 +1394,7 @@
      * @param anns annotation array
      * @return true if array contains the StereoType meta annotation
      */
-    public static boolean isComponentHasStereoType(BaseBean<?> component)
+    public static boolean isComponentHasStereoType(OwbBean<?> component)
     {
         Asserts.assertNotNull(component, "component parameter can not be null");
 
@@ -1414,7 +1414,7 @@
      * @param bean bean instance
      * @return bean stereotypes
      */
-    public static Annotation[] getComponentStereoTypes(BaseBean<?> bean)
+    public static Annotation[] getComponentStereoTypes(OwbBean<?> bean)
     {
         Asserts.assertNotNull(bean, "bean parameter can not be null");
         if (isComponentHasStereoType(bean))
@@ -1434,7 +1434,7 @@
      * @param bean bean instance
      * @return true if name exists
      */
-    public static boolean hasNamedOnStereoTypes(BaseBean<?> bean)
+    public static boolean hasNamedOnStereoTypes(OwbBean<?> bean)
     {
         Annotation[] types = getComponentStereoTypes(bean);
         
@@ -1599,7 +1599,7 @@
             
             for(Bean<?> candidates : resolvers)
             {
-                AbstractBean<?> candidate = (AbstractBean<?>)candidates;
+                AbstractOwbBean<?> candidate = (AbstractOwbBean<?>)candidates;
                 
                 if(!(candidate instanceof NewBean))
                 {
@@ -1613,9 +1613,9 @@
                         
             if (superBean != null)
             {
-                ((AbstractBean<?>)superBean).setEnabled(false);
+                ((AbstractOwbBean<?>)superBean).setEnabled(false);
                                 
-                AbstractBean<?> comp = (AbstractBean<?>)specialized;
+                AbstractOwbBean<?> comp = (AbstractOwbBean<?>)specialized;
 
                 if(superBean.getName() != null)
                 {
@@ -1650,7 +1650,7 @@
         
         while (it.hasNext())
         {
-            AbstractBean<?> bean = (AbstractBean<?>)it.next();
+            AbstractOwbBean<?> bean = (AbstractOwbBean<?>)it.next();
             
             if (bean.getTypes().contains(clazz))
             {
@@ -1711,7 +1711,7 @@
 
     }
 
-    public static void checkNullable(Class<?> type, AbstractBean<?> component)
+    public static void checkNullable(Class<?> type, AbstractOwbBean<?> component)
     {
         Asserts.assertNotNull(type, "type parameter can not be null");
         Asserts.assertNotNull(component, "component parameter can not be null");
@@ -1735,7 +1735,7 @@
      *         parent also has name
      * @throws WebBeansConfigurationException any other exceptions
      */
-    public static void configureProducerSpecialization(AbstractBean<?> component, Method method, Class<?> superClass)
+    public static void configureProducerSpecialization(AbstractOwbBean<?> component, Method method, Class<?> superClass)
     {
         Method superMethod = ClassUtil.getClassMethodWithTypes(superClass, method.getName(), Arrays.asList(method.getParameterTypes()));
         if (superMethod == null)
@@ -1768,7 +1768,7 @@
      * @param method specialized producer method
      * @param superMethod overriden super producer method
      */
-    public static void configuredProducerSpecializedName(AbstractBean<?> component,Method method,Method superMethod)
+    public static void configuredProducerSpecializedName(AbstractOwbBean<?> component,Method method,Method superMethod)
     {
         Asserts.assertNotNull(component,"component parameter can not be null");
         Asserts.assertNotNull(method,"method parameter can not be null");
@@ -1952,7 +1952,7 @@
         return true;
     }
 
-    public static <T> void checkPassivationScope(AbstractBean<T> component, Class<? extends Annotation> scope)
+    public static <T> void checkPassivationScope(AbstractOwbBean<T> component, Class<? extends Annotation> scope)
     {
         Asserts.assertNotNull(component, "component parameter can not be null");
 
@@ -2088,7 +2088,7 @@
         }
     }
     
-    public static boolean isManagedBean(AbstractBean<?> component)
+    public static boolean isManagedBean(AbstractOwbBean<?> component)
     {
         if(component.getWebBeansType().equals(WebBeansType.MANAGED) ||
                 component.getWebBeansType().equals(WebBeansType.INTERCEPTOR) ||
@@ -2100,7 +2100,7 @@
         return false;
     }
     
-    public static boolean isProducerBean(AbstractBean<?> bean)
+    public static boolean isProducerBean(AbstractOwbBean<?> bean)
     {
         if(bean.getWebBeansType().equals(WebBeansType.PRODUCERFIELD) ||
                 bean.getWebBeansType().equals(WebBeansType.PRODUCERMETHOD))
@@ -2116,7 +2116,7 @@
      * @param bean bean instance
      * @return true if bean is an enterprise bean
      */
-    public static boolean isEnterpriseBean(AbstractBean<?> bean)
+    public static boolean isEnterpriseBean(AbstractOwbBean<?> bean)
     {
         Asserts.assertNotNull(bean,"Bean is null");
         
@@ -2348,7 +2348,7 @@
      * Sets bean enabled flag.
      * @param bean bean instance
      */
-    public static void setInjectionTargetBeanEnableFlag(AbstractBean<?> bean)
+    public static void setInjectionTargetBeanEnableFlag(InjectionTargetBean<?> bean)
     {
         Asserts.assertNotNull(bean, "bean can not be null");
         
@@ -2368,7 +2368,7 @@
     }
     
    
-    public static boolean hasInjectionTargetBeanAnnotatedWithAlternative(AbstractBean<?> bean)
+    public static boolean hasInjectionTargetBeanAnnotatedWithAlternative(InjectionTargetBean<?> bean)
     {
         Asserts.assertNotNull(bean, "bean can not be null");
         
@@ -2402,7 +2402,7 @@
         
     }
     
-    public static void setBeanEnableFlagForProducerBean(AbstractBean<?> parent,AbstractProducerBean<?> producer, Annotation[] annotations)
+    public static void setBeanEnableFlagForProducerBean(InjectionTargetBean<?> parent,AbstractProducerBean<?> producer, Annotation[] annotations)
     {
         Asserts.assertNotNull(parent, "parent can not be null");
         Asserts.assertNotNull(producer, "producer can not be null");
@@ -2587,11 +2587,11 @@
     {
         if(contextual instanceof Bean)
         {
-            if(contextual instanceof AbstractBean)
+            if(contextual instanceof AbstractOwbBean)
             {
-                if( ((AbstractBean<?>)contextual).isPassivationCapable())
+                if( ((AbstractOwbBean<?>)contextual).isPassivationCapable())
                 {
-                    return ((AbstractBean<?>)contextual).getId();
+                    return ((AbstractOwbBean<?>)contextual).getId();
                 }
             }
             

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java Sat Feb 13 09:14:54 2010
@@ -45,7 +45,7 @@
 
 import org.apache.webbeans.WebBeansConstants;
 import org.apache.webbeans.annotation.DefaultLiteral;
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.xml.XMLManagedBean;
 import org.apache.webbeans.component.xml.XMLProducerBean;
 import org.apache.webbeans.config.DefinitionUtil;
@@ -906,7 +906,7 @@
      * @param annotationSet type level annotation set
      * @param webBeanDecleration webbeans decleration element
      */
-    public <T> void configureProducerTypeLevelMetaData(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, Element webBeanDecleration)
+    public <T> void configureProducerTypeLevelMetaData(AbstractOwbBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, Element webBeanDecleration)
     {
         configureBindingType(component, annotationSet, annotationElementList);
 
@@ -1389,7 +1389,7 @@
      * @throws DefinitionException if disposes element can not contain exactly
      *             one child element
      */
-    private <T> void checkConfigureDisposes(AbstractBean<T> component, Element disposes)
+    private <T> void checkConfigureDisposes(AbstractOwbBean<T> component, Element disposes)
     {
         List<Element> disposesChilds = disposes.elements();
 
@@ -1411,7 +1411,7 @@
      *             AfterTransactionFailure, BeforeTransactionCompletion}
      *             element.
      */
-    private <T> void checkConfigureObserves(AbstractBean<T> component, Element observes)
+    private <T> void checkConfigureObserves(AbstractOwbBean<T> component, Element observes)
     {
         List<Element> observesChilds = observes.elements();
 
@@ -1438,7 +1438,7 @@
      * @param component xml defined web beans component
      * @param annotationSet all annotation defined in XML
      */
-    private <T> void configureScopeType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
+    private <T> void configureScopeType(AbstractOwbBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
     {
         Class<? extends Annotation> scopeType = XMLDefinitionUtil.defineXMLTypeMetaData(component, annotationSet, NormalScope.class, createConfigurationFailedMessage() + "@Scope/@NormalScope annotation is not configured correctly");
 
@@ -1465,7 +1465,7 @@
      * @param component web beans xml component
      * @param anns annotations defined in the xml documents
      */
-    private <T> void configureBindingType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
+    private <T> void configureBindingType(AbstractOwbBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
     {
         boolean isDefined = XMLDefinitionUtil.defineXMLBindingType(component, annotationSet, annotationElementList, createConfigurationFailedMessage());
 
@@ -1493,7 +1493,7 @@
      * @param component webbeans component
      * @param annotationSet type-level metadata annotation set
      */
-    private <T> void configureStereoType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
+    private <T> void configureStereoType(AbstractOwbBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList)
     {
         XMLDefinitionUtil.defineXMLStereoType(component, annotationSet);
     }
@@ -1505,7 +1505,7 @@
      * @param annotationSet type-level metadata annotation set
      * @param webBeanDecleration webbeans decleration element
      */
-    private <T> void configureNamed(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, Element webBeanDecleration)
+    private <T> void configureNamed(AbstractOwbBean<T> component, List<Class<? extends Annotation>> annotationSet, Element webBeanDecleration)
     {
         boolean isDefined = XMLDefinitionUtil.defineXMLName(component, annotationSet);
         if (isDefined)

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java Sat Feb 13 09:14:54 2010
@@ -37,8 +37,9 @@
 import javax.interceptor.AroundInvoke;
 
 import org.apache.webbeans.WebBeansConstants;
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.AbstractInjectionTargetBean;
+import org.apache.webbeans.component.InjectionTargetBean;
 import org.apache.webbeans.component.xml.XMLManagedBean;
 import org.apache.webbeans.component.xml.XMLProducerBean;
 import org.apache.webbeans.container.InjectionResolver;
@@ -155,7 +156,7 @@
      * @return applicable annotation class for given defineType parameter from
      *         the given set
      */
-    public static <T> Class<? extends Annotation> defineXMLTypeMetaData(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, Class<? extends Annotation> defineType, String errorMessage)
+    public static <T> Class<? extends Annotation> defineXMLTypeMetaData(AbstractOwbBean<T> component, List<Class<? extends Annotation>> annotationSet, Class<? extends Annotation> defineType, String errorMessage)
     {
         // Found annotation for given defineType parameter
         Class<? extends Annotation> metaType = null;
@@ -182,7 +183,7 @@
         return metaType;
     }
 
-    public static <T> boolean defineXMLBindingType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, String errorMessage)
+    public static <T> boolean defineXMLBindingType(AbstractOwbBean<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, String errorMessage)
     {
         Iterator<Class<? extends Annotation>> it = annotationSet.iterator();
         boolean found = false;
@@ -298,7 +299,7 @@
      * @param component webbeans component
      * @param annotationSet set of type-level metadata annotation set
      */
-    public static <T> void defineXMLStereoType(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet)
+    public static <T> void defineXMLStereoType(AbstractOwbBean<T> component, List<Class<? extends Annotation>> annotationSet)
     {
         Iterator<Class<? extends Annotation>> it = annotationSet.iterator();
         while (it.hasNext())
@@ -311,7 +312,7 @@
         }
     }
 
-    public static <T> boolean defineXMLName(AbstractBean<T> component, List<Class<? extends Annotation>> annotationSet)
+    public static <T> boolean defineXMLName(AbstractOwbBean<T> component, List<Class<? extends Annotation>> annotationSet)
     {
         Iterator<Class<? extends Annotation>> it = annotationSet.iterator();
         while (it.hasNext())
@@ -551,7 +552,7 @@
      * @return new xml defines producer method component
      * @see XMLProducerBean
      */
-    private static <T> XMLProducerBean<T> configureProducerMethod(AbstractBean<?> parentComponent, Method producesMethod, List<XMLInjectionPointModel> injectedParameters, Class<T> type, Element arrayElement, Element typeElement, String errorMessage)
+    private static <T> XMLProducerBean<T> configureProducerMethod(InjectionTargetBean<?> parentComponent, Method producesMethod, List<XMLInjectionPointModel> injectedParameters, Class<T> type, Element arrayElement, Element typeElement, String errorMessage)
     {
         /* New producer webbeans component */
         XMLProducerBean<T> producerComponentImpl = new XMLProducerBean<T>(parentComponent, type);
@@ -760,7 +761,7 @@
         }
     }
     
-    public static InjectionPoint getXMLMethodInjectionPoint(AbstractBean<?> component, XMLInjectionPointModel model, Method method)
+    public static InjectionPoint getXMLMethodInjectionPoint(AbstractOwbBean<?> component, XMLInjectionPointModel model, Method method)
     {
         Asserts.assertNotNull(model,"model parameter can not be null");
         Asserts.assertNotNull(method,"method parameter can not be null");

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=909778&r1=909777&r2=909778&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 Sat Feb 13 09:14:54 2010
@@ -35,7 +35,7 @@
 import junit.framework.Assert;
 
 import org.apache.log4j.Logger;
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.AbstractInjectionTargetBean;
 import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.component.WebBeansType;
@@ -319,7 +319,7 @@
             WebBeansDecoratorConfig.configureDecarotors(bean);
             DefinitionUtil.defineBeanInterceptorStack(bean);
 
-            getComponents().add((AbstractBean<?>) bean);
+            getComponents().add((AbstractOwbBean<?>) bean);
             manager.addBean(bean);
             
             GProcessAnnotatedType type = new GProcessAnnotatedType(AnnotatedElementFactory.newAnnotatedType(clazz));
@@ -377,7 +377,7 @@
      * @return XMLComponentImpl<?> with the WebBean definition
      */
     @SuppressWarnings("unchecked")
-    protected AbstractBean<?> getWebBeanFromXml(String xmlResourcePath, Class<?> desiredClazz, Annotation... bindings)
+    protected AbstractOwbBean<?> getWebBeanFromXml(String xmlResourcePath, Class<?> desiredClazz, Annotation... bindings)
     {
         InputStream stream = XMLTest.class.getClassLoader().getResourceAsStream(xmlResourcePath);
         Assert.assertNotNull(stream);
@@ -394,7 +394,7 @@
         Set<Bean<?>> beans = getManager().getBeans(desiredClazz, bindings);
         if (beans != null && beans.size() == 1)
         {
-            return (AbstractBean<?>) beans.iterator().next();
+            return (AbstractOwbBean<?>) beans.iterator().next();
         }
         return null;
     }
@@ -406,7 +406,7 @@
      * @return the new interceptor
      */
     @SuppressWarnings("unchecked")
-    protected <T> AbstractBean<T> defineInterceptor(Class<T> clazz)
+    protected <T> AbstractOwbBean<T> defineInterceptor(Class<T> clazz)
     {
         ManagedBean<T> component = null;
 
@@ -429,7 +429,7 @@
      * @return the new decorator
      */
     @SuppressWarnings("unchecked")
-    protected <T> AbstractBean<T> defineDecorator(Class<T> clazz)
+    protected <T> AbstractOwbBean<T> defineDecorator(Class<T> clazz)
     {
         ManagedBean<T> component = null;
 
@@ -462,7 +462,7 @@
      * @param i ith component in the {@link MockManager}
      * @return the ith component in the list
      */
-    protected AbstractBean<?> getComponent(int i)
+    protected AbstractOwbBean<?> getComponent(int i)
     {
         return manager.getComponent(i);
     }
@@ -472,7 +472,7 @@
      * 
      * @return all components
      */
-    protected List<AbstractBean<?>> getComponents()
+    protected List<AbstractOwbBean<?>> getComponents()
     {
         return manager.getComponents();
     }

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java Sat Feb 13 09:14:54 2010
@@ -36,7 +36,7 @@
 import javax.enterprise.inject.spi.ObserverMethod;
 import javax.enterprise.util.TypeLiteral;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.config.WebBeansFinder;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.util.WebBeansUtil;
@@ -45,7 +45,7 @@
 {
     private BeanManagerImpl manager = null;
 
-    private List<AbstractBean<?>> componentList = new ArrayList<AbstractBean<?>>();
+    private List<AbstractOwbBean<?>> componentList = new ArrayList<AbstractOwbBean<?>>();
 
     public MockManager()
     {
@@ -64,12 +64,12 @@
         this.manager = BeanManagerImpl.getManager();        
     }
 
-    public List<AbstractBean<?>> getComponents()
+    public List<AbstractOwbBean<?>> getComponents()
     {
         return componentList;
     }
 
-    public AbstractBean<?> getComponent(int i)
+    public AbstractOwbBean<?> getComponent(int i)
     {
         return componentList.get(i);
     }

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/AnyBindingTest.java Sat Feb 13 09:14:54 2010
@@ -17,7 +17,7 @@
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.binding.AnyBindingComponent;
 import org.apache.webbeans.test.component.binding.DefaultAnyBinding;
@@ -41,18 +41,18 @@
 	@Test
 	public void testAny()
 	{
-		AbstractBean<AnyBindingComponent> comp1 = defineManagedBean(AnyBindingComponent.class);
+		AbstractOwbBean<AnyBindingComponent> comp1 = defineManagedBean(AnyBindingComponent.class);
 		Set<Annotation> qualifiers = comp1.getQualifiers();
 		
 		Assert.assertEquals(2, qualifiers.size());
 		
-		AbstractBean<NonAnyBindingComponent> comp2 = defineManagedBean(NonAnyBindingComponent.class);
+		AbstractOwbBean<NonAnyBindingComponent> comp2 = defineManagedBean(NonAnyBindingComponent.class);
 		qualifiers = comp2.getQualifiers();
 		
 		Assert.assertEquals(4, qualifiers.size());
 		
 
-		AbstractBean<DefaultAnyBinding> comp3 = defineManagedBean(DefaultAnyBinding.class);
+		AbstractOwbBean<DefaultAnyBinding> comp3 = defineManagedBean(DefaultAnyBinding.class);
 		qualifiers = comp3.getQualifiers();
 		
 		Assert.assertEquals(2, qualifiers.size());

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java Sat Feb 13 09:14:54 2010
@@ -26,7 +26,7 @@
 import junit.framework.Assert;
 
 import org.apache.webbeans.annotation.DefaultLiteral;
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.annotation.binding.Binding1Literal;
@@ -75,7 +75,7 @@
         
         defineManagedBean(CheckWithCheckPayment.class);
         defineDecorator(ServiceDecorator.class);
-        AbstractBean<ServiceImpl1> component = defineManagedBean(ServiceImpl1.class);
+        AbstractOwbBean<ServiceImpl1> component = defineManagedBean(ServiceImpl1.class);
 
         ContextFactory.initRequestContext(null);
         ContextFactory.initApplicationContext(null);
@@ -102,7 +102,7 @@
         initializeDecoratorType(LargeTransactionDecorator.class);
         
         defineDecorator(LargeTransactionDecorator.class);
-        AbstractBean<AccountComponent> component = defineManagedBean(AccountComponent.class);
+        AbstractOwbBean<AccountComponent> component = defineManagedBean(AccountComponent.class);
 
         ContextFactory.initRequestContext(null);
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java Sat Feb 13 09:14:54 2010
@@ -17,7 +17,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.dependent.DependentComponent;
@@ -49,7 +49,7 @@
 
         ContextFactory.initRequestContext(null);
 
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         Assert.assertEquals(2, comps.size());
 
@@ -69,8 +69,8 @@
         
         ContextFactory.initRequestContext(null);
 
-        AbstractBean<DependentA> componentA = defineManagedBean(DependentA.class);
-        AbstractBean<DependentB> componentB = defineManagedBean(DependentB.class);
+        AbstractOwbBean<DependentA> componentA = defineManagedBean(DependentA.class);
+        AbstractOwbBean<DependentB> componentB = defineManagedBean(DependentB.class);
         
         Assert.assertNotNull(componentB);
         

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java Sat Feb 13 09:14:54 2010
@@ -23,7 +23,7 @@
 import junit.framework.Assert;
 
 import org.apache.webbeans.annotation.AnyLiteral;
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.annotation.binding.Check;
@@ -58,7 +58,7 @@
     {
         clear();
 
-        AbstractBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
+        AbstractOwbBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
         ContextFactory.initRequestContext(null);
 
         LoggedInEvent event = new LoggedInEvent("Gurkan");
@@ -80,8 +80,8 @@
         
         getManager().addBean(WebBeansUtil.getEventBean());
 
-        AbstractBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
-        AbstractBean<ComponentWithObservable1> componentObservable = defineManagedBean(ComponentWithObservable1.class);
+        AbstractOwbBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
+        AbstractOwbBean<ComponentWithObservable1> componentObservable = defineManagedBean(ComponentWithObservable1.class);
 
         ContextFactory.initRequestContext(null);
 
@@ -100,7 +100,7 @@
 
         getManager().addBean(WebBeansUtil.getEventBean());
         
-        AbstractBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
+        AbstractOwbBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
         ContextFactory.initRequestContext(null);
 
         LoggedInEvent event = new LoggedInEvent("Gurkan");
@@ -134,7 +134,7 @@
 
         getManager().addBean(WebBeansUtil.getEventBean());
         
-        AbstractBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
+        AbstractOwbBean<ComponentWithObserves1> component = defineManagedBean(ComponentWithObserves1.class);
         ContextFactory.initRequestContext(null);
 
         LoggedInEvent event = new LoggedInEvent("Mark");
@@ -160,7 +160,7 @@
         defineManagedBean(CheckWithCheckPayment.class);
         defineManagedBean(CheckWithMoneyPayment.class);
         defineManagedBean(PaymentProcessorComponent.class);
-        AbstractBean<ComponentWithObserves2> component = defineManagedBean(ComponentWithObserves2.class);
+        AbstractOwbBean<ComponentWithObserves2> component = defineManagedBean(ComponentWithObserves2.class);
         ContextFactory.initRequestContext(null);
 
         LoggedInEvent event = new LoggedInEvent("USER");

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java Sat Feb 13 09:14:54 2010
@@ -18,7 +18,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.AbstractInjectionTargetBean;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.intercept.ejb.EJBInterceptorConfig;
@@ -82,7 +82,7 @@
         try
         {
             clear();
-            defineManagedBean(AbstractBean.class);
+            defineManagedBean(AbstractOwbBean.class);
         }
         catch (WebBeansConfigurationException e)
         {

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inheritance/InheritanceTest.java Sat Feb 13 09:14:54 2010
@@ -21,7 +21,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.config.inheritance.BeanInheritedMetaData;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.inheritance.InheritFromParentComponent;
@@ -48,7 +48,7 @@
     @Test
     public void testInheritedComponentMetaData()
     {
-        AbstractBean<InheritFromParentComponent> component = defineManagedBean(InheritFromParentComponent.class);
+        AbstractOwbBean<InheritFromParentComponent> component = defineManagedBean(InheritFromParentComponent.class);
         
         BeanInheritedMetaData<InheritFromParentComponent> data = new BeanInheritedMetaData<InheritFromParentComponent>(component);
         

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/CurrentInjectedComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/CurrentInjectedComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/CurrentInjectedComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/CurrentInjectedComponentTest.java Sat Feb 13 09:14:54 2010
@@ -19,7 +19,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.ContaintsCurrentComponent;
@@ -51,7 +51,7 @@
         defineManagedBean(Typed2.class);
         defineManagedBean(CurrentBindingComponent.class);
         defineManagedBean(ContaintsCurrentComponent.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         HttpSession session = getSession();
         ContextFactory.initRequestContext(null);

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/DisposalInjectedComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/DisposalInjectedComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/DisposalInjectedComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/DisposalInjectedComponentTest.java Sat Feb 13 09:14:54 2010
@@ -19,7 +19,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
@@ -53,7 +53,7 @@
         defineManagedBean(ServiceImpl1.class);
         defineManagedBean(DisposalMethodComponent.class);
 
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
         ContextFactory.initApplicationContext(null);

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTest.java Sat Feb 13 09:14:54 2010
@@ -17,7 +17,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.service.InjectedComponent;
@@ -46,7 +46,7 @@
 
         defineManagedBean(InjectedComponent.class);
         defineManagedBean(ServiceImpl1.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
         ContextFactory.initApplicationContext(null);

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTestWithMember.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTestWithMember.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTestWithMember.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTestWithMember.java Sat Feb 13 09:14:54 2010
@@ -20,7 +20,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
@@ -51,7 +51,7 @@
         clear();
         defineManagedBean(BindingComponent.class);
         defineManagedBean(NonBindingComponent.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         HttpSession session = getSession();
         ContextFactory.initSessionContext(session);

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/PaymentProcessorComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/PaymentProcessorComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/PaymentProcessorComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/PaymentProcessorComponentTest.java Sat Feb 13 09:14:54 2010
@@ -19,7 +19,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.CheckWithCheckPayment;
@@ -53,7 +53,7 @@
         defineManagedBean(CheckWithMoneyPayment.class);
         defineManagedBean(PaymentProcessorComponent.class);
 
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedComponentTest.java Sat Feb 13 09:14:54 2010
@@ -23,7 +23,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.service.ITyped;
 import org.apache.webbeans.test.component.service.TypedComponent;
@@ -51,7 +51,7 @@
     {
         clear();
         defineManagedBean(TypedComponent.class);
-        List<AbstractBean<?>> list = getComponents();
+        List<AbstractOwbBean<?>> list = getComponents();
 
         @SuppressWarnings("unused")
         Set<Bean<?>> beans= getManager().resolveByType(TypedComponentTest.class.getDeclaredField("s").getType(), new Default()

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedInjectedComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedInjectedComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedInjectedComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedInjectedComponentTest.java Sat Feb 13 09:14:54 2010
@@ -20,7 +20,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
@@ -54,7 +54,7 @@
 
         defineManagedBean(Typed2.class);
         defineManagedBean(TypedInjection.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         HttpSession session = getSession();
 
@@ -89,7 +89,7 @@
 
         defineManagedBean(Typed2.class);
         defineManagedBean(TypedInjectionWithoutArguments.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         HttpSession session = getSession();
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/UserComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/UserComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/UserComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/UserComponentTest.java Sat Feb 13 09:14:54 2010
@@ -20,7 +20,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
@@ -52,7 +52,7 @@
 
         defineManagedBean(UserComponent.class);
         defineManagedBean(ContainUserComponent.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         HttpSession session = getSession();
         ContextFactory.initRequestContext(null);

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/generic/GenericBeanTest.java Sat Feb 13 09:14:54 2010
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.test.unittests.inject.generic;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.inject.generic.GenericComponent;
 import org.apache.webbeans.test.component.inject.generic.GenericComponentInjector;
@@ -39,7 +39,7 @@
     public void testGenericBeanInjection()
     {
         defineManagedBean(GenericComponent.class);
-        AbstractBean<GenericComponentInjector> bean2 = defineManagedBean(GenericComponentInjector.class);
+        AbstractOwbBean<GenericComponentInjector> bean2 = defineManagedBean(GenericComponentInjector.class);
         
         GenericComponentInjector<?> instance = getManager().getInstance(bean2);
         Assert.assertNotNull(instance.getInjection1());

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java Sat Feb 13 09:14:54 2010
@@ -19,7 +19,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.intercept.InterceptedComponent;
@@ -62,7 +62,7 @@
         defineManagedBean(InterceptedComponent.class);
 
         ContextFactory.initRequestContext(null);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         Object object = getManager().getInstance(comps.get(0));
 
@@ -83,7 +83,7 @@
         defineManagedBean(MultipleInterceptedComponent.class);
 
         ContextFactory.initRequestContext(null);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         Object object = getManager().getInstance(comps.get(0));
 
@@ -108,7 +108,7 @@
         defineManagedBean(InterceptorWithSuperClassInterceptedComponent.class);
 
         ContextFactory.initRequestContext(null);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         Object object = getManager().getInstance(comps.get(0));
 
@@ -133,7 +133,7 @@
         defineManagedBean(MultipleListOfInterceptedComponent.class);
 
         ContextFactory.initRequestContext(null);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         Object object = getManager().getInstance(comps.get(0));
 
@@ -156,7 +156,7 @@
         defineManagedBean(MultipleListOfInterceptedWithExcludeClassComponent.class);
 
         ContextFactory.initRequestContext(null);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         Object object = getManager().getInstance(comps.get(0));
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java Sat Feb 13 09:14:54 2010
@@ -15,7 +15,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.AbstractInjectionTargetBean;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.intercept.ejb.EJBInterceptorConfig;

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructComponentTest.java Sat Feb 13 09:14:54 2010
@@ -19,7 +19,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.intercept.InterceptorData;
@@ -52,7 +52,7 @@
 
         defineManagedBean(CheckWithCheckPayment.class);
         defineManagedBean(PostConstructComponent.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java Sat Feb 13 09:14:54 2010
@@ -17,7 +17,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.intercept.InterceptorData;
@@ -49,7 +49,7 @@
 
         defineManagedBean(CheckWithCheckPayment.class);
         defineManagedBean(PostConstructDoubleInterceptorComponent.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java Sat Feb 13 09:14:54 2010
@@ -17,7 +17,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.intercept.InterceptorData;
@@ -48,7 +48,7 @@
 
         defineManagedBean(CheckWithCheckPayment.class);
         defineManagedBean(PostConstructInterceptorComponent.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PreDestroyComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PreDestroyComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PreDestroyComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PreDestroyComponentTest.java Sat Feb 13 09:14:54 2010
@@ -19,7 +19,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ContextFactory;
@@ -54,7 +54,7 @@
 
         defineManagedBean(CheckWithCheckPayment.class);
         defineManagedBean(PreDestroyComponent.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureInterceptorComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureInterceptorComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureInterceptorComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureInterceptorComponentTest.java Sat Feb 13 09:14:54 2010
@@ -15,7 +15,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.intercept.webbeans.SecureComponent;
@@ -41,7 +41,7 @@
     public void testSecureInterceptor()
     {
         defineInterceptor(SecureInterceptor.class);
-        AbstractBean<SecureComponent> component = defineManagedBean(SecureComponent.class);
+        AbstractOwbBean<SecureComponent> component = defineManagedBean(SecureComponent.class);
 
         ContextFactory.initRequestContext(null);
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java Sat Feb 13 09:14:54 2010
@@ -19,7 +19,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.test.TestContext;
@@ -87,7 +87,7 @@
         defineManagedBean(WInterceptorComponent.class);
 
         ContextFactory.initRequestContext(null);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         Object object = getManager().getInstance(comps.get(0));
 
@@ -111,7 +111,7 @@
         defineManagedBean(WMetaInterceptorComponent.class);
 
         ContextFactory.initRequestContext(null);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         Object object = getManager().getInstance(comps.get(0));
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/library/LibraryComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/library/LibraryComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/library/LibraryComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/library/LibraryComponentTest.java Sat Feb 13 09:14:54 2010
@@ -17,7 +17,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.library.Book;
@@ -45,13 +45,13 @@
         clear();
 
         defineManagedBean(BookShop.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 
         Assert.assertEquals(1, comps.size());
 
-        AbstractBean<?> obj = comps.get(0);
+        AbstractOwbBean<?> obj = comps.get(0);
 
         Object instance = getManager().getInstance(obj);
         Assert.assertTrue(instance instanceof Shop);

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/newcomp/NewComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/newcomp/NewComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/newcomp/NewComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/newcomp/NewComponentTest.java Sat Feb 13 09:14:54 2010
@@ -17,7 +17,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.CheckWithCheckPayment;
@@ -54,7 +54,7 @@
 
         ContextFactory.initRequestContext(null);
 
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         Assert.assertEquals(3, comps.size());
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/Producer1ConsumerComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/Producer1ConsumerComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/Producer1ConsumerComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/Producer1ConsumerComponentTest.java Sat Feb 13 09:14:54 2010
@@ -19,7 +19,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
@@ -55,7 +55,7 @@
         defineManagedBean(Producer1.class);
         defineManagedBean(Producer1ConsumerComponent.class);
 
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
         ContextFactory.initApplicationContext(null);

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java Sat Feb 13 09:14:54 2010
@@ -21,7 +21,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.lifecycle.test.MockHttpSession;
 import org.apache.webbeans.test.TestContext;
@@ -117,7 +117,7 @@
     public void testProducer4()
     {
         defineManagedBean(Producer4.class);
-        AbstractBean<Producer4ConsumerComponent> component = defineManagedBean(Producer4ConsumerComponent.class);
+        AbstractOwbBean<Producer4ConsumerComponent> component = defineManagedBean(Producer4ConsumerComponent.class);
 
         ContextFactory.initSessionContext(new MockHttpSession());
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/ScopeAdapterTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/ScopeAdapterTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/ScopeAdapterTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/ScopeAdapterTest.java Sat Feb 13 09:14:54 2010
@@ -19,7 +19,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.component.CheckWithCheckPayment;
@@ -56,7 +56,7 @@
         ContextFactory.initSessionContext(session);
         ContextFactory.initApplicationContext(null);
 
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         Assert.assertEquals(7, getDeployedComponents());
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/SingletonComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/SingletonComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/SingletonComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/SingletonComponentTest.java Sat Feb 13 09:14:54 2010
@@ -20,7 +20,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
@@ -54,7 +54,7 @@
 
         defineManagedBean(Typed2.class);
         defineManagedBean(Singleton.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         HttpSession session = getSession();
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java Sat Feb 13 09:14:54 2010
@@ -23,7 +23,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.test.TestContext;
@@ -53,7 +53,7 @@
 
         defineManagedBean(TypeLiteralComponent.class);
         defineManagedBean(InjectedTypeLiteralComponent.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 
@@ -76,7 +76,7 @@
         clear();
 
         defineManagedBean(TypeLiteralComponent.class);
-        List<AbstractBean<?>> comps = getComponents();
+        List<AbstractOwbBean<?>> comps = getComponents();
 
         ContextFactory.initRequestContext(null);
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java?rev=909778&r1=909777&r2=909778&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java Sat Feb 13 09:14:54 2010
@@ -15,7 +15,7 @@
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.xml.XMLManagedBean;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.context.creational.CreationalContextFactory;
@@ -147,7 +147,7 @@
 
         ContextFactory.initRequestContext(null);
 
-        AbstractBean<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanConstructor2.xml", TstBeanConstructor.class);
+        AbstractOwbBean<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanConstructor2.xml", TstBeanConstructor.class);
 
         Object instance = compDef.create(CreationalContextFactory.getInstance().getCreationalContext(compDef));
         Assert.assertNotNull(instance);



Mime
View raw message