[jboss-cvs] JBossAS SVN: r66591 - trunk/ejb3/src/main/org/jboss/ejb3.

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

Author: scott.stark at jboss.org
Date: 2007-10-30 23:50:26 -0400 (Tue, 30 Oct 2007)
New Revision: 66591

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/MCDependencyPolicy.java
   trunk/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java
Log:
Add true dependencies in addition to demands

Modified: trunk/ejb3/src/main/org/jboss/ejb3/MCDependencyPolicy.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/MCDependencyPolicy.java	2007-10-31 03:32:34 UTC (rev 66590)
+++ trunk/ejb3/src/main/org/jboss/ejb3/MCDependencyPolicy.java	2007-10-31 03:50:26 UTC (rev 66591)
@@ -27,6 +27,7 @@
 import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
 import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
 import org.jboss.beans.metadata.spi.DemandMetaData;
+import org.jboss.beans.metadata.spi.DependencyMetaData;
 import org.jboss.beans.metadata.spi.SupplyMetaData;
 import org.jboss.ejb3.dependency.EjbLinkDemandMetaData;
 import org.jboss.ejb3.javaee.JavaEEComponent;
@@ -41,7 +42,8 @@
 public class MCDependencyPolicy implements DependencyPolicy
 {
    private JavaEEComponent component;
-   private Set<DemandMetaData> dependencies = new HashSet<DemandMetaData>();
+   private Set<DependencyMetaData> dependencies = new HashSet<DependencyMetaData>();
+   private Set<DemandMetaData> demands = new HashSet<DemandMetaData>();
    private Set<SupplyMetaData> supplies = new HashSet<SupplyMetaData>();
 
    public MCDependencyPolicy(JavaEEComponent component)
@@ -57,6 +59,10 @@
    }
    public void addDependency(DemandMetaData dependency)
    {
+      demands.add(dependency);      
+   }
+   public void addDependency(DependencyMetaData dependency)
+   {
       dependencies.add(dependency);      
    }
 
@@ -118,7 +124,7 @@
          addDependency(component.createObjectName(unitName, ejbName));
       }
       else
-         dependencies.add(new EjbLinkDemandMetaData(component, ejbLink));
+         addDependency(new EjbLinkDemandMetaData(component, ejbLink));
    }
    
    public void addJNDIName(String name, ClassLoader loader)
@@ -129,10 +135,14 @@
       addDependency(JNDIKernelRegistryPlugin.JNDI_DEPENDENCY_PREFIX + name);
    }
    
-   public Set<DemandMetaData> getDependencies()
+   public Set<DependencyMetaData> getDependencies()
    {
       return dependencies;
    }
+   public Set<DemandMetaData> getDemands()
+   {
+      return demands;
+   }
    
    public void addSupply(Class<?> businessInterface)
    {

Modified: trunk/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java	2007-10-31 03:32:34 UTC (rev 66590)
+++ trunk/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java	2007-10-31 03:50:26 UTC (rev 66591)
@@ -118,7 +118,8 @@
       AbstractBeanMetaData bean = new AbstractBeanMetaData(name, service.getClass().getName());
       bean.setConstructor(new AlreadyInstantiated(service));
       MCDependencyPolicy policy = (MCDependencyPolicy) dependencies;
-      bean.setDemands(policy.getDependencies());
+      bean.setDepends(policy.getDependencies());
+      bean.setDemands(policy.getDemands());
       bean.setSupplies(policy.getSupplies());
       log.info("installing bean: " + name + " with dependencies:");
       for (Object obj : policy.getDependencies())