[jboss-cvs] JBossAS SVN: r73473 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: ejb/jboss and 1 other directory.

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

Author: ALRubinger
Date: 2008-05-18 02:20:19 -0400 (Sun, 18 May 2008)
New Revision: 73473

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
Log:
[JBMETA-42] Fixes for default local and remote JNDI Bindings

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java	2008-05-18 05:57:04 UTC (rev 73472)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/BeanMetaData.java	2008-05-18 06:20:19 UTC (rev 73473)
@@ -529,7 +529,7 @@
       String bindingName = binding.getJndiName();
       if(bindingName == null)
       {
-         bindingName = isMessageDriven() ? getEjbName() : getJndiName();
+         bindingName = this.getEjbName();
       }
       return bindingName;
    }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-05-18 05:57:04 UTC (rev 73472)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-05-18 06:20:19 UTC (rev 73473)
@@ -559,8 +559,7 @@
          return localJndiName;
       
       String ejbName = getEjbName();
-      // Generate a unique name based on ejbName + identityHashCode
-      return "local/" + ejbName + '@' + System.identityHashCode(ejbName);
+      return ejbName + "/local";
    }
 
    /**

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-05-18 05:57:04 UTC (rev 73472)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-05-18 06:20:19 UTC (rev 73473)
@@ -628,16 +628,14 @@
     */
    public String determineJndiName()
    {
-      String name = getHomeJndiName();
-      if (name == null)
-         name = jndiName;
+      String name = jndiName;
       if(name == null)
          name = getMappedName();
       if(name == null && getRemoteBindings() != null && getRemoteBindings().size() > 0)
          name = getRemoteBindings().get(0).getJndiName();
       // TODO: JBMETA-6, this should be the policy with ejb2 metadata defaulting to an ejb-name policy
       if(name == null)
-         name = getEjbName();
+         name = getEjbName() + "/remote";
       return name;
    }