[jboss-cvs] JBossAS SVN: r73591 - projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-05-22 10:16:16 -0400 (Thu, 22 May 2008)
New Revision: 73591

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanScanningDeployer.java
Log:
Remove dupllicated code.
TODO on undeploy - KDD doesn't handle that!

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanScanningDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanScanningDeployer.java	2008-05-22 14:07:47 UTC (rev 73590)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/BeanScanningDeployer.java	2008-05-22 14:16:16 UTC (rev 73591)
@@ -72,18 +72,6 @@
          setRelativeOrder(getRelativeOrder() + 10);
    }
 
-   /**
-    * Add beam metadata as component.
-    *
-    * @param unit the deployment unit
-    * @param bean the bean metadata
-    */
-   protected static void addBeanComponent(DeploymentUnit unit, BeanMetaData bean)
-   {
-      DeploymentUnit component = unit.addComponent(bean.getName());
-      component.addAttachment(BeanMetaData.class.getName(), bean);
-   }
-
    public void deploy(DeploymentUnit unit, AnnotationEnvironment env) throws DeploymentException
    {
       Map<String, DeploymentUnit> components = null;
@@ -118,7 +106,7 @@
                       .setErrorHandlingMode(bean.errorHandlingMode())
                       .setAutowireCandidate(bean.autowireCandidate());
 
-               addBeanComponent(unit, builder.getBeanMetaData());
+               KernelDeploymentDeployer.addBeanComponent(unit, builder.getBeanMetaData());
             }
             else
             {
@@ -169,7 +157,7 @@
 
                List<BeanMetaData> bfBeans = gbfmd.getBeans();
                for (BeanMetaData bfb : bfBeans)
-                  addBeanComponent(unit, bfb);
+                  KernelDeploymentDeployer.addBeanComponent(unit, bfb);
             }
             else
             {
@@ -180,6 +168,8 @@
       }
    }
 
+   // TODO - undeploy!!
+
    /**
     * Map components.
     *