[jboss-cvs] JBossAS SVN: r73273 - trunk/server/src/main/org/jboss/deployment/plugin.

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

Author: scott.stark at jboss.org
Date: 2008-05-12 02:37:06 -0400 (Mon, 12 May 2008)
New Revision: 73273

Modified:
   trunk/server/src/main/org/jboss/deployment/plugin/LegacyEjb3JndiPolicy.java
Log:
Override the binding policy to one more consistent with the current ejb3 bindings.

Modified: trunk/server/src/main/org/jboss/deployment/plugin/LegacyEjb3JndiPolicy.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/plugin/LegacyEjb3JndiPolicy.java	2008-05-12 06:34:42 UTC (rev 73272)
+++ trunk/server/src/main/org/jboss/deployment/plugin/LegacyEjb3JndiPolicy.java	2008-05-12 06:37:06 UTC (rev 73273)
@@ -21,6 +21,7 @@
  */
 package org.jboss.deployment.plugin;
 
+import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DefaultJndiBindingPolicy;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.EjbDeploymentSummary;
@@ -36,17 +37,16 @@
 public class LegacyEjb3JndiPolicy
    implements DefaultJndiBindingPolicy
 {
+   private static Logger log = Logger.getLogger(LegacyEjb3JndiPolicy.class);
    private String baseJndiName;
 
    public LegacyEjb3JndiPolicy()
    {
-      
    }
    public LegacyEjb3JndiPolicy(String baseJndiName)
    {
       this.baseJndiName = baseJndiName;
    }
-
    
    public String getBaseJndiName()
    {
@@ -90,23 +90,32 @@
       if(baseJndiName == null)
          baseJndiName = beanMD.determineJndiName();
       String jndiName = null;
-      if(iface == null)
-         jndiName = getJndiName(summary);
-      else if(KnownInterfaces.isKnownInterface(iface))
+      boolean is3x = beanMD.getJBossMetaData().isEJB3x();
+      switch(ifaceType)
       {
-         // Don't append the iface for ejb2.x homes
-         boolean is3x = beanMD.getJBossMetaData().isEJB3x();
-         if(is3x)
-            jndiName = baseJndiName + "/" + iface;
-         else if(KnownInterfaces.LOCAL_HOME.equalsIgnoreCase(iface))
-            jndiName = summary.getBeanMD().determineLocalJndiName();
-         else
+         case BUSINESS_LOCAL:
+            jndiName = baseJndiName + "/local";
+            break;
+         case BUSINESS_REMOTE:
+            jndiName = baseJndiName + "/remote";
+            break;
+         case LOCAL_HOME:
+            if(is3x)
+               jndiName = baseJndiName + "/localHome";
+            else
+               jndiName = beanMD.determineLocalJndiName();
+            break;
+         case REMOTE_HOME:
+            if(is3x)
+               jndiName = baseJndiName + "/remoteHome";
+            else
+               jndiName = baseJndiName;
+            break;
+         case UNKNOWN:
+            log.warn("UKNOWN iface seen: "+iface);
             jndiName = baseJndiName;
+            break;
       }
-      else
-      {
-         jndiName = baseJndiName + "/" + iface;
-      }
       return jndiName;
    }