[jboss-cvs] JBossAS SVN: r106223 - trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi.

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

Author: marius.bogoevici
Date: 2010-06-22 11:29:42 -0400 (Tue, 22 Jun 2010)
New Revision: 106223

Modified:
   trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java
Log:
Manipulate BeanMetaData using BeanMetaDataBuilder.

Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java	2010-06-22 15:15:40 UTC (rev 106222)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java	2010-06-22 15:29:42 UTC (rev 106223)
@@ -21,14 +21,8 @@
  */
 package org.jboss.weld.integration.deployer.jndi;
 
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractDependencyMetaData;
 import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.beans.metadata.spi.DependencyMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
@@ -73,16 +67,10 @@
                   jBossEnterpriseBeanMetaData.getGeneratedContainerName() :
                   jBossEnterpriseBeanMetaData.getContainerName();
 
-            AbstractBeanMetaData beanMetaData = (AbstractBeanMetaData) deploymentUnit.getParent().getAttachment(BeanMetaData.class + ":" + containerName, BeanMetaData.class);
-            Set<DependencyMetaData> dependencyMetaDatas = beanMetaData.getDepends();
-            if (null == dependencyMetaDatas)
-            {
-               dependencyMetaDatas = new HashSet<DependencyMetaData>();
-               beanMetaData.setDepends(dependencyMetaDatas);
-            }
-
-            dependencyMetaDatas.add(new AbstractDependencyMetaData(getJndiBinderName(deploymentUnit)));
-            dependencyMetaDatas.add(new AbstractDependencyMetaData(DeployersUtils.getBootstrapBeanName(deploymentUnit)));
+            BeanMetaData containerBeanMetadata = deploymentUnit.getParent().getAttachment(BeanMetaData.class + ":" + containerName, BeanMetaData.class);
+            BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(containerBeanMetadata);
+            builder.addDependency(getJndiBinderName(deploymentUnit));
+            builder.addDependency(DeployersUtils.getBootstrapBeanName(deploymentUnit));
          }
         
          BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(getJndiBinderName(deploymentUnit), JavaEEComponentJndiBinder.class.getName());