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

Gavin King gavin.king at jboss.com
Wed Jun 20 13:45:56 EDT 2007


  User: gavin   
  Date: 07/06/20 13:45:56

  Modified:    src/main/org/jboss/seam/interceptors               
                        AsynchronousInterceptor.java
                        BijectionInterceptor.java
                        BusinessProcessInterceptor.java
                        ConversationInterceptor.java
                        ConversationalInterceptor.java
                        EventInterceptor.java
                        ManagedEntityIdentityInterceptor.java
                        MethodContextInterceptor.java
                        RemoveInterceptor.java RollbackInterceptor.java
                        SecurityInterceptor.java
                        SynchronizationInterceptor.java
                        TransactionInterceptor.java
                        ValidationInterceptor.java
                        WebServiceInterceptor.java
  Log:
  refactored interception annotations
  
  Revision  Changes    Path
  1.17      +2 -2      jboss-seam/src/main/org/jboss/seam/interceptors/AsynchronousInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AsynchronousInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/AsynchronousInterceptor.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- AsynchronousInterceptor.java	20 Jun 2007 03:25:08 -0000	1.16
  +++ AsynchronousInterceptor.java	20 Jun 2007 17:45:56 -0000	1.17
  @@ -1,9 +1,9 @@
   package org.jboss.seam.interceptors;
   
  -import org.jboss.seam.InterceptorType;
   import org.jboss.seam.annotations.AroundInvoke;
   import org.jboss.seam.annotations.Asynchronous;
  -import org.jboss.seam.annotations.Interceptor;
  +import org.jboss.seam.annotations.intercept.Interceptor;
  +import org.jboss.seam.annotations.intercept.InterceptorType;
   import org.jboss.seam.async.AbstractDispatcher;
   import org.jboss.seam.async.Dispatcher;
   import org.jboss.seam.contexts.Contexts;
  
  
  
  1.31      +2 -2      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.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- BijectionInterceptor.java	16 Jun 2007 18:34:28 -0000	1.30
  +++ BijectionInterceptor.java	20 Jun 2007 17:45:56 -0000	1.31
  @@ -1,9 +1,9 @@
  -//$Id: BijectionInterceptor.java,v 1.30 2007/06/16 18:34:28 gavin Exp $
  +//$Id: BijectionInterceptor.java,v 1.31 2007/06/20 17:45:56 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import org.jboss.seam.Component;
   import org.jboss.seam.annotations.AroundInvoke;
  -import org.jboss.seam.annotations.Interceptor;
  +import org.jboss.seam.annotations.intercept.Interceptor;
   import org.jboss.seam.intercept.InvocationContext;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
  
  
  
  1.58      +1 -1      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.57
  retrieving revision 1.58
  diff -u -b -r1.57 -r1.58
  --- BusinessProcessInterceptor.java	19 Jun 2007 19:02:34 -0000	1.57
  +++ BusinessProcessInterceptor.java	20 Jun 2007 17:45:56 -0000	1.58
  @@ -12,9 +12,9 @@
   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.annotations.intercept.Interceptor;
   import org.jboss.seam.bpm.BusinessProcess;
   import org.jboss.seam.core.Expressions;
   import org.jboss.seam.intercept.InvocationContext;
  
  
  
  1.67      +2 -2      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.66
  retrieving revision 1.67
  diff -u -b -r1.66 -r1.67
  --- ConversationInterceptor.java	20 Jun 2007 05:34:32 -0000	1.66
  +++ ConversationInterceptor.java	20 Jun 2007 17:45:56 -0000	1.67
  @@ -1,4 +1,4 @@
  -//$Id: ConversationInterceptor.java,v 1.66 2007/06/20 05:34:32 gavin Exp $
  +//$Id: ConversationInterceptor.java,v 1.67 2007/06/20 17:45:56 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -11,8 +11,8 @@
   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.intercept.Interceptor;
   import org.jboss.seam.core.ConversationEntries;
   import org.jboss.seam.core.ConversationEntry;
   import org.jboss.seam.core.Interpolator;
  
  
  
  1.20      +2 -2      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.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- ConversationalInterceptor.java	19 Jun 2007 19:02:34 -0000	1.19
  +++ ConversationalInterceptor.java	20 Jun 2007 17:45:56 -0000	1.20
  @@ -1,4 +1,4 @@
  -//$Id: ConversationalInterceptor.java,v 1.19 2007/06/19 19:02:34 gavin Exp $
  +//$Id: ConversationalInterceptor.java,v 1.20 2007/06/20 17:45:56 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -10,8 +10,8 @@
   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.annotations.intercept.Interceptor;
   import org.jboss.seam.core.Events;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.intercept.InvocationContext;
  
  
  
  1.7       +1 -1      jboss-seam/src/main/org/jboss/seam/interceptors/EventInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EventInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/EventInterceptor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- EventInterceptor.java	21 May 2007 17:45:04 -0000	1.6
  +++ EventInterceptor.java	20 Jun 2007 17:45:56 -0000	1.7
  @@ -1,8 +1,8 @@
   package org.jboss.seam.interceptors;
   import java.lang.reflect.Method;
   import org.jboss.seam.annotations.AroundInvoke;
  -import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.RaiseEvent;
  +import org.jboss.seam.annotations.intercept.Interceptor;
   import org.jboss.seam.core.Events;
   import org.jboss.seam.intercept.InvocationContext;
   /**
  
  
  
  1.29      +1 -1      jboss-seam/src/main/org/jboss/seam/interceptors/ManagedEntityIdentityInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedEntityIdentityInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ManagedEntityIdentityInterceptor.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- ManagedEntityIdentityInterceptor.java	20 Jun 2007 05:34:32 -0000	1.28
  +++ ManagedEntityIdentityInterceptor.java	20 Jun 2007 17:45:56 -0000	1.29
  @@ -11,7 +11,7 @@
   import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.AroundInvoke;
   import org.jboss.seam.annotations.In;
  -import org.jboss.seam.annotations.Interceptor;
  +import org.jboss.seam.annotations.intercept.Interceptor;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.intercept.InvocationContext;
   import org.jboss.seam.persistence.PersistenceContexts;
  
  
  
  1.4       +1 -1      jboss-seam/src/main/org/jboss/seam/interceptors/MethodContextInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MethodContextInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/MethodContextInterceptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- MethodContextInterceptor.java	21 Dec 2006 02:38:27 -0000	1.3
  +++ MethodContextInterceptor.java	20 Jun 2007 17:45:56 -0000	1.4
  @@ -1,6 +1,6 @@
   package org.jboss.seam.interceptors;
   import org.jboss.seam.annotations.AroundInvoke;
  -import org.jboss.seam.annotations.Interceptor;
  +import org.jboss.seam.annotations.intercept.Interceptor;
   import org.jboss.seam.contexts.Context;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
  
  
  
  1.22      +3 -3      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.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- RemoveInterceptor.java	16 Feb 2007 18:52:08 -0000	1.21
  +++ RemoveInterceptor.java	20 Jun 2007 17:45:56 -0000	1.22
  @@ -1,4 +1,4 @@
  -//$Id: RemoveInterceptor.java,v 1.21 2007/02/16 18:52:08 gavin Exp $
  +//$Id: RemoveInterceptor.java,v 1.22 2007/06/20 17:45:56 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -9,9 +9,9 @@
   
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
  -import org.jboss.seam.InterceptorType;
   import org.jboss.seam.annotations.AroundInvoke;
  -import org.jboss.seam.annotations.Interceptor;
  +import org.jboss.seam.annotations.intercept.Interceptor;
  +import org.jboss.seam.annotations.intercept.InterceptorType;
   import org.jboss.seam.intercept.InvocationContext;
   
   /**
  
  
  
  1.23      +2 -2      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.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- RollbackInterceptor.java	19 Jun 2007 19:02:34 -0000	1.22
  +++ RollbackInterceptor.java	20 Jun 2007 17:45:56 -0000	1.23
  @@ -1,4 +1,4 @@
  -//$Id: RollbackInterceptor.java,v 1.22 2007/06/19 19:02:34 gavin Exp $
  +//$Id: RollbackInterceptor.java,v 1.23 2007/06/20 17:45:56 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import static org.jboss.seam.ComponentType.JAVA_BEAN;
  @@ -7,7 +7,7 @@
   
   import org.jboss.seam.annotations.ApplicationException;
   import org.jboss.seam.annotations.AroundInvoke;
  -import org.jboss.seam.annotations.Interceptor;
  +import org.jboss.seam.annotations.intercept.Interceptor;
   import org.jboss.seam.intercept.InvocationContext;
   import org.jboss.seam.transaction.Transaction;
   import org.jboss.seam.util.JSF;
  
  
  
  1.35      +2 -2      jboss-seam/src/main/org/jboss/seam/interceptors/SecurityInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SecurityInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/SecurityInterceptor.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -b -r1.34 -r1.35
  --- SecurityInterceptor.java	19 Jun 2007 19:02:34 -0000	1.34
  +++ SecurityInterceptor.java	20 Jun 2007 17:45:56 -0000	1.35
  @@ -2,9 +2,9 @@
   
   import java.lang.reflect.Method;
   
  -import org.jboss.seam.InterceptorType;
   import org.jboss.seam.annotations.AroundInvoke;
  -import org.jboss.seam.annotations.Interceptor;
  +import org.jboss.seam.annotations.intercept.Interceptor;
  +import org.jboss.seam.annotations.intercept.InterceptorType;
   import org.jboss.seam.annotations.security.Restrict;
   import org.jboss.seam.intercept.InvocationContext;
   import org.jboss.seam.security.Identity;
  
  
  
  1.8       +3 -3      jboss-seam/src/main/org/jboss/seam/interceptors/SynchronizationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SynchronizationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/SynchronizationInterceptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- SynchronizationInterceptor.java	1 May 2007 06:58:31 -0000	1.7
  +++ SynchronizationInterceptor.java	20 Jun 2007 17:45:56 -0000	1.8
  @@ -1,12 +1,12 @@
  -//$Id: SynchronizationInterceptor.java,v 1.7 2007/05/01 06:58:31 gavin Exp $
  +//$Id: SynchronizationInterceptor.java,v 1.8 2007/06/20 17:45:56 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.util.concurrent.TimeUnit;
   import java.util.concurrent.locks.ReentrantLock;
   
  -import org.jboss.seam.InterceptorType;
   import org.jboss.seam.annotations.AroundInvoke;
  -import org.jboss.seam.annotations.Interceptor;
  +import org.jboss.seam.annotations.intercept.Interceptor;
  +import org.jboss.seam.annotations.intercept.InterceptorType;
   import org.jboss.seam.intercept.InvocationContext;
   
   /**
  
  
  
  1.16      +1 -1      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.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- TransactionInterceptor.java	18 Jun 2007 04:54:11 -0000	1.15
  +++ TransactionInterceptor.java	20 Jun 2007 17:45:56 -0000	1.16
  @@ -4,8 +4,8 @@
   import java.lang.reflect.Method;
   
   import org.jboss.seam.annotations.AroundInvoke;
  -import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.Transactional;
  +import org.jboss.seam.annotations.intercept.Interceptor;
   import org.jboss.seam.intercept.InvocationContext;
   import org.jboss.seam.util.Work;
   
  
  
  
  1.31      +2 -2      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.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- ValidationInterceptor.java	19 Jun 2007 19:02:34 -0000	1.30
  +++ ValidationInterceptor.java	20 Jun 2007 17:45:56 -0000	1.31
  @@ -1,4 +1,4 @@
  -//$Id: ValidationInterceptor.java,v 1.30 2007/06/19 19:02:34 gavin Exp $
  +//$Id: ValidationInterceptor.java,v 1.31 2007/06/20 17:45:56 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -13,8 +13,8 @@
   import org.jboss.seam.Component;
   import org.jboss.seam.annotations.AroundInvoke;
   import org.jboss.seam.annotations.IfInvalid;
  -import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.Outcome;
  +import org.jboss.seam.annotations.intercept.Interceptor;
   import org.jboss.seam.faces.FacesMessages;
   import org.jboss.seam.intercept.InvocationContext;
   
  
  
  
  1.10      +1 -1      jboss-seam/src/main/org/jboss/seam/interceptors/WebServiceInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WebServiceInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/WebServiceInterceptor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- WebServiceInterceptor.java	20 Jun 2007 08:23:17 -0000	1.9
  +++ WebServiceInterceptor.java	20 Jun 2007 17:45:56 -0000	1.10
  @@ -9,7 +9,7 @@
   import org.jboss.seam.annotations.AroundInvoke;
   import org.jboss.seam.annotations.Conversation;
   import org.jboss.seam.annotations.ConversationId;
  -import org.jboss.seam.annotations.Interceptor;
  +import org.jboss.seam.annotations.intercept.Interceptor;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.contexts.ServletLifecycle;
  
  
  



More information about the jboss-cvs-commits mailing list