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

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

Author: jaikiran
Date: 2010-11-14 23:56:42 -0500 (Sun, 14 Nov 2010)
New Revision: 109324

Modified:
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/EntityMetaData.java
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/SessionMetaData.java
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java
Log:
JBMETA-312 Use determineResolvedJndiName in getInvokerBinding for EJB2.x session and entity bean metadata

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/EntityMetaData.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/EntityMetaData.java	2010-11-15 01:00:38 UTC (rev 109323)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/EntityMetaData.java	2010-11-15 04:56:42 UTC (rev 109324)
@@ -25,6 +25,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.jboss.metadata.ejb.jboss.InvokerBindingMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
 import org.jboss.metadata.ejb.spec.CMPFieldsMetaData;
@@ -223,7 +224,34 @@
    {
       return getDelegate().determineJndiName();
    }
+   
+   /**
+    * Get an invoker binding
+    * 
+    * @param invokerName the invoker proxy binding name
+    * @return the jndi name
+    */
+   @Override
+   public String getInvokerBinding(String invokerName)
+   {
+      InvokerBindingMetaData binding = getDelegate().determineInvokerBinding(invokerName);
+      String bindingName = binding.getJndiName();
+      if(bindingName == null || bindingName.length() == 0)
+      {
+         String home = this.getHome();
+         if (home == null || home.trim().isEmpty())
+         {
+            bindingName = this.getJndiName();
+         }
+         else
+         {
+            bindingName = this.getDelegate().determineResolvedJndiName(home);
+         }
+      }
+      return bindingName;
+   }
 
+
    @Override
    public boolean isCallByValue()
    {

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/SessionMetaData.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/SessionMetaData.java	2010-11-15 01:00:38 UTC (rev 109323)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/SessionMetaData.java	2010-11-15 04:56:42 UTC (rev 109324)
@@ -23,6 +23,7 @@
 
 import java.util.Iterator;
 
+import org.jboss.metadata.ejb.jboss.InvokerBindingMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
@@ -138,7 +139,34 @@
    {
       return getDelegate().determineJndiName();
    }
+   
+   /**
+    * Get an invoker binding
+    * 
+    * @param invokerName the invoker proxy binding name
+    * @return the jndi name
+    */
+   @Override
+   public String getInvokerBinding(String invokerName)
+   {
+      InvokerBindingMetaData binding = getDelegate().determineInvokerBinding(invokerName);
+      String bindingName = binding.getJndiName();
+      if(bindingName == null || bindingName.length() == 0)
+      {
+         String home = this.getHome();
+         if (home == null || home.trim().isEmpty())
+         {
+            bindingName = this.getJndiName();
+         }
+         else
+         {
+            bindingName = this.getDelegate().determineResolvedJndiName(home);
+         }
+      }
+      return bindingName;
+   }
 
+
    @Override
    public boolean isCallByValue()
    {

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java	2010-11-15 01:00:38 UTC (rev 109323)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java	2010-11-15 04:56:42 UTC (rev 109324)
@@ -609,7 +609,7 @@
    @Override
    protected String getDefaultInvokerJndiName()
    {
-      return determineJndiName();
+      return getJndiName();
    }
 
    /**