[jboss-cvs] jboss-seam/src/main/org/jboss/seam/interceptors ...
Gavin King
gavin.king at jboss.com
Mon Jun 25 18:56:50 EDT 2007
User: gavin
Date: 07/06/25 18:56:50
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
Log:
exception(s)
Revision Changes Path
1.19 +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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- AsynchronousInterceptor.java 21 Jun 2007 05:27:28 -0000 1.18
+++ AsynchronousInterceptor.java 25 Jun 2007 22:56:49 -0000 1.19
@@ -1,7 +1,7 @@
package org.jboss.seam.interceptors;
-import org.jboss.seam.annotations.AroundInvoke;
-import org.jboss.seam.annotations.Asynchronous;
+import org.jboss.seam.annotations.async.Asynchronous;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.annotations.intercept.InterceptorType;
import org.jboss.seam.async.AbstractDispatcher;
1.32 +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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- BijectionInterceptor.java 20 Jun 2007 17:45:56 -0000 1.31
+++ BijectionInterceptor.java 25 Jun 2007 22:56:49 -0000 1.32
@@ -1,8 +1,8 @@
-//$Id: BijectionInterceptor.java,v 1.31 2007/06/20 17:45:56 gavin Exp $
+//$Id: BijectionInterceptor.java,v 1.32 2007/06/25 22:56:49 gavin Exp $
package org.jboss.seam.interceptors;
import org.jboss.seam.Component;
-import org.jboss.seam.annotations.AroundInvoke;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.intercept.InvocationContext;
import org.jboss.seam.log.LogProvider;
1.61 +8 -8 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.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- BusinessProcessInterceptor.java 25 Jun 2007 16:49:39 -0000 1.60
+++ BusinessProcessInterceptor.java 25 Jun 2007 22:56:49 -0000 1.61
@@ -8,12 +8,12 @@
import java.lang.reflect.Method;
-import org.jboss.seam.annotations.AroundInvoke;
-import org.jboss.seam.annotations.BeginTask;
-import org.jboss.seam.annotations.CreateProcess;
-import org.jboss.seam.annotations.EndTask;
-import org.jboss.seam.annotations.ResumeProcess;
-import org.jboss.seam.annotations.StartTask;
+import org.jboss.seam.annotations.bpm.BeginTask;
+import org.jboss.seam.annotations.bpm.CreateProcess;
+import org.jboss.seam.annotations.bpm.EndTask;
+import org.jboss.seam.annotations.bpm.ResumeProcess;
+import org.jboss.seam.annotations.bpm.StartTask;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.bpm.BusinessProcess;
import org.jboss.seam.core.Expressions;
@@ -119,10 +119,10 @@
log.trace( "encountered @EndTask" );
BusinessProcess.instance().endTask( method.getAnnotation(EndTask.class).transition() );
}
- if ( method.isAnnotationPresent(org.jboss.seam.annotations.Transition.class) )
+ if ( method.isAnnotationPresent(org.jboss.seam.annotations.bpm.Transition.class) )
{
log.trace( "encountered @Transition" );
- String transitionName = method.getAnnotation(org.jboss.seam.annotations.Transition.class).value();
+ String transitionName = method.getAnnotation(org.jboss.seam.annotations.bpm.Transition.class).value();
if ( "".equals(transitionName) ) transitionName = method.getName();
BusinessProcess.instance().transition(transitionName);
}
1.70 +5 -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.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- ConversationInterceptor.java 25 Jun 2007 16:49:39 -0000 1.69
+++ ConversationInterceptor.java 25 Jun 2007 22:56:50 -0000 1.70
@@ -1,17 +1,17 @@
-//$Id: ConversationInterceptor.java,v 1.69 2007/06/25 16:49:39 gavin Exp $
+//$Id: ConversationInterceptor.java,v 1.70 2007/06/25 22:56:50 gavin Exp $
package org.jboss.seam.interceptors;
import java.lang.reflect.Method;
import java.util.Arrays;
import org.jboss.seam.annotations.ApplicationException;
-import org.jboss.seam.annotations.AroundInvoke;
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.StartTask;
+import org.jboss.seam.annotations.bpm.BeginTask;
+import org.jboss.seam.annotations.bpm.EndTask;
+import org.jboss.seam.annotations.bpm.StartTask;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.core.ConversationEntries;
import org.jboss.seam.core.ConversationEntry;
1.23 +4 -4 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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- ConversationalInterceptor.java 25 Jun 2007 16:49:39 -0000 1.22
+++ ConversationalInterceptor.java 25 Jun 2007 22:56:50 -0000 1.23
@@ -1,16 +1,16 @@
-//$Id: ConversationalInterceptor.java,v 1.22 2007/06/25 16:49:39 gavin Exp $
+//$Id: ConversationalInterceptor.java,v 1.23 2007/06/25 22:56:50 gavin Exp $
package org.jboss.seam.interceptors;
import java.lang.reflect.Method;
import org.jboss.seam.NoConversationException;
-import org.jboss.seam.annotations.AroundInvoke;
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.StartTask;
+import org.jboss.seam.annotations.bpm.BeginTask;
+import org.jboss.seam.annotations.bpm.StartTask;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.core.Events;
import org.jboss.seam.core.Manager;
1.9 +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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- EventInterceptor.java 21 Jun 2007 05:27:28 -0000 1.8
+++ EventInterceptor.java 25 Jun 2007 22:56:50 -0000 1.9
@@ -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.RaiseEvent;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.core.Events;
import org.jboss.seam.intercept.InvocationContext;
1.30 +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.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- ManagedEntityIdentityInterceptor.java 20 Jun 2007 17:45:56 -0000 1.29
+++ ManagedEntityIdentityInterceptor.java 25 Jun 2007 22:56:50 -0000 1.30
@@ -9,8 +9,8 @@
import java.util.List;
import org.jboss.seam.Seam;
-import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.intercept.InvocationContext;
1.9 +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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- MethodContextInterceptor.java 25 Jun 2007 15:40:19 -0000 1.8
+++ MethodContextInterceptor.java 25 Jun 2007 22:56:50 -0000 1.9
@@ -3,7 +3,7 @@
import java.lang.reflect.Method;
import org.jboss.seam.Component;
-import org.jboss.seam.annotations.AroundInvoke;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.contexts.Context;
import org.jboss.seam.contexts.Contexts;
1.23 +2 -2 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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- RemoveInterceptor.java 20 Jun 2007 17:45:56 -0000 1.22
+++ RemoveInterceptor.java 25 Jun 2007 22:56:50 -0000 1.23
@@ -1,4 +1,4 @@
-//$Id: RemoveInterceptor.java,v 1.22 2007/06/20 17:45:56 gavin Exp $
+//$Id: RemoveInterceptor.java,v 1.23 2007/06/25 22:56:50 gavin Exp $
package org.jboss.seam.interceptors;
import java.lang.reflect.Method;
@@ -9,7 +9,7 @@
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
-import org.jboss.seam.annotations.AroundInvoke;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.annotations.intercept.InterceptorType;
import org.jboss.seam.intercept.InvocationContext;
1.24 +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.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- RollbackInterceptor.java 20 Jun 2007 17:45:56 -0000 1.23
+++ RollbackInterceptor.java 25 Jun 2007 22:56:50 -0000 1.24
@@ -1,4 +1,4 @@
-//$Id: RollbackInterceptor.java,v 1.23 2007/06/20 17:45:56 gavin Exp $
+//$Id: RollbackInterceptor.java,v 1.24 2007/06/25 22:56:50 gavin Exp $
package org.jboss.seam.interceptors;
import static org.jboss.seam.ComponentType.JAVA_BEAN;
@@ -6,7 +6,7 @@
import static org.jboss.seam.util.EJB.rollback;
import org.jboss.seam.annotations.ApplicationException;
-import org.jboss.seam.annotations.AroundInvoke;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.intercept.InvocationContext;
import org.jboss.seam.transaction.Transaction;
1.36 +1 -1 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.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- SecurityInterceptor.java 20 Jun 2007 17:45:56 -0000 1.35
+++ SecurityInterceptor.java 25 Jun 2007 22:56:50 -0000 1.36
@@ -2,7 +2,7 @@
import java.lang.reflect.Method;
-import org.jboss.seam.annotations.AroundInvoke;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.annotations.intercept.InterceptorType;
import org.jboss.seam.annotations.security.Restrict;
1.9 +2 -2 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- SynchronizationInterceptor.java 20 Jun 2007 17:45:56 -0000 1.8
+++ SynchronizationInterceptor.java 25 Jun 2007 22:56:50 -0000 1.9
@@ -1,10 +1,10 @@
-//$Id: SynchronizationInterceptor.java,v 1.8 2007/06/20 17:45:56 gavin Exp $
+//$Id: SynchronizationInterceptor.java,v 1.9 2007/06/25 22:56:50 gavin Exp $
package org.jboss.seam.interceptors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
-import org.jboss.seam.annotations.AroundInvoke;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.annotations.intercept.InterceptorType;
import org.jboss.seam.intercept.InvocationContext;
1.17 +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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- TransactionInterceptor.java 20 Jun 2007 17:45:56 -0000 1.16
+++ TransactionInterceptor.java 25 Jun 2007 22:56:50 -0000 1.17
@@ -3,8 +3,8 @@
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
-import org.jboss.seam.annotations.AroundInvoke;
import org.jboss.seam.annotations.Transactional;
+import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.intercept.InvocationContext;
import org.jboss.seam.util.Work;
More information about the jboss-cvs-commits
mailing list