[jboss-cvs] JBossAS SVN: r72802 - in trunk/server/src/main/org/jboss/deployment: plugin and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-04-28 18:42:45 -0400 (Mon, 28 Apr 2008)
New Revision: 72802

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
   trunk/server/src/main/org/jboss/deployment/plugin/MappedDeploymentEndpointResolver.java
Log:
JBCTS-773, fix path based links

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-04-28 22:22:44 UTC (rev 72801)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-04-28 22:42:45 UTC (rev 72802)
@@ -767,17 +767,18 @@
    private static String getJndiName(JBossEnterpriseBeanMetaData beanMD, boolean isLocal,
          DeploymentUnit unit)
    {
-      String jndiName = null;
-      if (isLocal)
+      String jndiName = beanMD.getMappedName();
+      if (isLocal && jndiName == null)
       {
          // Validate that there is a local home associated with this bean
-         jndiName = beanMD.determineLocalJndiName();
+         if(jndiName == null)
+            jndiName = beanMD.determineLocalJndiName();
          if (jndiName == null)
          {
             log.warn("LocalHome jndi name requested for: '" +beanMD.getEjbName() + "' but there is no LocalHome class");
          }
       }
-      else
+      else if(jndiName == null)
       {
          // TODO, this is a mess that should be simply from the metadata
          ClassLoader loader = unit.getClassLoader();
@@ -807,6 +808,8 @@
                   jndiName = policy.getDefaultLocalHomeJndiName(unitSummary);
                else if(sbeanMD.getLocal() != null)
                   jndiName = policy.getDefaultLocalJndiName(unitSummary);
+               else
+                  jndiName = policy.getJndiName(unitSummary);
             }
             else if(policy != null)
             {

Modified: trunk/server/src/main/org/jboss/deployment/plugin/MappedDeploymentEndpointResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/plugin/MappedDeploymentEndpointResolver.java	2008-04-28 22:22:44 UTC (rev 72801)
+++ trunk/server/src/main/org/jboss/deployment/plugin/MappedDeploymentEndpointResolver.java	2008-04-28 22:42:45 UTC (rev 72802)
@@ -109,6 +109,10 @@
                rootPath += deploymentPaths + "/";
             unitPath = rootPath + path;
          }
+         else
+         {
+            unitPath = path;
+         }
          // 
          // Get the endpoint name
          endpointName = ref.substring(ref.indexOf('#') + 1);