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

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

Author: scott.stark at jboss.org
Date: 2006-11-27 18:13:43 -0500 (Mon, 27 Nov 2006)
New Revision: 58696

Modified:
   trunk/server/src/main/org/jboss/ejb/EjbModule.java
   trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
Log:
Fix the copy/paste comments and use the DeploymentUnit.simpleName as the jmx module name.

Modified: trunk/server/src/main/org/jboss/ejb/EjbModule.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EjbModule.java	2006-11-27 22:55:33 UTC (rev 58695)
+++ trunk/server/src/main/org/jboss/ejb/EjbModule.java	2006-11-27 23:13:43 UTC (rev 58696)
@@ -365,7 +365,7 @@
          Iterator beans = appMetaData.getEnterpriseBeans();
          String contextID = appMetaData.getJaccContextID();
          if( contextID == null )
-            contextID = EjbDeployer.shortNameFromDeploymentName(deploymentUnit.getName());
+            contextID = deploymentUnit.getSimpleName();
          appMetaData.setJaccContextID(contextID);
          PolicyConfigurationFactory pcFactory = PolicyConfigurationFactory.getPolicyConfigurationFactory();
          PolicyConfiguration pc = pcFactory.getPolicyConfiguration(contextID, true);

Modified: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2006-11-27 22:55:33 UTC (rev 58695)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2006-11-27 23:13:43 UTC (rev 58696)
@@ -57,27 +57,6 @@
    /** The ejb timer service */
    private String timerServiceName;
 
-   /**
-    * A utility method that takes a deployment unit name and strips it down to the base war
-    * name without the .war suffix.
-    * @param name - the DeploymentUnit name.
-    */
-   public static String shortNameFromDeploymentName(String name)
-   {
-      String shortName = name;
-      String[] parts = name.split("/|\\.");
-      if( parts.length > 1 )
-      {
-         // If it ends in .war, use the previous part
-         if( parts[parts.length-1].equals("war") )
-            shortName = parts[parts.length-2];
-         // else use the last part
-         else
-            shortName = parts[parts.length-1];
-      }
-      return shortName;
-   }
-
    public EjbDeployer()
    {
       super(ApplicationMetaData.class);
@@ -225,11 +204,11 @@
 
    /**
     * Get the object name of the ServiceMetaData instance associated with
-    * the WebMetaData. This uses the pattern:
-    * "jboss.web.deployment:war="+metaData.getContextRoot()
+    * the EjbModule. This uses the pattern:
+    * "jboss.j2ee:service=EjbModule,module="+unit.getSimpleName()
     * 
-    * @param metaData - the web app metaData
-    * @return "jboss.web.deployment:war="+metaData.getContextRoot();
+    * @param metaData - the ejb jar metaData
+    * @return "jboss.j2ee:service=EjbModule,module="+unit.getSimpleName()
     * @throws MalformedObjectNameException 
     */
    protected ObjectName getObjectName(DeploymentUnit unit, ApplicationMetaData metaData)
@@ -238,8 +217,7 @@
       String name = metaData.getJmxName();
       if( name == null )
       {
-         name = EjbModule.BASE_EJB_MODULE_NAME + ",module="
-            + shortNameFromDeploymentName(unit.getName());
+         name = EjbModule.BASE_EJB_MODULE_NAME + ",module="+unit.getSimpleName();
       }
 
       // Build an escaped JMX name including deployment shortname