[jboss-cvs] JBossAS SVN: r78851 - projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers.

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

Author: wolfc
Date: 2008-09-25 08:24:00 -0400 (Thu, 25 Sep 2008)
New Revision: 78851

Modified:
   projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java
Log:
EJBTHREE-1492: Setting up dependencies

Modified: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java	2008-09-25 12:16:00 UTC (rev 78850)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/deployers/EjbComponentDeployer.java	2008-09-25 12:24:00 UTC (rev 78851)
@@ -22,12 +22,16 @@
 package org.jboss.ejb3.embedded.deployers;
 
 import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.DemandMetaData;
+import org.jboss.beans.metadata.spi.DependencyMetaData;
+import org.jboss.beans.metadata.spi.SupplyMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.MCDependencyPolicy;
 import org.jboss.ejb3.embedded.deployment.EmbeddedDescriptorHandler;
 import org.jboss.ejb3.javaee.JavaEEComponentHelper;
 import org.jboss.ejb3.javaee.JavaEEModule;
@@ -49,10 +53,21 @@
       addOutput(BeanMetaData.class);
    }
 
-   protected void addDependencies(BeanMetaDataBuilder builder, DeploymentUnit unit, JBossEnterpriseBeanMetaData metaData)
+   protected void addDependencies(BeanMetaDataBuilder builder, DeploymentUnit unit, EJBContainer component)
    {
       // TODO: ask something else for that name
       builder.addDependency("org.jboss.ejb3.deployment:" + unit.getParent().getSimpleName());
+      
+      // Hmm, should not cast, EjbDeployment knows the type
+      MCDependencyPolicy dependencyPolicy = (MCDependencyPolicy) component.getDependencyPolicy();
+      
+      // Translating back and forth, could be done in 1 step.
+      for(DemandMetaData demand : dependencyPolicy.getDemands())
+         builder.addDemand(demand.getDemand());
+      for(DependencyMetaData dependency : dependencyPolicy.getDependencies())
+         builder.addDependency(dependency.getDependency());
+      for(SupplyMetaData supply : dependencyPolicy.getSupplies())
+         builder.addSupply(supply.getSupply());
    }
    
    @Override
@@ -81,7 +96,7 @@
       
       BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(componentName, component.getClass().getName());
       builder.setConstructorValue(component);
-      addDependencies(builder, unit, metaData);
+      addDependencies(builder, unit, component);
       
       unit.addAttachment(BeanMetaData.class, builder.getBeanMetaData());
    }