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

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

Author: ALRubinger
Date: 2008-08-12 05:54:32 -0400 (Tue, 12 Aug 2008)
New Revision: 76969

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
Log:
[EJBTHREE-1455] Reapply fix to EJB3 without breaking EJB2.x

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-08-12 08:40:06 UTC (rev 76968)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-08-12 09:54:32 UTC (rev 76969)
@@ -799,7 +799,7 @@
                String ifaceName = iface != null ? iface.getName() : null;
                
                //LegacyEjb3JndiPolicy policy = new LegacyEjb3JndiPolicy();
-               String containerJndiName = target.getBeanMetaData().determineResolvedJndiName(ifaceName);
+               String containerJndiName = target.getBeanMetaData().determineResolvedJndiName(ifaceName);               
                if(containerJndiName != null)
                   ref.setResolvedJndiName(containerJndiName);
             }
@@ -883,7 +883,18 @@
             {
                cdmd.addDependency(target);
                // Need to look at the local jndi name
-               String localJndiName = target.getBeanMetaData().determineLocalJndiName();
+               String localInterface = ref.getLocal();
+               JBossEnterpriseBeanMetaData md = target.getBeanMetaData();
+               JBossMetaData ejbMarMd = md.getEnterpriseBeansMetaData().getEjbJarMetaData();
+               String localJndiName = null;
+               if (ejbMarMd.isEJB3x())
+               {
+                  localJndiName = md.determineResolvedJndiName(localInterface);
+               }
+               else
+               {
+                  localJndiName = md.determineLocalJndiName();
+               }
                if(localJndiName != null)
                   ref.setResolvedJndiName(localJndiName);
             }
@@ -969,7 +980,18 @@
                // Determine the jndi name for the reference interface
                String iface = getInterface(ref);
                //LegacyEjb3JndiPolicy policy = new LegacyEjb3JndiPolicy();
-               String containerJndiName = target.getBeanMetaData().determineJndiName();
+               String businessInterface = ref.getRemote();
+               JBossEnterpriseBeanMetaData md = target.getBeanMetaData();
+               JBossMetaData ejbMarMd = md.getEnterpriseBeansMetaData().getEjbJarMetaData();
+               String containerJndiName = null;
+               if (ejbMarMd.isEJB3x())
+               {
+                  containerJndiName = md.determineResolvedJndiName(businessInterface);
+               }
+               else
+               {
+                  containerJndiName = md.determineJndiName();
+               }
                if(containerJndiName != null)
                   ref.setResolvedJndiName(containerJndiName);
             }