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

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

Author: scott.stark at jboss.org
Date: 2008-04-27 14:11:18 -0400 (Sun, 27 Apr 2008)
New Revision: 72762

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
Log:
Look to the top level deployment for the container dependency info

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2008-04-27 14:41:49 UTC (rev 72761)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2008-04-27 18:11:18 UTC (rev 72762)
@@ -40,6 +40,7 @@
 import org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin;
 import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
 import org.jboss.kernel.Kernel;
+import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
@@ -53,7 +54,8 @@
  * @version $Revision: 56592 $
  */
 public class Ejb3JBoss5Deployment extends Ejb3Deployment
-{  
+{
+   private static Logger log = Logger.getLogger(Ejb3JBoss5Deployment.class);
    private org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit;
    private Map<String, ContainerDependencyMetaData> endpoints;
 
@@ -65,7 +67,10 @@
 
       // todo maybe mbeanServer should be injected?
       this.mbeanServer = mbeanServer;
-      endpoints = (Map<String, ContainerDependencyMetaData>) jbossUnit.getAttachment(MappedReferenceMetaDataResolverDeployer.ENDPOINT_MAP_KEY);
+      org.jboss.deployers.structure.spi.DeploymentUnit topUnit = jbossUnit.getTopLevel();
+      endpoints = (Map<String, ContainerDependencyMetaData>) topUnit.getAttachment(MappedReferenceMetaDataResolverDeployer.ENDPOINT_MAP_KEY);
+      if(endpoints == null)
+         log.warn(jbossUnit+" has no ContainerDependencyMetaData attachment");
    }
 
    protected PolicyConfiguration createPolicyConfiguration() throws Exception