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

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

Author: ALRubinger
Date: 2008-03-04 19:33:02 -0500 (Tue, 04 Mar 2008)
New Revision: 70397

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
   trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java
Log:
Don't override mappedName with resolved ejb-link JNDI name, but set resolved JNDI name instead.

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-03-05 00:30:52 UTC (rev 70396)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-03-05 00:33:02 UTC (rev 70397)
@@ -340,7 +340,7 @@
          else
          {
             // TODO: remove this
-            ref.setMappedName(target);
+            //ref.setMappedName(target);
             ref.setResolvedJndiName(target);
          }
       }
@@ -363,7 +363,7 @@
             if(target == null)
                unresolvedRefs.add(ref.getEjbRefName()+"/ejb-ref/"+link+ " available: " + searched);
             else
-               ref.setMappedName(target);
+               ref.setResolvedJndiName(target);
          }
       }
    }

Modified: trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java	2008-03-05 00:30:52 UTC (rev 70396)
+++ trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java	2008-03-05 00:33:02 UTC (rev 70397)
@@ -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,7 +229,7 @@
             if(target == null)
                unresolvedRefs.add(ref.getEjbRefName()+"/ejb-ref/"+link + " available: " + searched);
             else
-               ref.setMappedName(target);
+               ref.setResolvedJndiName(target);
          }
       }      
    }