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 2009/10/11 15:56:29 UTC

svn commit: r824077 - /incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java

Author: gerdogdu
Date: Sun Oct 11 13:56:29 2009
New Revision: 824077

URL: http://svn.apache.org/viewvc?rev=824077&view=rev
Log:
Update because of handling @DeploymentType.

Modified:
    incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java

Modified: incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java?rev=824077&r1=824076&r2=824077&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java (original)
+++ incubator/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/util/EjbUtility.java Sun Oct 11 13:56:29 2009
@@ -33,6 +33,7 @@
 import org.apache.webbeans.component.ProducerFieldBean;
 import org.apache.webbeans.component.ProducerMethodBean;
 import org.apache.webbeans.component.creation.BeanCreator.MetaDataProvider;
+import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.ejb.component.EjbBean;
 import org.apache.webbeans.ejb.component.creation.EjbBeanCreatorImpl;
@@ -146,8 +147,18 @@
             ejbBean.setInjectionTarget(ejbBeanCreator.getInjectedTarget());   
         }
         
-        // Check if the deployment type is enabled.
-        if (WebBeansUtil.isDeploymentTypeEnabled(deploymentType))
+        boolean addBeans = true;        
+        boolean useAlternative = OpenWebBeansConfiguration.getInstance().useAlternativeOrDeploymentType();
+        
+        if(!useAlternative)
+        {
+            if (!WebBeansUtil.isDeploymentTypeEnabled(deploymentType))
+            {
+                addBeans = false;
+            }
+        }
+        
+        if (addBeans)
         {                                
             BeanManagerImpl.getManager().addBean(ejbBean);
             BeanManagerImpl.getManager().getBeans().addAll(producerMethodBeans);