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

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

Author: scott.stark at jboss.org
Date: 2008-05-12 00:53:32 -0400 (Mon, 12 May 2008)
New Revision: 73252

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
Log:
Override the binding policy to one more consistent with the current ejb3 bindings.

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-05-12 04:16:33 UTC (rev 73251)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-05-12 04:53:32 UTC (rev 73252)
@@ -47,7 +47,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.BasicJndiBindingPolicy;
 import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.SessionJndiBindingPolicy;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DefaultJndiBindingPolicy;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DeploymentSummary;
@@ -329,7 +328,8 @@
          {
             // The unique id for this ejb in the deployment
             String ejbCompID = prefix + "#" + bean.getEjbName();
-            String jndiName = bean.determineResolvedJndiName(null, null);
+            LegacyEjb3JndiPolicy policy = new LegacyEjb3JndiPolicy();
+            String jndiName = bean.determineResolvedJndiName(null, policy);
             ContainerDependencyMetaData cdmd = new ContainerDependencyMetaData(jndiName, bean.getEjbName(), vfsPath);
             cdmd.setEjb3X(ejbMetaData.isEJB3x());
             // TODO, this is a mess that should be simply from the metadata
@@ -361,7 +361,7 @@
                // home
                if(sbean.getHome() != null && sbean.getHome().length() > 0)
                {
-                  cdmd.addJndiName(sbean.determineResolvedJndiName(KnownInterfaces.HOME, null));
+                  cdmd.addJndiName(sbean.determineResolvedJndiName(KnownInterfaces.HOME, policy));
                   // Add ejb/vfsPath at iface
                   String home = sbean.getHome();
                   String ifacePath = prefix + "@" + home;
@@ -422,7 +422,7 @@
                // local-home
                if(sbean.getLocalHome() != null && sbean.getLocalHome().length() > 0)
                {
-                  cdmd.addJndiName(sbean.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME, null));
+                  cdmd.addJndiName(sbean.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME, policy));
                   // Add ejb/vfsPath at iface
                   String local = sbean.getLocalHome();
                   String ifacePath = prefix + "@" + local;
@@ -484,7 +484,7 @@
                BusinessLocalsMetaData locals = sbean.getBusinessLocals();
                if(locals != null && locals.size() > 0)
                {
-                  String localBaseJndiName = sbean.determineResolvedJndiName(KnownInterfaces.LOCAL, null);
+                  String localBaseJndiName = sbean.determineResolvedJndiName(KnownInterfaces.LOCAL, policy);
                   cdmd.addJndiName(localBaseJndiName);
                   for(String local : locals)
                   {
@@ -520,7 +520,7 @@
                BusinessRemotesMetaData remotes = sbean.getBusinessRemotes();
                if(remotes != null && remotes.size() > 0)
                {
-                  String remoteBaseJndiName = sbean.determineResolvedJndiName(KnownInterfaces.REMOTE, null);
+                  String remoteBaseJndiName = sbean.determineResolvedJndiName(KnownInterfaces.REMOTE, policy);
                   cdmd.addJndiName(remoteBaseJndiName);
                   for(String remote : remotes)
                   {
@@ -651,7 +651,7 @@
                String ifaceName = iface != null ? iface.getName() : null;
                
                LegacyEjb3JndiPolicy policy = new LegacyEjb3JndiPolicy();
-               String containerJndiName = target.getBeanMetaData().determineResolvedJndiName(ifaceName, null);
+               String containerJndiName = target.getBeanMetaData().determineResolvedJndiName(ifaceName, policy);
                if(containerJndiName != null)
                   ref.setResolvedJndiName(containerJndiName);
             }
@@ -820,7 +820,8 @@
                cdmd.addDependency(target);
                // Determine the jndi name for the reference interface
                String iface = getInterface(ref);
-               String containerJndiName = target.getBeanMetaData().determineResolvedJndiName(iface, null);
+               LegacyEjb3JndiPolicy policy = new LegacyEjb3JndiPolicy();
+               String containerJndiName = target.getBeanMetaData().determineResolvedJndiName(iface, policy);
                if(containerJndiName != null)
                   ref.setResolvedJndiName(containerJndiName);
             }