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

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

Author: alex.loubyansky at jboss.com
Date: 2008-03-19 10:56:19 -0400 (Wed, 19 Mar 2008)
New Revision: 71005

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
   trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java
Log:
JBAS-5285

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-03-19 14:50:50 UTC (rev 71004)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-03-19 14:56:19 UTC (rev 71005)
@@ -339,8 +339,6 @@
             unresolvedRefs.add(ref.getEjbRefName()+"/ejb-local-ref/"+link+" available: " + searched);
          else
          {
-            // TODO: remove this
-            ref.setMappedName(target);
             ref.setResolvedJndiName(target);
          }
       }
@@ -363,8 +361,9 @@
             if(target == null)
                unresolvedRefs.add(ref.getEjbRefName()+"/ejb-ref/"+link+ " available: " + searched);
             else
-               ref.setMappedName(target);
+               mappedName = target;
          }
+         ref.setResolvedJndiName(mappedName);
       }
    }
    protected void resolveMsgRefs(DeploymentUnit unit, Map<String, String> endpointMap,
@@ -385,8 +384,9 @@
             if(target == null)
                unresolvedRefs.add(ref.getMessageDestinationRefName()+"/message-destination-ref/"+link + " available: " + searched);
             else
-               ref.setMappedName(target.getMappedName());
+               mappedName = target.getMappedName();
          }
+         ref.setResolvedJndiName(mappedName);
       }
    }
 

Modified: trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java	2008-03-19 14:50:50 UTC (rev 71004)
+++ trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java	2008-03-19 14:56:19 UTC (rev 71005)
@@ -209,7 +209,7 @@
          if(target == null)
             unresolvedRefs.add(ref.getEjbRefName()+"/ejb-local-ref/"+link +" available: " + searched);
          else
-            ref.setMappedName(target);
+            ref.setResolvedJndiName(target);
       }      
    }
    protected void resolveEjbRefs(DeploymentUnit unit, EJBReferencesMetaData ejbRefs, List<String> unresolvedRefs)
@@ -229,8 +229,9 @@
             if(target == null)
                unresolvedRefs.add(ref.getEjbRefName()+"/ejb-ref/"+link + " available: " + searched);
             else
-               ref.setMappedName(target);
+               mappedName = target;
          }
+         ref.setResolvedJndiName(mappedName);
       }      
    }
    protected void resolveMsgRefs(DeploymentUnit unit, MessageDestinationReferencesMetaData msgRefs, List<String> unresolvedRefs)
@@ -250,8 +251,9 @@
             if(target == null)
                unresolvedRefs.add(ref.getMessageDestinationRefName()+"/message-destination-ref/"+link + " available: " + searched);
             else
-               ref.setMappedName(target.getMappedName());
+               mappedName = target.getMappedName();
          }
+         ref.setResolvedJndiName(mappedName);
       }
    }