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

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

Author: alex.loubyansky at jboss.com
Date: 2008-08-13 04:38:46 -0400 (Wed, 13 Aug 2008)
New Revision: 77002

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/JBossSessionBeanMetaData.java
Log:
JBMETA-93

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-08-13 07:52:04 UTC (rev 77001)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEntityBeanMetaData.java	2008-08-13 08:38:46 UTC (rev 77002)
@@ -555,7 +555,10 @@
     * Determine the jndi name
     * 
     * @return the jndi name
+    * @deprecated JBMETA-68
     */
+   @Deprecated
+   @Override
    public String determineJndiName()
    {
       if (jndiName != null)
@@ -567,7 +570,27 @@
       return getEjbName();
    }
 
+   /**
+    * Determine the localJndiName.
+    * 
+    * @return the localJndiName.
+    * @deprecated JBMETA-68
+    */
+   @Deprecated
    @Override
+   public String determineLocalJndiName()
+   {
+      if (getLocalJndiName() != null)
+         return getLocalJndiName();
+      
+      if(home == null && jndiName != null)
+         return jndiName;
+      
+      String ejbName = getEjbName();
+      return "local/" + ejbName + '@' + System.identityHashCode(ejbName);
+   }
+
+   @Override
    public String getContainerObjectNameJndiName()
    {
       boolean remote = false;

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-08-13 07:52:04 UTC (rev 77001)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossSessionBeanMetaData.java	2008-08-13 08:38:46 UTC (rev 77002)
@@ -643,7 +643,27 @@
       return name;
    }
    
+   /**
+    * Determine the localJndiName.
+    * 
+    * @return the localJndiName.
+    * @deprecated JBMETA-68
+    */
+   @Deprecated
    @Override
+   public String determineLocalJndiName()
+   {
+      if (getLocalJndiName() != null)
+         return getLocalJndiName();
+      
+      if(home == null && jndiName != null)
+         return jndiName;
+      
+      String ejbName = getEjbName();
+      return "local/" + ejbName + '@' + System.identityHashCode(ejbName);
+   }
+
+   @Override
    public String getContainerObjectNameJndiName()
    {
       boolean remote = false;