[jboss-cvs] JBossAS SVN: r61338 - trunk/server/src/main/org/jboss/ejb/deployers.

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

Author: scott.stark at jboss.org
Date: 2007-03-15 04:16:01 -0400 (Thu, 15 Mar 2007)
New Revision: 61338

Modified:
   trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
Log:
Remove the duplicate module name creation

Modified: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2007-03-15 08:12:48 UTC (rev 61337)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2007-03-15 08:16:01 UTC (rev 61338)
@@ -119,36 +119,17 @@
       ServiceMetaData ejbModule = new ServiceMetaData();
       ejbModule.setCode(EjbModule.class.getName());
 
-      String moduleName = deployment.getJmxName();
-      if( moduleName == null )
-      {
-         String unitShortName = unit.getName();
-         if (unitShortName.endsWith("/"))
-         {
-            unitShortName = unitShortName.substring(0, unitShortName.length() - 1);
-         }
 
-         if(unitShortName.endsWith("!"))
-         {
-            unitShortName = unitShortName.substring(0, unitShortName.length() - 1);
-         }
-
-         unitShortName = unitShortName.substring(unitShortName.lastIndexOf("/") + 1);
-         // 
-         unitShortName = ObjectName.quote(unitShortName);
-         moduleName = EjbModule.BASE_EJB_MODULE_NAME + ",module=" + unitShortName;
-      }
-
       // Build an escaped JMX name including deployment shortname
       ObjectName moduleObjectName = null;
       try
       {
-         moduleObjectName = new ObjectName(moduleName);
+         moduleObjectName = this.getObjectName(unit, deployment);
       }
       catch(MalformedObjectNameException e)
       {
          throw new DeploymentException("Failed to create EJB module " + unit.getName() +
-            ": malformed EjbModule name " + moduleName, e);
+            ": malformed EjbModule name", e);
       }
 
       ejbModule.setObjectName(moduleObjectName);