[jboss-cvs] JBossAS SVN: r72902 - in trunk/server/src/main/org/jboss/deployment: dependency and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-04-30 16:20:51 -0400 (Wed, 30 Apr 2008)
New Revision: 72902

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
   trunk/server/src/main/org/jboss/deployment/dependency/ContainerDependencyMetaData.java
Log:
JBAS-5499, look to metadata determineLocalJndiName for ejb-local-ref bindings

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-04-30 16:43:12 UTC (rev 72901)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-04-30 20:20:51 UTC (rev 72902)
@@ -599,9 +599,10 @@
             else
             {
                cdmd.addDependency(target);
-               String containerJndiName = target.getContainerName();
-               if(containerJndiName != null)
-                  ref.setResolvedJndiName(containerJndiName);
+               // Need to look at the local jndi name
+               String localJndiName = target.getBeanMetaData().determineLocalJndiName();
+               if(localJndiName != null)
+                  ref.setResolvedJndiName(localJndiName);
             }
          }
          else

Modified: trunk/server/src/main/org/jboss/deployment/dependency/ContainerDependencyMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/dependency/ContainerDependencyMetaData.java	2008-04-30 16:43:12 UTC (rev 72901)
+++ trunk/server/src/main/org/jboss/deployment/dependency/ContainerDependencyMetaData.java	2008-04-30 20:20:51 UTC (rev 72902)
@@ -25,6 +25,7 @@
 import java.util.Set;
 
 import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DefaultJndiBindingPolicy;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.EjbDeploymentSummary;
 import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
@@ -109,6 +110,10 @@
       return containerName;
    }
 
+   public JBossEnterpriseBeanMetaData getBeanMetaData()
+   {
+      return this.unitSummary.getBeanMD();
+   }
 
    public DefaultJndiBindingPolicy getJndiPolicy()
    {