[jboss-cvs] JBossAS SVN: r76553 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directory.

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

Author: ALRubinger
Date: 2008-08-01 01:52:44 -0400 (Fri, 01 Aug 2008)
New Revision: 76553

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java
Log:
[JBMETA-86] Avoid JNDI Collisions in the case jndiName is equal to deploymentScopeBaseName in BasicJndiBindingPolicy

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-08-01 05:47:00 UTC (rev 76552)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java	2008-08-01 05:52:44 UTC (rev 76553)
@@ -279,13 +279,22 @@
          
          /*
           * Adjust deploymentScopeBaseName in the case it's equal 
-          * to mappedName 
+          * to mappedName or jndiName
           * 
           * JBMETA-83
+          * JBMETA-86
           */
          String mappedName = summary.getBeanMD().getMappedName();
-         if(deploymentScopeBaseName.equals(mappedName))
+         if (md.isSession())
          {
+            if (mappedName == null || mappedName.trim().length() == 0)
+            {
+               JBossSessionBeanMetaData smd = (JBossSessionBeanMetaData) md;
+               mappedName = smd.getJndiName();
+            }
+         }
+         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]");

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java	2008-08-01 05:47:00 UTC (rev 76552)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java	2008-08-01 05:52:44 UTC (rev 76553)
@@ -126,7 +126,7 @@
    }
    
    /**
-    * JBMETA-83
+    * JBMETA-86
     * 
     * When deploymentScopeBaseName is equal to the jndiName, 
     * the base JNDI name becomes bound and is therefore an