[jboss-cvs] JBossAS SVN: r109420 - 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-23 06:57:59 -0500 (Tue, 23 Nov 2010)
New Revision: 109420

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 Reverting r109324. Requires a bit more impact analysis

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-23 11:55:20 UTC (rev 109419)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/EntityMetaData.java	2010-11-23 11:57:59 UTC (rev 109420)
@@ -25,7 +25,6 @@
 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;
@@ -224,34 +223,7 @@
    {
       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-23 11:55:20 UTC (rev 109419)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/SessionMetaData.java	2010-11-23 11:57:59 UTC (rev 109420)
@@ -23,7 +23,6 @@
 
 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;
@@ -139,34 +138,7 @@
    {
       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-23 11:55:20 UTC (rev 109419)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java	2010-11-23 11:57:59 UTC (rev 109420)
@@ -609,7 +609,7 @@
    @Override
    protected String getDefaultInvokerJndiName()
    {
-      return getJndiName();
+      return determineJndiName();
    }
 
    /**