[jboss-cvs] JBossAS SVN: r89751 - projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer.

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

Author: ALRubinger
Date: 2009-06-03 13:19:07 -0400 (Wed, 03 Jun 2009)
New Revision: 89751

Modified:
   projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/Ejb3MetricsDeployer.java
Log:
[EJBTHREE-1839] Prepend component name w/ EAR name if present (uniquely scope)

Modified: projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/Ejb3MetricsDeployer.java
===================================================================
--- projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/Ejb3MetricsDeployer.java	2009-06-03 16:27:45 UTC (rev 89750)
+++ projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/Ejb3MetricsDeployer.java	2009-06-03 17:19:07 UTC (rev 89751)
@@ -38,6 +38,7 @@
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.ejb3.Container;
 import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.javaee.JavaEEApplication;
 import org.jboss.ejb3.mdb.MessagingContainer;
 import org.jboss.ejb3.metrics.spi.SessionInstanceMetrics;
 import org.jboss.ejb3.session.SessionContainer;
@@ -159,12 +160,18 @@
          for (final Container container : containers)
          {
             // Get the EJB Name
-            final String ejbName = container.getEjbName();
+            String ejbName = container.getEjbName();
+            final JavaEEApplication application = deployment.getApplication();
+            // If we're in an EAR
+            if (application != null)
+            {
+               // Prepend the EAR name
+               ejbName = application.getName() + "-" + ejbName;
+            }
 
             // Session Containers
             if (container instanceof SessionContainer)
             {
-
                // Cast
                final SessionContainer sessionContainer = (SessionContainer) container;