[jboss-cvs] jboss-seam/src/main/org/jboss/seam/interceptors ...
Gavin King
gavin.king at jboss.com
Tue Oct 31 21:54:02 EST 2006
User: gavin
Date: 06/10/31 21:54:02
Modified: src/main/org/jboss/seam/interceptors
AsynchronousInterceptor.java
BijectionInterceptor.java
BusinessProcessInterceptor.java
ConversationInterceptor.java
ConversationalInterceptor.java
EventInterceptor.java ExceptionInterceptor.java
ManagedEntityIdentityInterceptor.java
OutcomeInterceptor.java RemoveInterceptor.java
RollbackInterceptor.java SecurityInterceptor.java
SynchronizationInterceptor.java
TransactionInterceptor.java
ValidationInterceptor.java
Log:
insulate dependency to javax.interceptor
Revision Changes Path
1.7 +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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- AsynchronousInterceptor.java 30 Oct 2006 16:54:34 -0000 1.6
+++ AsynchronousInterceptor.java 1 Nov 2006 02:54:02 -0000 1.7
@@ -1,15 +1,15 @@
package org.jboss.seam.interceptors;
import javax.ejb.Timer;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
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.contexts.Contexts;
import org.jboss.seam.core.Dispatcher;
import org.jboss.seam.core.LocalDispatcher;
+import org.jboss.seam.intercept.InvocationContext;
@Interceptor(type=InterceptorType.CLIENT)
public class AsynchronousInterceptor extends AbstractInterceptor
1.23 +3 -4 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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- BijectionInterceptor.java 1 Nov 2006 01:52:09 -0000 1.22
+++ BijectionInterceptor.java 1 Nov 2006 02:54:02 -0000 1.23
@@ -1,4 +1,4 @@
-//$Id: BijectionInterceptor.java,v 1.22 2006/11/01 01:52:09 gavin Exp $
+//$Id: BijectionInterceptor.java,v 1.23 2006/11/01 02:54:02 gavin Exp $
package org.jboss.seam.interceptors;
import static org.jboss.seam.util.EJB.POST_ACTIVATE;
@@ -8,14 +8,13 @@
import java.lang.reflect.Method;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Interceptor;
+import org.jboss.seam.intercept.InvocationContext;
/**
* Before invoking the component, inject all dependencies. After
1.46 +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.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- BusinessProcessInterceptor.java 16 Oct 2006 11:36:38 -0000 1.45
+++ BusinessProcessInterceptor.java 1 Nov 2006 02:54:02 -0000 1.46
@@ -12,11 +12,10 @@
import java.util.Map;
import javax.faces.context.FacesContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.BeginTask;
import org.jboss.seam.annotations.CreateProcess;
import org.jboss.seam.annotations.EndTask;
@@ -24,12 +23,13 @@
import org.jboss.seam.annotations.ResumeProcess;
import org.jboss.seam.annotations.StartTask;
import org.jboss.seam.core.BusinessProcess;
+import org.jboss.seam.intercept.InvocationContext;
/**
* Interceptor which handles interpretation of jBPM-related annotations.
*
* @author <a href="mailto:steve at hibernate.org">Steve Ebersole </a>
- * @version $Revision: 1.45 $
+ * @version $Revision: 1.46 $
*/
@Interceptor(stateless=true,
around={ValidationInterceptor.class, BijectionInterceptor.class, OutcomeInterceptor.class})
1.53 +3 -4 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.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- ConversationInterceptor.java 31 Oct 2006 20:09:22 -0000 1.52
+++ ConversationInterceptor.java 1 Nov 2006 02:54:02 -0000 1.53
@@ -1,14 +1,12 @@
-//$Id: ConversationInterceptor.java,v 1.52 2006/10/31 20:09:22 gavin Exp $
+//$Id: ConversationInterceptor.java,v 1.53 2006/11/01 02:54:02 gavin Exp $
package org.jboss.seam.interceptors;
import java.lang.reflect.Method;
import java.util.Arrays;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.BeginTask;
import org.jboss.seam.annotations.End;
@@ -22,6 +20,7 @@
import org.jboss.seam.core.Manager;
import org.jboss.seam.core.Pageflow;
import org.jboss.seam.core.PersistenceContexts;
+import org.jboss.seam.intercept.InvocationContext;
/**
* After the end of the invocation, begin or end a long running
1.8 +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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ConversationalInterceptor.java 25 Oct 2006 15:14:35 -0000 1.7
+++ ConversationalInterceptor.java 1 Nov 2006 02:54:02 -0000 1.8
@@ -1,15 +1,14 @@
-//$Id: ConversationalInterceptor.java,v 1.7 2006/10/25 15:14:35 gavin Exp $
+//$Id: ConversationalInterceptor.java,v 1.8 2006/11/01 02:54:02 gavin Exp $
package org.jboss.seam.interceptors;
import java.lang.reflect.Method;
import javax.faces.application.FacesMessage;
import javax.faces.event.PhaseId;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.BeginTask;
import org.jboss.seam.annotations.Conversational;
@@ -20,6 +19,7 @@
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.core.FacesMessages;
import org.jboss.seam.core.Manager;
+import org.jboss.seam.intercept.InvocationContext;
/**
* Check that a conversational bean is not being invoked
1.4 +2 -3 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- EventInterceptor.java 2 Oct 2006 04:17:59 -0000 1.3
+++ EventInterceptor.java 1 Nov 2006 02:54:02 -0000 1.4
@@ -2,12 +2,11 @@
import java.lang.reflect.Method;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
+import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.Interceptor;
import org.jboss.seam.annotations.RaiseEvent;
import org.jboss.seam.core.Events;
+import org.jboss.seam.intercept.InvocationContext;
/**
* Raises Seam events connected with a bean lifecycle.
1.12 +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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ExceptionInterceptor.java 22 Oct 2006 01:47:12 -0000 1.11
+++ ExceptionInterceptor.java 1 Nov 2006 02:54:02 -0000 1.12
@@ -1,13 +1,13 @@
-//$Id: ExceptionInterceptor.java,v 1.11 2006/10/22 01:47:12 gavin Exp $
+//$Id: ExceptionInterceptor.java,v 1.12 2006/11/01 02:54:02 gavin Exp $
package org.jboss.seam.interceptors;
import javax.faces.context.FacesContext;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
import org.jboss.seam.InterceptorType;
+import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.Interceptor;
import org.jboss.seam.core.Exceptions;
+import org.jboss.seam.intercept.InvocationContext;
/**
* Handles exceptions annotation @Redirect, @HttpError or @Render.
1.12 +2 -2 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ManagedEntityIdentityInterceptor.java 31 Oct 2006 20:09:22 -0000 1.11
+++ ManagedEntityIdentityInterceptor.java 1 Nov 2006 02:54:02 -0000 1.12
@@ -7,16 +7,16 @@
import java.util.List;
import java.util.Set;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
import javax.persistence.EntityManager;
import org.hibernate.Session;
import org.jboss.seam.Component;
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.core.PersistenceContexts;
+import org.jboss.seam.intercept.InvocationContext;
import org.jboss.seam.persistence.PersistenceProvider;
import org.jboss.seam.util.Reflections;
1.6 +3 -3 jboss-seam/src/main/org/jboss/seam/interceptors/OutcomeInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OutcomeInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/OutcomeInterceptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- OutcomeInterceptor.java 2 Oct 2006 04:17:59 -0000 1.5
+++ OutcomeInterceptor.java 1 Nov 2006 02:54:02 -0000 1.6
@@ -1,13 +1,13 @@
-//$Id: OutcomeInterceptor.java,v 1.5 2006/10/02 04:17:59 gavin Exp $
+//$Id: OutcomeInterceptor.java,v 1.6 2006/11/01 02:54:02 gavin Exp $
package org.jboss.seam.interceptors;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
import javax.faces.event.PhaseId;
+import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.Interceptor;
import org.jboss.seam.annotations.Outcome;
import org.jboss.seam.contexts.Lifecycle;
+import org.jboss.seam.intercept.InvocationContext;
/**
* Translates Outcome.RETRY to null for JSF
1.16 +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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- RemoveInterceptor.java 10 Oct 2006 06:43:16 -0000 1.15
+++ RemoveInterceptor.java 1 Nov 2006 02:54:02 -0000 1.16
@@ -1,4 +1,4 @@
-//$Id: RemoveInterceptor.java,v 1.15 2006/10/10 06:43:16 gavin Exp $
+//$Id: RemoveInterceptor.java,v 1.16 2006/11/01 02:54:02 gavin Exp $
package org.jboss.seam.interceptors;
import java.lang.reflect.Method;
@@ -6,13 +6,13 @@
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.AroundInvoke;
import org.jboss.seam.annotations.Interceptor;
+import org.jboss.seam.intercept.InvocationContext;
/**
* Removes components from the Seam context after invocation
1.13 +3 -4 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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- RollbackInterceptor.java 1 Nov 2006 01:52:09 -0000 1.12
+++ RollbackInterceptor.java 1 Nov 2006 02:54:02 -0000 1.13
@@ -1,4 +1,4 @@
-//$Id: RollbackInterceptor.java,v 1.12 2006/11/01 01:52:09 gavin Exp $
+//$Id: RollbackInterceptor.java,v 1.13 2006/11/01 02:54:02 gavin Exp $
package org.jboss.seam.interceptors;
import static org.jboss.seam.util.EJB.APPLICATION_EXCEPTION;
@@ -8,13 +8,12 @@
import java.util.Arrays;
import java.util.List;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
import org.jboss.seam.ComponentType;
+import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.Interceptor;
import org.jboss.seam.annotations.Outcome;
import org.jboss.seam.annotations.Rollback;
+import org.jboss.seam.intercept.InvocationContext;
import org.jboss.seam.util.EJB;
import org.jboss.seam.util.Transactions;
1.9 +2 -3 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- SecurityInterceptor.java 31 Oct 2006 06:07:59 -0000 1.8
+++ SecurityInterceptor.java 1 Nov 2006 02:54:02 -0000 1.9
@@ -2,15 +2,14 @@
import java.lang.reflect.Method;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.Interceptor;
import org.jboss.seam.annotations.Permission;
import org.jboss.seam.annotations.Secure;
import org.jboss.seam.core.FacesMessages;
+import org.jboss.seam.intercept.InvocationContext;
import org.jboss.seam.security.Authentication;
import org.jboss.seam.security.AuthenticationException;
import org.jboss.seam.security.SeamSecurityManager;
1.4 +3 -4 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SynchronizationInterceptor.java 13 Oct 2006 02:24:30 -0000 1.3
+++ SynchronizationInterceptor.java 1 Nov 2006 02:54:02 -0000 1.4
@@ -1,14 +1,13 @@
-//$Id: SynchronizationInterceptor.java,v 1.3 2006/10/13 02:24:30 gavin Exp $
+//$Id: SynchronizationInterceptor.java,v 1.4 2006/11/01 02:54:02 gavin Exp $
package org.jboss.seam.interceptors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
import org.jboss.seam.InterceptorType;
+import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.Interceptor;
+import org.jboss.seam.intercept.InvocationContext;
/**
* Serializes calls to a component.
1.9 +2 -3 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- TransactionInterceptor.java 15 Oct 2006 16:30:45 -0000 1.8
+++ TransactionInterceptor.java 1 Nov 2006 02:54:02 -0000 1.9
@@ -2,11 +2,10 @@
import java.lang.reflect.AnnotatedElement;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
+import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.Interceptor;
import org.jboss.seam.annotations.Transactional;
+import org.jboss.seam.intercept.InvocationContext;
import org.jboss.seam.util.Work;
@Interceptor(stateless=true,
1.23 +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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- ValidationInterceptor.java 25 Oct 2006 15:14:35 -0000 1.22
+++ ValidationInterceptor.java 1 Nov 2006 02:54:02 -0000 1.23
@@ -1,10 +1,8 @@
-//$Id: ValidationInterceptor.java,v 1.22 2006/10/25 15:14:35 gavin Exp $
+//$Id: ValidationInterceptor.java,v 1.23 2006/11/01 02:54:02 gavin Exp $
package org.jboss.seam.interceptors;
import java.lang.reflect.Method;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
import javax.persistence.Entity;
import javax.persistence.EntityManager;
@@ -13,9 +11,11 @@
import org.hibernate.Session;
import org.hibernate.validator.InvalidValue;
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.core.FacesMessages;
+import org.jboss.seam.intercept.InvocationContext;
/**
* Validate the method receiver using Hibernate validator before
More information about the jboss-cvs-commits
mailing list