[jboss-cvs] JBossAS SVN: r58903 - trunk/server/src/main/org/jboss/ejb

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

Author: anil.saldhana at jboss.com
Date: 2006-12-07 12:21:31 -0500 (Thu, 07 Dec 2006)
New Revision: 58903

Modified:
   trunk/server/src/main/org/jboss/ejb/EjbModule.java
Log:
use the shorter name for jacc context id

Modified: trunk/server/src/main/org/jboss/ejb/EjbModule.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EjbModule.java	2006-12-07 16:15:12 UTC (rev 58902)
+++ trunk/server/src/main/org/jboss/ejb/EjbModule.java	2006-12-07 17:21:31 UTC (rev 58903)
@@ -47,7 +47,7 @@
 import javax.transaction.TransactionManager;
 
 import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.spi.structure.DeploymentContext; 
 import org.jboss.deployment.DeploymentException;
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.deployment.EARDeployerMBean;
@@ -62,8 +62,7 @@
 import org.jboss.metadata.XmlLoadable;
 import org.jboss.metadata.MethodMetaData;
 import org.jboss.metadata.SecurityRoleRefMetaData;
-import org.jboss.mx.loading.RepositoryClassLoader;
-import org.jboss.ejb.deployers.EjbDeployer;
+import org.jboss.mx.loading.RepositoryClassLoader; 
 import org.jboss.ejb.plugins.SecurityProxyInterceptor;
 import org.jboss.ejb.plugins.StatefulSessionInstancePool;
 import org.jboss.security.AuthenticationManager;
@@ -365,7 +364,7 @@
          Iterator beans = appMetaData.getEnterpriseBeans();
          String contextID = appMetaData.getJaccContextID();
          if( contextID == null )
-            contextID = deploymentUnit.getSimpleName();
+            contextID = shortNameFromDeploymentName(deploymentUnit.getSimpleName()); 
          appMetaData.setJaccContextID(contextID);
          PolicyConfigurationFactory pcFactory = PolicyConfigurationFactory.getPolicyConfigurationFactory();
          PolicyConfiguration pc = pcFactory.getPolicyConfiguration(contextID, true);
@@ -383,7 +382,7 @@
             // Link this to the parent PC
             DeploymentContext current = deploymentUnit.getDeploymentContext();
             while (current.getParent() != null)
-               current = current.getParent();
+               current = current.getParent(); 
             PolicyConfiguration parentPC =
                current.getTransientAttachments().getAttachment(PolicyConfiguration.class);
             if (parentPC != null && parentPC != pc)
@@ -1294,7 +1293,28 @@
          ((XmlLoadable) ic).importXml(conf.getContainerCacheConf());
 
       return ic;
-   }  
+   } 
+   
+   /**
+    * A utility method that takes a deployment unit name and strips it down to the base jar
+    * name without the .jar suffix.
+    * @param name - the DeploymentUnit name.
+    */
+   public static String shortNameFromDeploymentName(String name)
+   {
+      String shortName = name.trim();
+      String[] parts = name.split("/|\\.|\\!");
+      if( parts.length > 1 )
+      {
+         // If it ends in .war, use the previous part
+         if( parts[parts.length-1].equals("jar") )
+            shortName = parts[parts.length-2];
+         // else use the last part
+         else
+            shortName = parts[parts.length-1];
+      }
+      return shortName;
+   }
 }
 /*
 vim:ts=3:sw=3:et