[jboss-cvs] jboss-seam/src/main/org/jboss/seam/interceptors ...

[Gavin King]

  User: gavin   
  Date: 06/10/31 20:52:09

  Modified:    src/main/org/jboss/seam/interceptors  
                        BijectionInterceptor.java RollbackInterceptor.java
  Log:
  insulate core from EJB dependencies JBSEAM-414
  
  Revision  Changes    Path
  1.22      +8 -7      jboss-seam/src/main/org/jboss/seam/interceptors/BijectionInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BijectionInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/BijectionInterceptor.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- BijectionInterceptor.java	11 Oct 2006 21:41:01 -0000	1.21
  +++ BijectionInterceptor.java	1 Nov 2006 01:52:09 -0000	1.22
  @@ -1,12 +1,13 @@
  -//$Id: BijectionInterceptor.java,v 1.21 2006/10/11 21:41:01 gavin Exp $
  +//$Id: BijectionInterceptor.java,v 1.22 2006/11/01 01:52:09 gavin Exp $
   package org.jboss.seam.interceptors;
   
  +import static org.jboss.seam.util.EJB.POST_ACTIVATE;
  +import static org.jboss.seam.util.EJB.POST_CONSTRUCT;
  +import static org.jboss.seam.util.EJB.PRE_DESTROY;
  +import static org.jboss.seam.util.EJB.PRE_PASSIVATE;
  +
   import java.lang.reflect.Method;
   
  -import javax.annotation.PostConstruct;
  -import javax.annotation.PreDestroy;
  -import javax.ejb.PostActivate;
  -import javax.ejb.PrePassivate;
   import javax.interceptor.AroundInvoke;
   import javax.interceptor.InvocationContext;
   
  @@ -32,8 +33,8 @@
      {
         return method==null || //EJB 3 JavaDoc says InvocationContext.getMethod() returns null for lifecycle callbacks!
               method.isAnnotationPresent(Create.class) || method.isAnnotationPresent(Destroy.class) ||
  -            method.isAnnotationPresent(PostConstruct.class) || method.isAnnotationPresent(PreDestroy.class) ||
  -            method.isAnnotationPresent(PrePassivate.class) || method.isAnnotationPresent(PostActivate.class);
  +            method.isAnnotationPresent(POST_CONSTRUCT) || method.isAnnotationPresent(PRE_DESTROY) ||
  +            method.isAnnotationPresent(PRE_PASSIVATE) || method.isAnnotationPresent(POST_ACTIVATE);
      }
   
      @AroundInvoke
  
  
  
  1.12      +8 -5      jboss-seam/src/main/org/jboss/seam/interceptors/RollbackInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RollbackInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/RollbackInterceptor.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- RollbackInterceptor.java	23 Oct 2006 18:09:29 -0000	1.11
  +++ RollbackInterceptor.java	1 Nov 2006 01:52:09 -0000	1.12
  @@ -1,11 +1,13 @@
  -//$Id: RollbackInterceptor.java,v 1.11 2006/10/23 18:09:29 gavin Exp $
  +//$Id: RollbackInterceptor.java,v 1.12 2006/11/01 01:52:09 gavin Exp $
   package org.jboss.seam.interceptors;
   
  +import static org.jboss.seam.util.EJB.APPLICATION_EXCEPTION;
  +import static org.jboss.seam.util.EJB.rollback;
  +
   import java.lang.reflect.Method;
   import java.util.Arrays;
   import java.util.List;
   
  -import javax.ejb.ApplicationException;
   import javax.interceptor.AroundInvoke;
   import javax.interceptor.InvocationContext;
   
  @@ -13,6 +15,7 @@
   import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.Outcome;
   import org.jboss.seam.annotations.Rollback;
  +import org.jboss.seam.util.EJB;
   import org.jboss.seam.util.Transactions;
   
   /**
  @@ -41,7 +44,7 @@
               {
                  //For session beans, we have to assume it might be
                  //a CMT, so use the EJBContext
  -               Transactions.getEJBContext().setRollbackOnly();
  +               EJB.getEJBContext().setRollbackOnly();
               }
            }
            return result;
  @@ -77,8 +80,8 @@
      private boolean isRollbackRequired(Exception e)
      {
         Class<? extends Exception> clazz = e.getClass();
  -      return ( (e instanceof RuntimeException) && !clazz.isAnnotationPresent(ApplicationException.class) ) || 
  -            ( clazz.isAnnotationPresent(ApplicationException.class) && clazz.getAnnotation(ApplicationException.class).rollback() );
  +      return ( (e instanceof RuntimeException) && !clazz.isAnnotationPresent(APPLICATION_EXCEPTION) ) || 
  +            ( clazz.isAnnotationPresent(APPLICATION_EXCEPTION) && rollback( clazz.getAnnotation(APPLICATION_EXCEPTION) ) );
      }
      
   }