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

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

Author: scott.stark at jboss.org
Date: 2008-04-15 07:53:48 -0400 (Tue, 15 Apr 2008)
New Revision: 72216

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
Log:
Work around the getEjbContainerForEjbName missing from Ejb3Deployment

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	2008-04-15 11:47:32 UTC (rev 72215)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	2008-04-15 11:53:48 UTC (rev 72216)
@@ -24,6 +24,8 @@
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.management.ObjectName;
+
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.deployment.spi.DeploymentEndpointResolver;
 import org.jboss.deployment.spi.EndpointInfo;
@@ -31,6 +33,7 @@
 import org.jboss.ejb3.DeploymentScope;
 import org.jboss.ejb3.EJBContainer;
 import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.javaee.JavaEEComponentHelper;
 import org.jboss.logging.Logger;
 
 /**
@@ -126,7 +129,18 @@
       {
          log.debug("Found endpoint for interface: "+businessIntf+", endpoint: "+endpoint);
          Ejb3Deployment deployment = deployments.get(endpoint.getPathName());
-         //container = deployment.getEjbContainerForEjbName(endpoint.getName());
+         String ejbObjectName = JavaEEComponentHelper.createObjectName(deployment, endpoint.getName());
+         ObjectName ejbON;
+         try
+         {
+            ejbON = new ObjectName(ejbObjectName);
+         }
+         catch (Exception e)
+         {
+            throw new IllegalStateException("Failed to build ejb container ObjectName", e);
+         }
+         container = (EJBContainer) deployment.getContainer(ejbON)
+         // TODO: container = deployment.getEjbContainerForEjbName(endpoint.getName());
       }
       else
       {
@@ -145,7 +159,18 @@
       {
          log.debug("Found endpoint for ejbLink: "+ejbLink+", endpoint: "+endpoint);
          Ejb3Deployment deployment = deployments.get(endpoint.getPathName());
-         //container = deployment.getEjbContainerForEjbName(endpoint.getName());
+         String ejbObjectName = JavaEEComponentHelper.createObjectName(deployment, endpoint.getName());
+         ObjectName ejbON;
+         try
+         {
+            ejbON = new ObjectName(ejbObjectName);
+         }
+         catch (Exception e)
+         {
+            throw new IllegalStateException("Failed to build ejb container ObjectName", e);
+         }
+         container = (EJBContainer) deployment.getContainer(ejbON);
+         // TODO: container = deployment.getEjbContainerForEjbName(endpoint.getName());         container = deployment.getEjbContainerForEjbName(endpoint.getName());
       }
       else
       {