svn commit: r1432228 - in /openwebbeans/trunk: webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java

[st...@apache.org]

Author: struberg
Date: Fri Jan 11 18:58:39 2013
New Revision: 1432228

URL: http://svn.apache.org/viewvc?rev=1432228&view=rev
Log:
OWB-753 remove left overs from lazy bean handling


Modified:
    openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java

Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java?rev=1432228&r1=1432227&r2=1432228&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java Fri Jan 11 18:58:39 2013
@@ -49,8 +49,7 @@ public class EjbBeanBuilder<T> extends A
         EjbValidator.validateDecoratorOrInterceptor(getBeanType());
     }
 
-    @Override
-    public void defineScopeType(String errorMessage, boolean allowLazyInit)
+    public void defineScopeType(String errorMessage)
     {
         super.defineScopeType(errorMessage);
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java?rev=1432228&r1=1432227&r2=1432228&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanBuilder.java Fri Jan 11 18:58:39 2013
@@ -287,14 +287,6 @@ public abstract class AbstractBeanBuilde
 
     public void defineScopeType(String errorMessage)
     {
-        defineScopeType(errorMessage, false);
-    }
-
-    /**
-     * @deprecated as we need to get rid of allowLazyInit
-     */
-    public void defineScopeType(String errorMessage, boolean allowLazyInit)
-    {
         Annotation[] annotations = AnnotationUtil.asArray(annotated.getAnnotations());
         boolean found = false;
 
@@ -363,12 +355,12 @@ public abstract class AbstractBeanBuilde
 
         if (!found)
         {
-            defineDefaultScopeType(errorMessage, allowLazyInit);
+            defineDefaultScopeType(errorMessage);
         }
     }
 
 
-    private void defineDefaultScopeType(String exceptionMessage, boolean allowLazyInit)
+    private void defineDefaultScopeType(String exceptionMessage)
     {
         scope = defineInheritedScope();
         
@@ -428,40 +420,6 @@ public abstract class AbstractBeanBuilde
     }
 
     /**
-     * TODO this should get improved.
-     * It might be enough to check for instanceof Produces and Decorates
-     *
-     *
-     * Check if the bean uses CDI features
-     * @param cls the Class to check
-     * @return <code>false</code> if the bean uses CDI annotations which define other beans somewhere
-     */
-    private boolean isPurePojoBean(WebBeansContext webBeansContext, Class<?> cls)
-    {
-        Class<?> superClass = cls.getSuperclass();
-
-        if ( superClass == Object.class || !isPurePojoBean(webBeansContext, superClass))
-        {
-            return false;
-        }
-
-        Set<String> annotations = webBeansContext.getScannerService().getAllAnnotations(cls.getSimpleName());
-        if (annotations != null)
-        {
-            for (String ann : annotations)
-            {
-                if (ann.startsWith("javax.inject") || ann.startsWith("javax.enterprise") || ann.startsWith("javax.interceptors"))
-                {
-                    return false;
-                }
-            }
-
-        }
-
-        return true;
-    }
-
-    /**
      * Checks the unproxiable condition.
      * @throws WebBeansConfigurationException if bean is not proxied by the container
      */