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

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

Author: ALRubinger
Date: 2008-08-12 04:40:06 -0400 (Tue, 12 Aug 2008)
New Revision: 76968

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
Log:
[EJBTHREE-1455] Revert a fix until EJB3 Proxy is brought into AS

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-08-12 07:46:39 UTC (rev 76967)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-08-12 08:40:06 UTC (rev 76968)
@@ -46,7 +46,6 @@
 import org.jboss.metadata.ejb.jboss.JBossGenericBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JBossSessionPolicyDecorator;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DeploymentSummary;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.EjbDeploymentSummary;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.KnownInterfaces;
@@ -800,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);
             }
@@ -884,8 +883,7 @@
             {
                cdmd.addDependency(target);
                // Need to look at the local jndi name
-               String localInterface = ref.getLocal();
-               String localJndiName = target.getBeanMetaData().determineResolvedJndiName(localInterface);
+               String localJndiName = target.getBeanMetaData().determineLocalJndiName();
                if(localJndiName != null)
                   ref.setResolvedJndiName(localJndiName);
             }
@@ -971,8 +969,7 @@
                // Determine the jndi name for the reference interface
                String iface = getInterface(ref);
                //LegacyEjb3JndiPolicy policy = new LegacyEjb3JndiPolicy();
-               String businessInterface = ref.getRemote();
-               String containerJndiName = target.getBeanMetaData().determineResolvedJndiName(businessInterface);
+               String containerJndiName = target.getBeanMetaData().determineJndiName();
                if(containerJndiName != null)
                   ref.setResolvedJndiName(containerJndiName);
             }