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

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

Author: heiko.braun at jboss.com
Date: 2008-05-05 06:43:29 -0400 (Mon, 05 May 2008)
New Revision: 73058

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
Log:
EJBTHREE-1335: Container name in EJB3 meta data

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2008-05-05 10:42:31 UTC (rev 73057)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java	2008-05-05 10:43:29 UTC (rev 73058)
@@ -24,19 +24,17 @@
 import java.util.Map;
 
 import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.management.MalformedObjectNameException;
 import javax.security.jacc.PolicyConfiguration;
 
 import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
 import org.jboss.deployment.MappedReferenceMetaDataResolverDeployer;
 import org.jboss.deployment.dependency.ContainerDependencyMetaData;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.DependencyPolicy;
-import org.jboss.ejb3.DeploymentScope;
-import org.jboss.ejb3.DeploymentUnit;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.MCDependencyPolicy;
+import org.jboss.ejb3.*;
 import org.jboss.ejb3.javaee.JavaEEComponent;
+import org.jboss.ejb3.javaee.JavaEEModule;
+import org.jboss.ejb3.javaee.JavaEEApplication;
 import org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin;
 import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
 import org.jboss.kernel.Kernel;
@@ -95,6 +93,7 @@
       MCDependencyPolicy dependsPolicy = (MCDependencyPolicy) container.getDependencyPolicy();
       EJBContainer ejbContainer = (EJBContainer) container;
       JBossEnterpriseBeanMetaData beanMD = ejbContainer.getXml();
+
       EjbDeploymentSummary defaultsInfo = getUnitSummary(this.getDeploymentUnit(), beanMD);
       ContainerDependencyMetaData cdmd = null;
       if(endpoints != null)
@@ -111,9 +110,23 @@
          dependsPolicy.getSupplies().add(supply);
          }
       }
+
+      // EJBTHREE-1335: container name in meta data
+      generateContainerName(container, beanMD);
+      
       super.registerEJBContainer(container);
    }
 
+   private void generateContainerName(Container container, JBossEnterpriseBeanMetaData beanMD)
+   {
+      ObjectName on = container.getObjectName();
+      assert on!=null : "ObjectName was null";
+
+      // Heiko: This should actually generate the name and assign it to ejb3 meta data
+      // Currently we stick to copying the values around until an EJB3 team member figures out a proper way      
+      beanMD.setGeneratedContainerName(on.getCanonicalName());
+   }
+
    private static EjbDeploymentSummary getUnitSummary(DeploymentUnit unit, JBossEnterpriseBeanMetaData beanMD)
    {
       ClassLoader loader = unit.getClassLoader();
@@ -133,5 +146,5 @@
       }
       summary.setService(beanMD.isService());
       return summary;
-   }
+   }   
 }