[webbeans-commits] Webbeans SVN: r3700 - ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bootstrap.

[webbeans-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2009-09-17 14:34:45 -0400 (Thu, 17 Sep 2009)
New Revision: 3700

Modified:
   ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
   ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployment.java
Log:
Drive the addition of built in beans from BeanDeployment as was the case before

Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java	2009-09-17 17:28:48 UTC (rev 3699)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java	2009-09-17 18:34:45 UTC (rev 3700)
@@ -28,14 +28,6 @@
 import org.jboss.webbeans.Container;
 import org.jboss.webbeans.bean.DecoratorImpl;
 import org.jboss.webbeans.bean.builtin.AbstractBuiltInBean;
-import org.jboss.webbeans.bean.builtin.DefaultValidatorBean;
-import org.jboss.webbeans.bean.builtin.DefaultValidatorFactoryBean;
-import org.jboss.webbeans.bean.builtin.InjectionPointBean;
-import org.jboss.webbeans.bean.builtin.ManagerBean;
-import org.jboss.webbeans.bean.builtin.PrincipalBean;
-import org.jboss.webbeans.bean.builtin.UserTransactionBean;
-import org.jboss.webbeans.bean.builtin.facade.EventBean;
-import org.jboss.webbeans.bean.builtin.facade.InstanceBean;
 import org.jboss.webbeans.builder.sorter.DecoratorDeploymentItem;
 import org.jboss.webbeans.builder.sorter.DeploymentItem;
 import org.jboss.webbeans.builder.sorter.DeploymentSorterAction;
@@ -48,9 +40,6 @@
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 import org.jboss.webbeans.resources.ClassTransformer;
-import org.jboss.webbeans.security.spi.SecurityServices;
-import org.jboss.webbeans.transaction.spi.TransactionServices;
-import org.jboss.webbeans.validation.spi.ValidationServices;
 
 /**
  * @author pmuir
@@ -125,8 +114,6 @@
       Sorter sorter = Sorter.createSorter(getManager(), classes, getEnvironment().getEjbDescriptors());
       List<DeploymentItem<?>> sortedItems = sorter.sort();
 
-      addBuiltInBeans();
-
       DeploymentItemDeployerAction deployerAction = new DeploymentItemDeployerAction();
       Set<ObserverMethod<?, ?>> observers = new HashSet<ObserverMethod<?, ?>>();
       for (DeploymentItem<?> item : sortedItems)
@@ -147,29 +134,8 @@
       return this;
    }
    
-   private void addBuiltInBeans()
+   public void addBuiltinBean(AbstractBuiltInBean<?> bean)
    {
-      addBuiltinBean(new ManagerBean(getManager()));
-      addBuiltinBean(new InjectionPointBean(getManager()));
-      addBuiltinBean(new EventBean(getManager()));
-      addBuiltinBean(new InstanceBean(getManager()));
-      if (getManager().getServices().contains(TransactionServices.class))
-      {
-         addBuiltinBean(new UserTransactionBean(getManager()));
-      }
-      if (getManager().getServices().contains(SecurityServices.class))
-      {
-         addBuiltinBean(new PrincipalBean(getManager()));
-      }
-      if (getManager().getServices().contains(ValidationServices.class))
-      {
-         addBuiltinBean(new DefaultValidatorBean(getManager()));
-         addBuiltinBean(new DefaultValidatorFactoryBean(getManager()));
-      }
-   }
-   
-   private void addBuiltinBean(AbstractBuiltInBean<?> bean)
-   {
       getEnvironment().addBean(bean);
       getManager().addBean(bean);
    }

Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployment.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployment.java	2009-09-17 17:28:48 UTC (rev 3699)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployment.java	2009-09-17 18:34:45 UTC (rev 3700)
@@ -124,6 +124,10 @@
    public void deployBeans(Environment environment)
    {
       beanDeployer.addClasses(beanDeploymentArchive.getBeanClasses());
+      beanDeployer.addBuiltinBean(new ManagerBean(beanManager));
+      beanDeployer.addBuiltinBean(new InjectionPointBean(beanManager));
+      beanDeployer.addBuiltinBean(new EventBean(beanManager));
+      beanDeployer.addBuiltinBean(new InstanceBean(beanManager));
       if (!environment.equals(Environments.SE))
       {
          beanDeployer.addClass(ConversationImpl.class);
@@ -132,6 +136,19 @@
          beanDeployer.addClass(NumericConversationIdGenerator.class);
          beanDeployer.addClass(HttpSessionManager.class);
       }
+      if (beanManager.getServices().contains(TransactionServices.class))
+      {
+         beanDeployer.addBuiltinBean(new UserTransactionBean(beanManager));
+      }
+      if (beanManager.getServices().contains(SecurityServices.class))
+      {
+         beanDeployer.addBuiltinBean(new PrincipalBean(beanManager));
+      }
+      if (beanManager.getServices().contains(ValidationServices.class))
+      {
+         beanDeployer.addBuiltinBean(new DefaultValidatorBean(beanManager));
+         beanDeployer.addBuiltinBean(new DefaultValidatorFactoryBean(beanManager));
+      }
       beanDeployer.deploy();
    }
 }