[jboss-cvs] jboss-ejb3/src/main/org/jboss/ejb3/injection ...

[Carlo de W. <ca...@ne...>]

  User: wolfc   
  Date: 06/07/06 04:35:24

  Modified:    src/main/org/jboss/ejb3/injection  EJBHandler.java
  Log:
  EJBTHREE-620: removed java.ejb.EJB.businessInterface
  
  Revision  Changes    Path
  1.37      +12 -14    jboss-ejb3/src/main/org/jboss/ejb3/injection/EJBHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EJBHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/injection/EJBHandler.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- EJBHandler.java	5 Jul 2006 10:51:36 -0000	1.36
  +++ EJBHandler.java	6 Jul 2006 08:35:24 -0000	1.37
  @@ -47,7 +47,7 @@
    * Searches bean class for all @Inject and create Injectors
    *
    * @author <a href="mailto:bi...@jb...">Bill Burke</a>
  - * @version $Revision: 1.36 $
  + * @version $Revision: 1.37 $
    */
   public class EJBHandler
   {
  @@ -462,12 +462,10 @@
         }
      }
   
  -   private static Class getBusinessInterface(EJB ref, Class defaultInterface)
  +   private static Class getBeanInterface(EJB ref, Class defaultInterface)
      {
         if(!ref.beanInterface().equals(Object.class))
            return ref.beanInterface();
  -      if(!ref.businessInterface().equals(Object.class))
  -         return ref.businessInterface();
         return defaultInterface;
      }
      
  @@ -483,22 +481,22 @@
         if (ref.beanName().equals("") && memberType == null)
            throw new RuntimeException("For deployment " + container.getIdentifier() + "not enough information for @EJB.  Please fill out the beanName and/or businessInterface attributes");
   
  -      Class businessInterface = getBusinessInterface(ref, memberType);
  +      Class beanInterface = getBeanInterface(ref, memberType);
   
         if (ref.beanName().equals(""))
         {
            try
            {
  -            rtn = (EJBContainer)container.resolveEjbContainer(businessInterface);
  +            rtn = (EJBContainer)container.resolveEjbContainer(beanInterface);
            }
            catch (NameNotFoundException e)
            {
  -            log.warn("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ") " + e.getMessage());
  +            log.warn("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + beanInterface.getName() + ") " + e.getMessage());
            }
         }
         else
         {
  -         rtn = (EJBContainer)container.resolveEjbContainer(ref.beanName(), businessInterface);
  +         rtn = (EJBContainer)container.resolveEjbContainer(ref.beanName(), beanInterface);
         }
   
         return rtn;
  @@ -516,29 +514,29 @@
         if (ref.beanName().equals("") && memberType == null)
            throw new RuntimeException("For deployment " + container.getIdentifier() + "not enough information for @EJB.  Please fill out the beanName and/or businessInterface attributes");
   
  -      Class businessInterface = getBusinessInterface(ref, memberType);
  +      Class beanInterface = getBeanInterface(ref, memberType);
   
         if (ref.beanName().equals(""))
         {
            try
            {
  -            jndiName = container.getEjbJndiName(businessInterface);
  +            jndiName = container.getEjbJndiName(beanInterface);
            }
            catch (NameNotFoundException e)
            {
  -            throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ") " + e.getMessage());
  +            throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + beanInterface.getName() + ") " + e.getMessage());
            }
            if (jndiName == null)
            {
  -            throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + businessInterface.getName() + ")");
  +            throw new RuntimeException("For deployment " + container.getIdentifier() + " could not find jndi binding based on interface only for @EJB(" + beanInterface.getName() + ")");
            }
         }
         else
         {
  -         jndiName = container.getEjbJndiName(ref.beanName(), businessInterface);
  +         jndiName = container.getEjbJndiName(ref.beanName(), beanInterface);
            if (jndiName == null)
            {
  -            throw new RuntimeException("For EJB " + container.getIdentifier() + "could not find jndi binding based on beanName and business interface for @EJB(" + ref.beanName() + ", " + businessInterface.getName() + ")");
  +            throw new RuntimeException("For EJB " + container.getIdentifier() + "could not find jndi binding based on beanName and business interface for @EJB(" + ref.beanName() + ", " + beanInterface.getName() + ")");
            }
         }