[jboss-cvs] JBossAS SVN: r73432 - trunk/server/src/main/org/jboss/deployment/plugin.

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

Author: scott.stark at jboss.org
Date: 2008-05-15 19:21:53 -0400 (Thu, 15 May 2008)
New Revision: 73432

Modified:
   trunk/server/src/main/org/jboss/deployment/plugin/LegacyEjb3JndiPolicy.java
Log:
JBCTS-795, update ejb3 override behavior

Modified: trunk/server/src/main/org/jboss/deployment/plugin/LegacyEjb3JndiPolicy.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/plugin/LegacyEjb3JndiPolicy.java	2008-05-15 23:09:02 UTC (rev 73431)
+++ trunk/server/src/main/org/jboss/deployment/plugin/LegacyEjb3JndiPolicy.java	2008-05-15 23:21:53 UTC (rev 73432)
@@ -23,6 +23,7 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DefaultJndiBindingPolicy;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.EjbDeploymentSummary;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.KnownInterfaces;
@@ -90,14 +91,30 @@
       if(baseJndiName == null)
          baseJndiName = beanMD.determineJndiName();
       String jndiName = null;
+      String localJndiName = beanMD.getLocalJndiName();
       boolean is3x = beanMD.getJBossMetaData().isEJB3x();
+      boolean hasJndiName = false;
+      if(beanMD.isSession())
+      {
+         JBossSessionBeanMetaData sbeanMD = (JBossSessionBeanMetaData) beanMD;
+         String givenJndiName = sbeanMD.getJndiName();
+         if(givenJndiName != null && givenJndiName.trim().length() > 0)
+            hasJndiName = true;
+      }
+
       switch(ifaceType)
       {
          case BUSINESS_LOCAL:
-            jndiName = baseJndiName + "/local";
+            if(localJndiName == null)
+               jndiName = baseJndiName + "/local";
+            else
+               jndiName = localJndiName;
             break;
          case BUSINESS_REMOTE:
-            jndiName = baseJndiName + "/remote";
+            if(hasJndiName == false)
+               jndiName = baseJndiName + "/remote";
+            else
+               jndiName = baseJndiName;
             break;
          case LOCAL_HOME:
             if(is3x)