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

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

Author: ALRubinger
Date: 2008-07-16 23:28:17 -0400 (Wed, 16 Jul 2008)
New Revision: 75934

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
Log:
Correct the JNDI target demanded to be remote business default, not interface-specific, and add JNDI supplies for default remote business and default local business in MappedReferenceMetadataResolverDeployer

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-07-17 03:14:33 UTC (rev 75933)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-07-17 03:28:17 UTC (rev 75934)
@@ -390,6 +390,8 @@
                {
                   // Add ejb/vfsPath at iface
                   String remote = sbean.getRemote();
+                  String remoteJndiName = sbean.determineJndiName();
+                  cdmd.addJndiName(remoteJndiName);
                   String ifacePath = prefix + "@" + remote;
                   if(endpointAlternateMap.containsKey(ifacePath))
                      log.debug(ejbName+" duplicates remote: "+remote+", existing: "+endpointAlternateMap.get(ifacePath));
@@ -451,6 +453,8 @@
                {
                   // Add ejb/vfsPath at iface
                   String local = sbean.getLocal();
+                  String localJndiName = sbean.determineLocalJndiName();
+                  cdmd.addJndiName(localJndiName);
                   String ifacePath = prefix + "@" + local;
                   if(endpointAlternateMap.containsKey(ifacePath))
                      log.debug(ejbName+" duplicates local: "+local+", existing: "+endpointAlternateMap.get(ifacePath));
@@ -537,8 +541,8 @@
                      }
                      // Add ejb/iface
                      ifacePath = "ejb@" + remote;
-                     if(endpointAlternateMap.containsKey(ifacePath))
-                        log.debug(ejbName+" duplicates business-remote: "+remote+", existing: "+endpointAlternateMap.get(ifacePath));
+                     if(endpointMap.containsKey(ifacePath))
+                        log.debug(ejbName+" duplicates business-remote: "+remote+", existing: "+endpointMap.get(ifacePath));
                      else
                      {
                         endpointAlternateMap.put(ifacePath, ejbCompID);
@@ -946,7 +950,7 @@
                // Determine the jndi name for the reference interface
                String iface = getInterface(ref);
                //LegacyEjb3JndiPolicy policy = new LegacyEjb3JndiPolicy();
-               String containerJndiName = target.getBeanMetaData().determineResolvedJndiName(iface);
+               String containerJndiName = target.getBeanMetaData().determineJndiName();
                if(containerJndiName != null)
                   ref.setResolvedJndiName(containerJndiName);
             }