[jboss-cvs] JBossAS SVN: r76240 - projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins.

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

Author: ALRubinger
Date: 2008-07-26 00:37:37 -0400 (Sat, 26 Jul 2008)
New Revision: 76240

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java
Log:
[JBMETA-83] Append "_" to the deploymentScopeBaseName if it is equal to mappedName, and log warning to the user

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java	2008-07-26 04:15:26 UTC (rev 76239)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java	2008-07-26 04:37:37 UTC (rev 76240)
@@ -21,6 +21,7 @@
  */
 package org.jboss.metadata.ejb.jboss.jndipolicy.plugins;
 
+import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
@@ -47,6 +48,8 @@
 {
 
    private static final long serialVersionUID = 1L;
+   
+   private static final Logger log = Logger.getLogger(BasicJndiBindingPolicy.class);
 
    public String getDefaultLocalHomeJndiName(EjbDeploymentSummary summary)
    {
@@ -271,7 +274,24 @@
       String deploymentScopeBaseName = summary.getDeploymentScopeBaseName();
       if (isEar && deploymentScopeBaseName != null && deploymentScopeBaseName.trim().length() > 0)
       {
+         
          deploymentScopeBaseName = deploymentScopeBaseName.trim();
+         
+         /*
+          * Adjust deploymentScopeBaseName in the case it's equal 
+          * to mappedName 
+          * 
+          * JBMETA-83
+          */
+         String mappedName = summary.getBeanMD().getMappedName();
+         if(deploymentScopeBaseName.equals(mappedName))
+         {
+            log.warn("The EAR name, which is used as a base, is equal to the mappedName for EJB \""
+                  + summary.getBeanMD().getEjbName()
+                  + "\", to avoid JNDI Naming Conflict appending a '_' to the base JNDI name. [JBMETA-83]");
+            deploymentScopeBaseName = deploymentScopeBaseName + "_";
+         }
+         
          baseName.insert(0, '/');
          baseName.insert(0, deploymentScopeBaseName);
       }