[jboss-cvs] JBossAS SVN: r99311 - in projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss: jndi/resolver/spi and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jan 12 14:08:23 EST 2010


Author: jaikiran
Date: 2010-01-12 14:08:22 -0500 (Tue, 12 Jan 2010)
New Revision: 99311

Removed:
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/spi/EnterpriseBeanJNDINameResolver.java
Modified:
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/impl/JNDIPolicyBasedSessionBean31JNDINameResolver.java
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/impl/JNDIPolicyBasedSessionBeanJNDINameResolver.java
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JavaEE6JndiBindingPolicy.java
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/JbossEnterpriseBeanJndiNameResolver.java
Log:
JBMETA-241 Refactoring the work in progress jndi name resolvers

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/impl/JNDIPolicyBasedSessionBean31JNDINameResolver.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/impl/JNDIPolicyBasedSessionBean31JNDINameResolver.java	2010-01-12 18:36:18 UTC (rev 99310)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/impl/JNDIPolicyBasedSessionBean31JNDINameResolver.java	2010-01-12 19:08:22 UTC (rev 99311)
@@ -72,7 +72,24 @@
       // Get the no-interface view jndi name from the jndi binding policy
       EjbDeploymentSummary ejbDeploymentSummary = this.getEjbDeploymentSummary(metadata);
       DefaultJndiBindingPolicy policy = this.getJNDIBindingPolicy(metadata);
-      return policy.getJndiName(ejbDeploymentSummary, KnownInterfaces.NO_INTERFACE, KnownInterfaceType.NO_INTERFACE);
+      return policy.getJndiName(ejbDeploymentSummary, null, KnownInterfaceType.NO_INTERFACE);
    }
 
+   /**
+    * @see org.jboss.metadata.ejb.jboss.jndi.resolver.impl.JNDIPolicyBasedSessionBeanJNDINameResolver#classifyInterface(org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData, java.lang.String)
+    */
+   @Override
+   protected KnownInterfaceType classifyInterface(JBossSessionBeanMetaData metadata, String interfaceName)
+   {
+      KnownInterfaceType ifaceType = super.classifyInterface(metadata, interfaceName);
+      if (ifaceType == null || ifaceType == KnownInterfaceType.UNKNOWN)
+      {
+         if (metadata.getEjbClass() != null && metadata.getEjbClass().equals(interfaceName))
+         {
+            return KnownInterfaceType.NO_INTERFACE;
+         }
+      }
+      return ifaceType;
+   }
+
 }

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/impl/JNDIPolicyBasedSessionBeanJNDINameResolver.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/impl/JNDIPolicyBasedSessionBeanJNDINameResolver.java	2010-01-12 18:36:18 UTC (rev 99310)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/impl/JNDIPolicyBasedSessionBeanJNDINameResolver.java	2010-01-12 19:08:22 UTC (rev 99311)
@@ -271,7 +271,7 @@
       }
 
       // Assume business remote
-      return KnownInterfaceType.BUSINESS_REMOTE;
+      return KnownInterfaceType.UNKNOWN;
    }
 
 }

Deleted: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/spi/EnterpriseBeanJNDINameResolver.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/spi/EnterpriseBeanJNDINameResolver.java	2010-01-12 18:36:18 UTC (rev 99310)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndi/resolver/spi/EnterpriseBeanJNDINameResolver.java	2010-01-12 19:08:22 UTC (rev 99311)
@@ -1,48 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.metadata.ejb.jboss.jndi.resolver.spi;
-
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
-
-/**
- * EnterpriseBeanJNDIResolver
- *
- * A JNDI name resolver capable of resolving JNDI names for an enterprise bean,
- * from the enterprise bean's metadata 
- * 
- * @author Jaikiran Pai
- * @version $Revision: $
- */
-public interface EnterpriseBeanJNDINameResolver
-{
-
-   /**
-    * Returns the JNDI name for the <code>interfaceName</code>, of the enterprise bean
-    * represented by the <code>metadata</code>.
-    * 
-    * Returns null if the JNDI name for the <code>interfaceName</code> cannot be resolved
-    * 
-    * @param iface The fully qualified interface name 
-    * @return
-    */
-   String resolveJNDIName(JBossEnterpriseBeanMetaData metadata, String interfaceName);
-}

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java	2010-01-12 18:36:18 UTC (rev 99310)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/BasicJndiBindingPolicy.java	2010-01-12 19:08:22 UTC (rev 99311)
@@ -176,16 +176,8 @@
                   break;
                   
                case NO_INTERFACE :
-                  if (iface == null)
-                  {
                      // base-name / no-interface
-                     jndiName = baseJndiName + "/" + ifaceType.toSuffix();
-                  }
-                  else
-                  {
-                     // base-name / fully-qualified-bean-class-name  
-                     jndiName = baseJndiName + "/" + iface;
-                  }
+                  jndiName = baseJndiName + "/" + ifaceType.toSuffix();
                   break;
             }
          }

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JavaEE6JndiBindingPolicy.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JavaEE6JndiBindingPolicy.java	2010-01-12 18:36:18 UTC (rev 99310)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JavaEE6JndiBindingPolicy.java	2010-01-12 19:08:22 UTC (rev 99311)
@@ -171,16 +171,8 @@
                   break;
                   
                case NO_INTERFACE:
-                  if (iface == null)
-                  {
                      // base-name ! no-interface
-                     jndiName = baseJndiName + "!" + ifaceType.toSuffix();
-                  }
-                  else
-                  {
-                     // base-name ! fully-qualified-bean-class-name  
-                     jndiName = baseJndiName + "!" + iface;
-                  }
+                  jndiName = baseJndiName + "!" + ifaceType.toSuffix();
                   break;
             }
          }

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/JbossEnterpriseBeanJndiNameResolver.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/JbossEnterpriseBeanJndiNameResolver.java	2010-01-12 18:36:18 UTC (rev 99310)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/spi/JbossEnterpriseBeanJndiNameResolver.java	2010-01-12 19:08:22 UTC (rev 99311)
@@ -25,8 +25,8 @@
 import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 import org.jboss.metadata.ejb.jboss.jndi.resolver.impl.JNDIPolicyBasedEntityBeanJNDINameResolver;
+import org.jboss.metadata.ejb.jboss.jndi.resolver.impl.JNDIPolicyBasedJNDINameResolverFactory;
 import org.jboss.metadata.ejb.jboss.jndi.resolver.impl.JNDIPolicyBasedSessionBeanJNDINameResolver;
-import org.jboss.metadata.ejb.jboss.jndi.resolver.spi.EnterpriseBeanJNDINameResolver;
 import org.jboss.metadata.ejb.jboss.jndi.resolver.spi.EntityBeanJNDINameResolver;
 import org.jboss.metadata.ejb.jboss.jndi.resolver.spi.SessionBeanJNDINameResolver;
 import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.DefaultJNDIBindingPolicyFactory;
@@ -39,7 +39,7 @@
  *
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $
- * @deprecated Since 2.0.0-alpha-5 - Use an implementation of {@link EnterpriseBeanJNDINameResolver} 
+ * @deprecated Since 2.0.0-alpha-5 Use the jndi name resolver (ex: implementation of {@link SessionBeanJNDINameResolver}) instead
  */
 @Deprecated
 public class JbossEnterpriseBeanJndiNameResolver
@@ -57,17 +57,17 @@
    {
 
       DefaultJndiBindingPolicy policy = DefaultJNDIBindingPolicyFactory.getDefaultJNDIBindingPolicy();
-      // This if block is a hack to allow for backward compatibility (the days
-      // when decorated metadata was being used)
       if (md.isSession() || md.isService())
       {
-         SessionBeanJNDINameResolver sessionBeanJNDINameResolver = new JNDIPolicyBasedSessionBeanJNDINameResolver(policy);
-         return sessionBeanJNDINameResolver.resolveJNDIName((JBossSessionBeanMetaData) md, iface);
+         JBossSessionBeanMetaData sessionBean = (JBossSessionBeanMetaData) md;
+         SessionBeanJNDINameResolver sessionBeanJNDINameResolver = JNDIPolicyBasedJNDINameResolverFactory.getJNDINameResolver(sessionBean, policy);
+         return sessionBeanJNDINameResolver.resolveJNDIName(sessionBean, iface);
       }
       else if (md.isEntity())
       {
-         EntityBeanJNDINameResolver entityBeanJNDINameResolver = new JNDIPolicyBasedEntityBeanJNDINameResolver(policy);
-         return entityBeanJNDINameResolver.resolveJNDIName((JBossEntityBeanMetaData) md, iface);
+         JBossEntityBeanMetaData entityBean = (JBossEntityBeanMetaData) md;
+         EntityBeanJNDINameResolver entityBeanJNDINameResolver = JNDIPolicyBasedJNDINameResolverFactory.getJNDINameResolver(entityBean, policy);
+         return entityBeanJNDINameResolver.resolveJNDIName(entityBean, iface);
       }
       return null;
 




More information about the jboss-cvs-commits mailing list