[jboss-cvs] JBossAS SVN: r72635 - projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss.

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

Author: scott.stark at jboss.org
Date: 2008-04-23 16:30:52 -0400 (Wed, 23 Apr 2008)
New Revision: 72635

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/JBossEntityBeanMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java
Log:
Add a determineJndiName(boolean includeDefault) that allows one to determine if a non-default jndi name has been set

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-04-23 20:07:12 UTC (rev 72634)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-04-23 20:30:52 UTC (rev 72635)
@@ -39,7 +39,6 @@
 import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.spec.EntityBeanMetaData;
 import org.jboss.metadata.ejb.spec.ExcludeListMetaData;
-import org.jboss.metadata.ejb.spec.InterceptorBindingMetaData;
 import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
 import org.jboss.metadata.ejb.spec.MethodInterfaceType;
 import org.jboss.metadata.ejb.spec.MethodMetaData;
@@ -541,6 +540,7 @@
     * 
     * @return the localJndiName.
     */
+   @XmlTransient
    public String determineLocalJndiName()
    {
       if (localJndiName != null)
@@ -552,6 +552,24 @@
    }
 
    /**
+    * Determine the base jndi name of the ejb. Must be overriden by subclasses
+    * to provide meaningful behavior. This impl returns null unless includeDefault
+    * is true in which case is return the getEjbName() value.
+    * 
+    * @param includeDefault - should a default jndi name be used/generated if
+    *    an explicit name has not been set.
+    * @return the base jndi for the ejb. May be null if the bean type does
+    *    not need/support a jndi name.
+    */
+   public String determineJndiName(boolean includeDefault)
+   {
+      String name = null;
+      if(includeDefault == true)
+         name = this.getEjbName();
+      return name;
+   }
+
+   /**
     * Determine the container jndi name used in the object name
     * 
     * @return the jndi name suitable for use in the object name

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java	2008-04-23 20:07:12 UTC (rev 72634)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java	2008-04-23 20:30:52 UTC (rev 72635)
@@ -566,6 +566,22 @@
          return mapped;
       return getEjbName();
    }
+   /**
+    * Determines the base jndi name by looking at the following in order:
+    * 1. getJndiName()
+    * 2. getMappedName()
+    * 3. getEjbName() if includeDefault is true.
+    */
+   @Override
+   public String determineJndiName(boolean includeDefault)
+   {
+      String name = getJndiName();
+      if(name == null)
+         name = getMappedName();
+      if(name == null && includeDefault)
+         name = getEjbName();
+      return name;
+   }
 
    @Override
    public String getContainerObjectNameJndiName()

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-04-23 20:07:12 UTC (rev 72634)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-04-23 20:30:52 UTC (rev 72635)
@@ -640,6 +640,29 @@
          name = getEjbName();
       return name;
    }
+   
+   /**
+    * Determines the base jndi name by looking at the following in order:
+    * 1. getHomeJndiName()
+    * 2. getJndiName()
+    * 3. getMappedName()
+    * 4. getRemoteBindings().get(0).getJndiName();
+    * 5. getEjbName() if includeDefault is true.
+    */
+   @Override
+   public String determineJndiName(boolean includeDefault)
+   {
+      String name = getHomeJndiName();
+      if (name == null)
+         name = getJndiName();
+      if(name == null)
+         name = getMappedName();
+      if(name == null && getRemoteBindings() != null && getRemoteBindings().size() > 0)
+         name = getRemoteBindings().get(0).getJndiName();
+      if(name == null && includeDefault)
+         name = getEjbName();
+      return name;
+   }
 
    @Override
    public String getContainerObjectNameJndiName()