You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2010/01/10 23:47:30 UTC

svn commit: r897727 - in /openwebbeans/trunk: ./ webbeans-impl/src/main/java/org/apache/webbeans/component/ webbeans-impl/src/main/java/org/apache/webbeans/config/ webbeans-impl/src/main/java/org/apache/webbeans/event/ webbeans-impl/src/main/java/org/a...

Author: gerdogdu
Date: Sun Jan 10 22:47:29 2010
New Revision: 897727

URL: http://svn.apache.org/viewvc?rev=897727&view=rev
Log:
[OWB-223] Work on (Section 3.1 - Managed beans) of coverege-cdi.html of RI TCK 

Modified:
    openwebbeans/trunk/TCK-STANDALONE
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.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/unittests/exception/ExceptionComponentTest.java

Modified: openwebbeans/trunk/TCK-STANDALONE
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/TCK-STANDALONE?rev=897727&r1=897726&r2=897727&view=diff
==============================================================================
--- openwebbeans/trunk/TCK-STANDALONE (original)
+++ openwebbeans/trunk/TCK-STANDALONE Sun Jan 10 22:47:29 2010
@@ -89,7 +89,7 @@
 Section 3.1.2 - Bean types of a managed bean(PASSED)
 Section 3.1.3 - Declaring a managed bean (PASSED)
 Section 3.1.4 - Specializing a managed bean (PASSED with followings)
-  # ITEM ac) FAILED
+  # ITEM ac) FAILED (Error in TCK, http://jira.jboss.org/jira/browse/CDITCK-91)
   # ITEM dc) This is an INTEGRATION TEST
 Section 3.1.5 - Default name for a managed bean (PASSED)
 Section 3.2 - Session Beans (INTEGRATION TEST)
@@ -114,4 +114,16 @@
 Section 3.4.3 - Default name for a producer field (PASSED)
 Section 3.5 - Resources (INTEGRATION TEST) 
 Section 3.6 - Additional Builtin Beans (INTEGRATION TEST)
-
+Section 3.7 - Bean constructors (PASSED)
+Section 3.7.1 - Declaring a bean constructor (PASSED with followings)
+  # ITEM ab) This is an INTEGRATION TEST
+  # ITEM f) Failed
+  # ITEM g) SimpleBeanLifecycleTest.testInjectionOfParametersIntoBeanConstructor() 
+Section 3.8 - Injected fields (PASSED)
+Section 3.9 - Initializer methods (PASSED with following)
+  # ITEM e) This is an INTEGRATION TEST
+Section 3.9.1 - Declaring an initializer method (PASSED with following)
+  # ITEM f) EnterpriseBeanLifecycleTest.testInitializerMethodsCalledWithCurrentParameterValues() INTEGRATION TEST
+Section 3.10 - The default qualifier at injection points (PASSED)
+Section 3.11 - The qualifier @Named at injection points (PASSED)
+Section 3.12 - @New qualified beans (PASSED)

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java?rev=897727&r1=897726&r2=897727&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java Sun Jan 10 22:47:29 2010
@@ -193,12 +193,12 @@
     public void destroy(T instance, CreationalContext<T> creationalContext)
     {
         try
-        {
-            //Destory dependent instances
-            creationalContext.release();
-            
+        {            
             //Destroy instance, call @PreDestroy
             destroyInstance(instance,creationalContext);
+            
+            //Destory dependent instances
+            creationalContext.release();
                         
             //Reset it
             this.dependentOwnerInjectionPoint = null;  

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=897727&r1=897726&r2=897727&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java Sun Jan 10 22:47:29 2010
@@ -127,12 +127,11 @@
 
         T instance = createComponentInstance(creationalContext);
         
-        //Push instance into the creational context
-        if(WebBeansUtil.isScopeTypeNormal(getScope()))
+        if(creationalContext != null)
         {
-            creationalContext.push(instance);
+            creationalContext.push(instance);   
         }
-
+        
         afterConstructor(instance, creationalContext);
         
         if(creationalContext instanceof CreationalContextImpl)

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=897727&r1=897726&r2=897727&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 Sun Jan 10 22:47:29 2010
@@ -657,14 +657,13 @@
             
             managedBeanCreator.defineSerializable();
 
+            //Define meta-data
+            managedBeanCreator.defineStereoTypes();
+
             //Scope type
             managedBeanCreator.defineScopeType(logger.getTokenString(OWBLogConst.TEXT_MB_IMPL) + clazz.getName() + logger.getTokenString(OWBLogConst.TEXT_SAME_SCOPE));
             managedBeanCreator.checkCreateConditions();
-            
-            
-            //Define meta-data
-            managedBeanCreator.defineStereoTypes();
-            
+                                    
             //Check for Enabled via Alternative
             WebBeansUtil.setBeanEnableFlag(managedBean);
             

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=897727&r1=897726&r2=897727&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Sun Jan 10 22:47:29 2010
@@ -34,6 +34,7 @@
 import javax.enterprise.event.Reception;
 import javax.enterprise.event.TransactionPhase;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.ObserverMethod;
 
 import org.apache.webbeans.annotation.DefaultLiteral;
@@ -43,6 +44,7 @@
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.container.InjectionResolver;
 import org.apache.webbeans.exception.WebBeansException;
+import org.apache.webbeans.inject.impl.InjectionPointFactory;
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.util.AnnotationUtil;
 import org.apache.webbeans.util.WebBeansUtil;
@@ -269,7 +271,9 @@
 
                     if (bindingTypes.length > 0)
                     {
-                        Bean<?> bean = InjectionResolver.getInstance().implResolveByType(type, bindingTypes).iterator().next();
+                        InjectionPoint point = InjectionPointFactory.getPartialInjectionPoint(null, type, null, null, bindingTypes);
+                        Bean<?> bean = InjectionResolver.getInstance().getInjectionPointBean(point);
+                        
                         list.add(manager.getInstance(bean, manager.createCreationalContext(bean)));
                     }
                     else

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=897727&r1=897726&r2=897727&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 Sun Jan 10 22:47:29 2010
@@ -351,41 +351,33 @@
             }
         }
         
-        if (result != null)
+        if (result == null)
         {
-            Annotation[][] parameterAnns = result.getParameterAnnotations();
-            for (Annotation[] parameters : parameterAnns)
+            result = ClassUtil.isContaintNoArgConstructor(clazz);
+            
+            if(result == null)
             {
-                for (Annotation param : parameters)
-                {
-                    Annotation btype = param.annotationType().getAnnotation(Disposes.class);
-                    if (btype != null)
-                    {
-                        throw new WebBeansConfigurationException("Constructor parameter qualifier annotation can not be @Disposes annotation in class " + clazz.getName());
-                    }
-                    else
-                    {
-                        btype = param.annotationType().getAnnotation(Observes.class);
-                        if (btype != null)
-                        {
-                            throw new WebBeansConfigurationException("Constructor parameter qualifier annotation can not be @Observes annotation in class " + clazz.getName());
-                        }
-                    }
-                }
-
+                throw new WebBeansConfigurationException("No constructor is found for the class : " + clazz.getName());
             }
         }
-
-        if (result == null)
+        
+        
+        Annotation[][] parameterAnns = result.getParameterAnnotations();
+        for (Annotation[] parameters : parameterAnns)
         {
-            if ((result = ClassUtil.isContaintNoArgConstructor(clazz)) != null)
+            for (Annotation param : parameters)
             {
-                return result;
-            }
-            else
-            {
-                throw new WebBeansConfigurationException("No constructor is found for the class : " + clazz.getName());
+                if (param.annotationType().equals(Disposes.class))
+                {
+                    throw new WebBeansConfigurationException("Constructor parameter annotations can not contain @Disposes annotation in class : " + clazz.getName());
+                }
+                
+                if(param.annotationType().equals(Observes.class))
+                {
+                    throw new WebBeansConfigurationException("Constructor parameter annotations can not contain @Observes annotation in class : " + clazz.getName());
+                }
             }
+
         }
 
         return result;        
@@ -481,10 +473,10 @@
                     throw new WebBeansConfigurationException("@New binding annotation can not have any binding annotation in class : " + clazz.getName() + " in field/method : " + name);
                 }
 
-                if (ClassUtil.isAbstract(ClassUtil.getClass(type).getModifiers()) || ClassUtil.isInterface(ClassUtil.getClass(type).getModifiers()))
-                {
-                    throw new WebBeansConfigurationException("@New binding annotation field can not have interface or abstract type in class : " + clazz.getName() + " in field/method : " + name);
-                }
+//                if (ClassUtil.isAbstract(ClassUtil.getClass(type).getModifiers()) || ClassUtil.isInterface(ClassUtil.getClass(type).getModifiers()))
+//                {
+//                    throw new WebBeansConfigurationException("@New binding annotation field can not have interface or abstract type in class : " + clazz.getName() + " in field/method : " + name);
+//                }
             }
         }
         

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=897727&r1=897726&r2=897727&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 Sun Jan 10 22:47:29 2010
@@ -183,17 +183,7 @@
     @Test
     public void testNewInterface()
     {
-        try
-        {
-            clear();
-            defineManagedBean(NewComponentInterfaceComponent.class);
-        }
-        catch (WebBeansConfigurationException e)
-        {
-            System.out.println("got expected exception: " + e.getMessage());
-            return; // all ok!
-        }
-        Assert.fail("expecting an exception!");
+        Assert.assertTrue(true); //No more exist
     }
 
     @Test
@@ -215,21 +205,7 @@
     @Test
     public void testNewMethod()
     {
-        WebBeansConfigurationException exc = null;
-        try
-        {
-            clear();
-            defineManagedBean(NewMethodComponentBindingComponent.class);
-
-        }
-        catch (WebBeansConfigurationException e)
-        {
-            System.out.println(e.getMessage());
-            exc = e;
-        }
-
-        Assert.assertNotNull(exc);
-
+        Assert.assertTrue(true); //No more test in spec
     }
 
     @Test