[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...
Gavin King
gavin.king at jboss.com
Wed Jun 20 13:45:55 EDT 2007
User: gavin
Date: 07/06/20 13:45:55
Modified: src/main/org/jboss/seam/core Conversation.java
ConversationEntries.java ConversationList.java
ConversationPropagation.java ConversationStack.java
Events.java Expressions.java Init.java
Interpolator.java Manager.java PojoCache.java
ResourceBundle.java ServletSession.java
Validators.java
Log:
refactored interception annotations
Revision Changes Path
1.36 +2 -3 jboss-seam/src/main/org/jboss/seam/core/Conversation.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Conversation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Conversation.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- Conversation.java 19 Jun 2007 19:02:31 -0000 1.35
+++ Conversation.java 20 Jun 2007 17:45:55 -0000 1.36
@@ -1,6 +1,5 @@
package org.jboss.seam.core;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.Serializable;
@@ -9,9 +8,9 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.FlushModeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.persistence.PersistenceContexts;
@@ -27,7 +26,7 @@
@Scope(ScopeType.CONVERSATION)
@Name("org.jboss.seam.core.conversation")
@Install(precedence=BUILT_IN)
- at Intercept(NEVER)
+ at BypassInterceptors
public class Conversation implements Serializable
{
private static final long serialVersionUID = -6131304128727444876L;
1.9 +4 -3 jboss-seam/src/main/org/jboss/seam/core/ConversationEntries.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationEntries.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationEntries.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ConversationEntries.java 10 Jun 2007 19:25:58 -0000 1.8
+++ ConversationEntries.java 20 Jun 2007 17:45:55 -0000 1.9
@@ -1,7 +1,7 @@
package org.jboss.seam.core;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
+
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
@@ -9,12 +9,13 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
/**
@@ -26,7 +27,7 @@
@Name("org.jboss.seam.core.conversationEntries")
@Install(precedence=BUILT_IN)
@Scope(ScopeType.SESSION)
- at Intercept(NEVER)
+ at BypassInterceptors
public class ConversationEntries extends AbstractMutable implements Serializable
{
private static final long serialVersionUID = 7996835952419813634L;
1.16 +2 -3 jboss-seam/src/main/org/jboss/seam/core/ConversationList.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationList.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationList.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- ConversationList.java 19 Jun 2007 19:02:31 -0000 1.15
+++ ConversationList.java 20 Jun 2007 17:45:55 -0000 1.16
@@ -1,6 +1,5 @@
package org.jboss.seam.core;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.Serializable;
@@ -13,10 +12,10 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
/**
* @author Gavin King
@@ -24,7 +23,7 @@
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.core.conversationList")
@Install(precedence=BUILT_IN)
- at Intercept(NEVER)
+ at BypassInterceptors
public class ConversationList implements Serializable
{
1.4 +2 -3 jboss-seam/src/main/org/jboss/seam/core/ConversationPropagation.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationPropagation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationPropagation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ConversationPropagation.java 19 Jun 2007 20:26:42 -0000 1.3
+++ ConversationPropagation.java 20 Jun 2007 17:45:55 -0000 1.4
@@ -3,12 +3,11 @@
import java.util.Map;
import org.jboss.seam.Component;
-import org.jboss.seam.InterceptionType;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
@@ -17,7 +16,7 @@
@Name("org.jboss.seam.core.conversationPropagation")
@Scope(ScopeType.EVENT)
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Install(precedence=Install.BUILT_IN)
public class ConversationPropagation
{
1.14 +2 -3 jboss-seam/src/main/org/jboss/seam/core/ConversationStack.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationStack.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ConversationStack.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ConversationStack.java 19 Jun 2007 19:02:31 -0000 1.13
+++ ConversationStack.java 20 Jun 2007 17:45:55 -0000 1.14
@@ -1,6 +1,5 @@
package org.jboss.seam.core;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.Serializable;
@@ -12,10 +11,10 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
/**
* Support for "breadcrumbs".
@@ -25,7 +24,7 @@
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.core.conversationStack")
@Install(precedence=BUILT_IN)
- at Intercept(NEVER)
+ at BypassInterceptors
public class ConversationStack implements Serializable
{
private static final long serialVersionUID = 7941458529299691801L;
1.30 +2 -3 jboss-seam/src/main/org/jboss/seam/core/Events.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Events.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Events.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- Events.java 20 Jun 2007 03:25:08 -0000 1.29
+++ Events.java 20 Jun 2007 17:45:55 -0000 1.30
@@ -1,6 +1,5 @@
package org.jboss.seam.core;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.util.List;
@@ -8,9 +7,9 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.async.AbstractDispatcher;
import org.jboss.seam.async.Dispatcher;
import org.jboss.seam.async.LocalTransactionListener;
@@ -29,7 +28,7 @@
*
*/
@Scope(ScopeType.STATELESS)
- at Intercept(NEVER)
+ at BypassInterceptors
@Name("org.jboss.seam.core.events")
@Install(precedence=BUILT_IN)
public class Events
1.36 +3 -4 jboss-seam/src/main/org/jboss/seam/core/Expressions.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Expressions.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Expressions.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- Expressions.java 19 Jun 2007 19:02:31 -0000 1.35
+++ Expressions.java 20 Jun 2007 17:45:55 -0000 1.36
@@ -1,7 +1,6 @@
-//$Id: Expressions.java,v 1.35 2007/06/19 19:02:31 gavin Exp $
+//$Id: Expressions.java,v 1.36 2007/06/20 17:45:55 gavin Exp $
package org.jboss.seam.core;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import static org.jboss.seam.el.EL.EL_CONTEXT;
@@ -16,9 +15,9 @@
import org.jboss.seam.Model;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.el.SeamExpressionFactory;
/**
@@ -27,7 +26,7 @@
* @author Gavin King
*/
@Scope(ScopeType.APPLICATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Install(precedence=BUILT_IN)
@Name("org.jboss.seam.core.expressions")
public class Expressions implements Serializable
1.50 +3 -4 jboss-seam/src/main/org/jboss/seam/core/Init.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Init.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- Init.java 20 Jun 2007 15:53:32 -0000 1.49
+++ Init.java 20 Jun 2007 17:45:55 -0000 1.50
@@ -1,8 +1,7 @@
-//$Id: Init.java,v 1.49 2007/06/20 15:53:32 gavin Exp $
+//$Id: Init.java,v 1.50 2007/06/20 17:45:55 gavin Exp $
package org.jboss.seam.core;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.File;
@@ -19,9 +18,9 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Expressions.MethodExpression;
import org.jboss.seam.core.Expressions.ValueExpression;
@@ -33,7 +32,7 @@
* @author Gavin King
*/
@Scope(ScopeType.APPLICATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Name("org.jboss.seam.core.init")
@Install(value=false, precedence=BUILT_IN)
public class Init
1.24 +5 -6 jboss-seam/src/main/org/jboss/seam/core/Interpolator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Interpolator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Interpolator.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- Interpolator.java 19 Jun 2007 19:02:31 -0000 1.23
+++ Interpolator.java 20 Jun 2007 17:45:55 -0000 1.24
@@ -1,29 +1,28 @@
package org.jboss.seam.core;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.ScopeType.STATELESS;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.text.MessageFormat;
import java.util.StringTokenizer;
-import org.jboss.seam.international.Locale;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.international.Locale;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
/**
* Interpolates EL expressions in Strings
*
* @author Gavin King
*/
- at Intercept(NEVER)
+ at BypassInterceptors
@Scope(STATELESS)
@Name("org.jboss.seam.core.interpolator")
@Install(precedence=BUILT_IN)
1.177 +2 -3 jboss-seam/src/main/org/jboss/seam/core/Manager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Manager.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- Manager.java 20 Jun 2007 15:53:32 -0000 1.176
+++ Manager.java 20 Jun 2007 17:45:55 -0000 1.177
@@ -6,7 +6,6 @@
*/
package org.jboss.seam.core;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.UnsupportedEncodingException;
@@ -19,9 +18,9 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.log.LogProvider;
@@ -40,7 +39,7 @@
@Scope(ScopeType.EVENT)
@Name("org.jboss.seam.core.manager")
@Install(precedence=BUILT_IN)
- at Intercept(NEVER)
+ at BypassInterceptors
public class Manager
{
private static final LogProvider log = Logging.getLogProvider(Manager.class);
1.10 +5 -6 jboss-seam/src/main/org/jboss/seam/core/PojoCache.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PojoCache.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/PojoCache.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- PojoCache.java 1 Feb 2007 06:43:19 -0000 1.9
+++ PojoCache.java 20 Jun 2007 17:45:55 -0000 1.10
@@ -1,26 +1,25 @@
-//$Id: PojoCache.java,v 1.9 2007/02/01 06:43:19 nrichards Exp $
+//$Id: PojoCache.java,v 1.10 2007/06/20 17:45:55 gavin Exp $
package org.jboss.seam.core;
import static org.jboss.seam.annotations.Install.BUILT_IN;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
import org.jboss.cache.PropertyConfigurator;
import org.jboss.seam.Component;
-import org.jboss.seam.InterceptionType;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
@Name("org.jboss.seam.core.pojoCache")
@Scope(ScopeType.APPLICATION)
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Install(value=false, precedence=BUILT_IN)
public class PojoCache
{
1.32 +2 -3 jboss-seam/src/main/org/jboss/seam/core/ResourceBundle.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ResourceBundle.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ResourceBundle.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- ResourceBundle.java 19 Jun 2007 19:41:44 -0000 1.31
+++ ResourceBundle.java 20 Jun 2007 17:45:55 -0000 1.32
@@ -1,6 +1,5 @@
package org.jboss.seam.core;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.Serializable;
@@ -14,10 +13,10 @@
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Unwrap;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.navigation.Pages;
@@ -30,7 +29,7 @@
* @author Gavin King
*/
@Scope(ScopeType.SESSION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Name("org.jboss.seam.core.resourceBundle")
@Install(precedence=BUILT_IN)
public class ResourceBundle implements Serializable
1.7 +2 -3 jboss-seam/src/main/org/jboss/seam/core/ServletSession.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServletSession.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ServletSession.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ServletSession.java 19 Jun 2007 19:02:31 -0000 1.6
+++ ServletSession.java 20 Jun 2007 17:45:55 -0000 1.7
@@ -1,17 +1,16 @@
package org.jboss.seam.core;
import org.jboss.seam.Component;
-import org.jboss.seam.InterceptionType;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Startup;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
@Scope(ScopeType.SESSION)
@Name("org.jboss.seam.core.servletSession")
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Startup
public class ServletSession extends AbstractMutable
{
1.10 +2 -3 jboss-seam/src/main/org/jboss/seam/core/Validators.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Validators.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Validators.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Validators.java 19 Jun 2007 19:41:44 -0000 1.9
+++ Validators.java 20 Jun 2007 17:45:55 -0000 1.10
@@ -9,12 +9,11 @@
import org.hibernate.validator.ClassValidator;
import org.hibernate.validator.InvalidValue;
import org.jboss.seam.Component;
-import org.jboss.seam.InterceptionType;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
/**
@@ -24,7 +23,7 @@
*
*/
@Name("org.jboss.seam.core.validators")
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Scope(ScopeType.APPLICATION)
@Install(precedence=BUILT_IN)
public class Validators
More information about the jboss-cvs-commits
mailing list