[jboss-cvs] jboss-ejb3/src/main/org/jboss/ejb3 EJBContainer.java EjbTimerUtil.java

[Kabir K. <ka...@us...>]

  User: kabkhan 
  Date: 04/12/19 08:55:52

  Modified:    src/main/org/jboss/ejb3 EJBContainer.java EjbTimerUtil.java
  Log:
  Use @Timeout annotation instead of ejbTimeout
  
  Revision  Changes    Path
  1.7       +3 -2      jboss-ejb3/src/main/org/jboss/ejb3/EJBContainer.java
  
  Index: EJBContainer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/EJBContainer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EJBContainer.java	15 Dec 2004 21:40:57 -0000	1.6
  +++ EJBContainer.java	19 Dec 2004 16:55:52 -0000	1.7
  @@ -21,6 +21,7 @@
   
   import javax.ejb.PostConstruct;
   import javax.ejb.PreDestroy;
  +import javax.ejb.Timeout;
   import javax.management.MalformedObjectNameException;
   import javax.management.ObjectName;
   import javax.naming.Context;
  @@ -33,7 +34,7 @@
    * Comment
    *
    * @author <a href="mailto:bi...@jb...">Bill Burke</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public abstract class EJBContainer extends ClassContainer implements Container
   {
  @@ -216,6 +217,6 @@
   
      protected Class[] getHandledCallbacks()
      {
  -      return new Class[]{PostConstruct.class, PreDestroy.class};
  +      return new Class[]{PostConstruct.class, PreDestroy.class, Timeout.class};
      }
   }
  
  
  
  1.6       +1 -8      jboss-ejb3/src/main/org/jboss/ejb3/EjbTimerUtil.java
  
  Index: EjbTimerUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/EjbTimerUtil.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EjbTimerUtil.java	10 Nov 2004 20:18:49 -0000	1.5
  +++ EjbTimerUtil.java	19 Dec 2004 16:55:52 -0000	1.6
  @@ -20,7 +20,7 @@
    * Comment
    *
    * @author <a href="mailto:bi...@jb...">Bill Burke</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class EjbTimerUtil
   {
  @@ -51,11 +51,4 @@
            throw new EJBException("Could not remove timer service", e);
         }
      }
  -
  -   public static Method getEjbTimeoutMethod(Class beanClass) throws NoSuchMethodException
  -   {
  -      Class[] signature = {javax.ejb.Timer.class};
  -      return beanClass.getMethod("ejbTimeout", signature);
  -   }
  -
   }