[jboss-cvs] JBossAS SVN: r61337 - 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:12:48 -0400 (Thu, 15 Mar 2007)
New Revision: 61337

Modified:
   trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
Log:
Use ObjectName.quote to escape the deployment name portion of the ejb module name

Modified: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2007-03-15 06:34:41 UTC (rev 61336)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2007-03-15 08:12:48 UTC (rev 61337)
@@ -33,7 +33,6 @@
 import org.jboss.deployment.security.JaccPolicyUtil;
 import org.jboss.ejb.EjbModule;
 import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.mx.util.ObjectNameConverter;
 import org.jboss.system.metadata.ServiceAttributeMetaData;
 import org.jboss.system.metadata.ServiceConstructorMetaData;
 import org.jboss.system.metadata.ServiceDependencyMetaData;
@@ -135,7 +134,8 @@
          }
 
          unitShortName = unitShortName.substring(unitShortName.lastIndexOf("/") + 1);
-
+         // 
+         unitShortName = ObjectName.quote(unitShortName);
          moduleName = EjbModule.BASE_EJB_MODULE_NAME + ",module=" + unitShortName;
       }
 
@@ -143,7 +143,7 @@
       ObjectName moduleObjectName = null;
       try
       {
-         moduleObjectName = ObjectNameConverter.convert(moduleName);
+         moduleObjectName = new ObjectName(moduleName);
       }
       catch(MalformedObjectNameException e)
       {
@@ -228,12 +228,24 @@
       String name = metaData.getJmxName();
       if( name == null )
       {
-         name = EjbModule.BASE_EJB_MODULE_NAME + ",module="+unit.getSimpleName();
+         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);
+         name = EjbModule.BASE_EJB_MODULE_NAME + ",module=" + unitShortName;
       }
 
-      // Build an escaped JMX name including deployment shortname
-      ObjectName ejbModuleName = ObjectNameConverter.convert(name);
-      return ejbModuleName;
+      return new ObjectName(name);
    }
 
 }