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

Gavin King gavin.king at jboss.com
Wed Jul 26 18:08:09 EDT 2006


  User: gavin   
  Date: 06/07/26 18:08:09

  Modified:    src/main/org/jboss/seam/interceptors        
                        BusinessProcessInterceptor.java
                        ConversationInterceptor.java
                        ConversationalInterceptor.java
                        ExceptionInterceptor.java RemoveInterceptor.java
                        RollbackInterceptor.java
                        TransactionInterceptor.java
                        ValidationInterceptor.java
  Log:
  replace @Within and @Around
  
  Revision  Changes    Path
  1.39      +3 -3      jboss-seam/src/main/org/jboss/seam/interceptors/BusinessProcessInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BusinessProcessInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/BusinessProcessInterceptor.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -b -r1.38 -r1.39
  --- BusinessProcessInterceptor.java	30 Jun 2006 22:50:07 -0000	1.38
  +++ BusinessProcessInterceptor.java	26 Jul 2006 22:08:09 -0000	1.39
  @@ -18,10 +18,10 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.jboss.seam.annotations.Around;
   import org.jboss.seam.annotations.BeginTask;
   import org.jboss.seam.annotations.CreateProcess;
   import org.jboss.seam.annotations.EndTask;
  +import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.ResumeProcess;
   import org.jboss.seam.annotations.StartTask;
   import org.jboss.seam.core.BusinessProcess;
  @@ -33,9 +33,9 @@
    * Interceptor which handles interpretation of jBPM-related annotations.
    *
    * @author <a href="mailto:steve at hibernate.org">Steve Ebersole </a>
  - * @version $Revision: 1.38 $
  + * @version $Revision: 1.39 $
    */
  - at Around({ValidationInterceptor.class, BijectionInterceptor.class, OutcomeInterceptor.class})
  + at Interceptor(around={ValidationInterceptor.class, BijectionInterceptor.class, OutcomeInterceptor.class})
   public class BusinessProcessInterceptor extends AbstractInterceptor
   {
      
  
  
  
  1.47      +4 -5      jboss-seam/src/main/org/jboss/seam/interceptors/ConversationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ConversationInterceptor.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -b -r1.46 -r1.47
  --- ConversationInterceptor.java	13 Jul 2006 17:04:40 -0000	1.46
  +++ ConversationInterceptor.java	26 Jul 2006 22:08:09 -0000	1.47
  @@ -1,4 +1,4 @@
  -//$Id: ConversationInterceptor.java,v 1.46 2006/07/13 17:04:40 gavin Exp $
  +//$Id: ConversationInterceptor.java,v 1.47 2006/07/26 22:08:09 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -9,14 +9,13 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.jboss.seam.annotations.Around;
   import org.jboss.seam.annotations.Begin;
   import org.jboss.seam.annotations.BeginTask;
   import org.jboss.seam.annotations.End;
   import org.jboss.seam.annotations.EndTask;
   import org.jboss.seam.annotations.FlushModeType;
  +import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.StartTask;
  -import org.jboss.seam.annotations.Within;
   import org.jboss.seam.core.Conversation;
   import org.jboss.seam.core.ConversationEntry;
   import org.jboss.seam.core.Interpolator;
  @@ -29,8 +28,8 @@
    * 
    * @author Gavin King
    */
  - at Around({ValidationInterceptor.class, BijectionInterceptor.class, OutcomeInterceptor.class})
  - at Within(BusinessProcessInterceptor.class)
  + at Interceptor(around={ValidationInterceptor.class, BijectionInterceptor.class, OutcomeInterceptor.class},
  +             within=BusinessProcessInterceptor.class)
   public class ConversationInterceptor extends AbstractInterceptor
   {
   
  
  
  
  1.4       +3 -3      jboss-seam/src/main/org/jboss/seam/interceptors/ConversationalInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationalInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ConversationalInterceptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ConversationalInterceptor.java	30 Jun 2006 18:54:02 -0000	1.3
  +++ ConversationalInterceptor.java	26 Jul 2006 22:08:09 -0000	1.4
  @@ -1,4 +1,4 @@
  -//$Id: ConversationalInterceptor.java,v 1.3 2006/06/30 18:54:02 gavin Exp $
  +//$Id: ConversationalInterceptor.java,v 1.4 2006/07/26 22:08:09 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -10,12 +10,12 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.jboss.seam.annotations.Around;
   import org.jboss.seam.annotations.Begin;
   import org.jboss.seam.annotations.BeginTask;
   import org.jboss.seam.annotations.Conversational;
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Destroy;
  +import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.StartTask;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.core.FacesMessages;
  @@ -27,7 +27,7 @@
    * 
    * @author Gavin King
    */
  - at Around({ValidationInterceptor.class, BijectionInterceptor.class, OutcomeInterceptor.class, BusinessProcessInterceptor.class})
  + at Interceptor(around={ValidationInterceptor.class, BijectionInterceptor.class, OutcomeInterceptor.class, BusinessProcessInterceptor.class})
   public class ConversationalInterceptor extends AbstractInterceptor
   {
   
  
  
  
  1.5       +3 -3      jboss-seam/src/main/org/jboss/seam/interceptors/ExceptionInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExceptionInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ExceptionInterceptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ExceptionInterceptor.java	13 Jul 2006 21:08:45 -0000	1.4
  +++ ExceptionInterceptor.java	26 Jul 2006 22:08:09 -0000	1.5
  @@ -1,4 +1,4 @@
  -//$Id: ExceptionInterceptor.java,v 1.4 2006/07/13 21:08:45 nrichards Exp $
  +//$Id: ExceptionInterceptor.java,v 1.5 2006/07/26 22:08:09 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.util.Map;
  @@ -9,8 +9,8 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.jboss.seam.annotations.Around;
   import org.jboss.seam.annotations.HttpError;
  +import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.Redirect;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
  @@ -24,7 +24,7 @@
    * 
    * @author Gavin King
    */
  - at Around({ConversationalInterceptor.class, RemoveInterceptor.class, BijectionInterceptor.class})
  + at Interceptor(around={ConversationalInterceptor.class, RemoveInterceptor.class, BijectionInterceptor.class})
   public class ExceptionInterceptor extends AbstractInterceptor
   {
   
  
  
  
  1.13      +5 -5      jboss-seam/src/main/org/jboss/seam/interceptors/RemoveInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RemoveInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/RemoveInterceptor.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- RemoveInterceptor.java	15 May 2006 09:23:13 -0000	1.12
  +++ RemoveInterceptor.java	26 Jul 2006 22:08:09 -0000	1.13
  @@ -1,18 +1,18 @@
  -//$Id: RemoveInterceptor.java,v 1.12 2006/05/15 09:23:13 theute Exp $
  +//$Id: RemoveInterceptor.java,v 1.13 2006/07/26 22:08:09 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
   import java.rmi.RemoteException;
   
  -import javax.interceptor.AroundInvoke;
  -import javax.interceptor.InvocationContext;
   import javax.ejb.ApplicationException;
   import javax.ejb.Remove;
  +import javax.interceptor.AroundInvoke;
  +import javax.interceptor.InvocationContext;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.jboss.seam.ComponentType;
  -import org.jboss.seam.annotations.Around;
  +import org.jboss.seam.annotations.Interceptor;
   
   /**
    * Removes components from the Seam context after invocation
  @@ -20,7 +20,7 @@
    * 
    * @author Gavin King
    */
  - at Around({ValidationInterceptor.class, BijectionInterceptor.class, ConversationInterceptor.class})
  + at Interceptor(around={ValidationInterceptor.class, BijectionInterceptor.class, ConversationInterceptor.class})
   public class RemoveInterceptor extends AbstractInterceptor
   {
       
  
  
  
  1.8       +3 -3      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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- RollbackInterceptor.java	22 May 2006 03:13:50 -0000	1.7
  +++ RollbackInterceptor.java	26 Jul 2006 22:08:09 -0000	1.8
  @@ -1,4 +1,4 @@
  -//$Id: RollbackInterceptor.java,v 1.7 2006/05/22 03:13:50 gavin Exp $
  +//$Id: RollbackInterceptor.java,v 1.8 2006/07/26 22:08:09 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.util.Arrays;
  @@ -8,7 +8,7 @@
   import javax.interceptor.InvocationContext;
   
   import org.jboss.seam.ComponentType;
  -import org.jboss.seam.annotations.Around;
  +import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.Outcome;
   import org.jboss.seam.annotations.Rollback;
   import org.jboss.seam.util.Transactions;
  @@ -18,7 +18,7 @@
    * 
    * @author Gavin King
    */
  - at Around(OutcomeInterceptor.class)
  + at Interceptor(around=OutcomeInterceptor.class)
   public class RollbackInterceptor extends AbstractInterceptor 
   {
      
  
  
  
  1.5       +2 -2      jboss-seam/src/main/org/jboss/seam/interceptors/TransactionInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransactionInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/TransactionInterceptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- TransactionInterceptor.java	15 May 2006 09:23:13 -0000	1.4
  +++ TransactionInterceptor.java	26 Jul 2006 22:08:09 -0000	1.5
  @@ -8,11 +8,11 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.jboss.seam.annotations.Around;
  +import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.Transactional;
   import org.jboss.seam.util.Transactions;
   
  - at Around({RollbackInterceptor.class, BusinessProcessInterceptor.class, ConversationInterceptor.class})
  + at Interceptor(around={RollbackInterceptor.class, BusinessProcessInterceptor.class, ConversationInterceptor.class})
   public class TransactionInterceptor extends AbstractInterceptor
   {
      private static final Log log = LogFactory.getLog(TransactionInterceptor.class);
  
  
  
  1.19      +3 -3      jboss-seam/src/main/org/jboss/seam/interceptors/ValidationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ValidationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ValidationInterceptor.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- ValidationInterceptor.java	12 Jun 2006 19:47:00 -0000	1.18
  +++ ValidationInterceptor.java	26 Jul 2006 22:08:09 -0000	1.19
  @@ -1,4 +1,4 @@
  -//$Id: ValidationInterceptor.java,v 1.18 2006/06/12 19:47:00 gavin Exp $
  +//$Id: ValidationInterceptor.java,v 1.19 2006/07/26 22:08:09 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -14,7 +14,7 @@
   import org.hibernate.validator.InvalidValue;
   import org.jboss.seam.Component;
   import org.jboss.seam.annotations.IfInvalid;
  -import org.jboss.seam.annotations.Within;
  +import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.core.FacesMessages;
   
   /**
  @@ -25,7 +25,7 @@
    * 
    * @author Gavin King
    */
  - at Within({BijectionInterceptor.class, OutcomeInterceptor.class})
  + at Interceptor(within={BijectionInterceptor.class, OutcomeInterceptor.class})
   public class ValidationInterceptor extends AbstractInterceptor
   {
   
  
  
  



More information about the jboss-cvs-commits mailing list