[jboss-cvs] jboss-seam/src/main/org/jboss/seam/faces ...
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/faces
BusinessProcess.java DataModels.java
FacesContext.java FacesExpressions.java
FacesManager.java FacesMessages.java FacesPage.java
HttpError.java IsUserInRole.java Parameters.java
Redirect.java Switcher.java UiComponent.java
UserPrincipal.java Validation.java
Log:
refactored interception annotations
Revision Changes Path
1.4 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/BusinessProcess.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BusinessProcess.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/BusinessProcess.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- BusinessProcess.java 20 Jun 2007 04:16:17 -0000 1.3
+++ BusinessProcess.java 20 Jun 2007 17:45:55 -0000 1.4
@@ -1,15 +1,14 @@
package org.jboss.seam.faces;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.FRAMEWORK;
import javax.faces.application.FacesMessage;
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;
/**
* Holds the task and process ids for the current conversation,
@@ -20,7 +19,7 @@
*/
@Scope(ScopeType.CONVERSATION)
@Name("org.jboss.seam.bpm.businessProcess")
- at Intercept(NEVER)
+ at BypassInterceptors
@Install(dependencies="org.jboss.seam.bpm.jbpm", precedence=FRAMEWORK, classDependencies="javax.faces.context.FacesContext")
public class BusinessProcess extends org.jboss.seam.bpm.BusinessProcess
{
1.2 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/DataModels.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DataModels.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/DataModels.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- DataModels.java 19 Jun 2007 20:08:12 -0000 1.1
+++ DataModels.java 20 Jun 2007 17:45:55 -0000 1.2
@@ -1,6 +1,5 @@
package org.jboss.seam.faces;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.ScopeType.STATELESS;
import static org.jboss.seam.annotations.Install.BUILT_IN;
@@ -13,9 +12,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.framework.Query;
import org.jboss.seam.jsf.ArrayDataModel;
import org.jboss.seam.jsf.ListDataModel;
@@ -25,7 +24,7 @@
@Name("org.jboss.seam.faces.dataModels")
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
@Scope(STATELESS)
- at Intercept(NEVER)
+ at BypassInterceptors
public class DataModels
{
1.3 +3 -4 jboss-seam/src/main/org/jboss/seam/faces/FacesContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FacesContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/FacesContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- FacesContext.java 19 Jun 2007 20:08:12 -0000 1.2
+++ FacesContext.java 20 Jun 2007 17:45:55 -0000 1.3
@@ -1,15 +1,14 @@
-//$Id: FacesContext.java,v 1.2 2007/06/19 20:08:12 gavin Exp $
+//$Id: FacesContext.java,v 1.3 2007/06/20 17:45:55 gavin Exp $
package org.jboss.seam.faces;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
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;
/**
* Support for injecting the JSF FacesContext object
@@ -17,7 +16,7 @@
* @author Gavin King
*/
@Scope(ScopeType.APPLICATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Name("org.jboss.seam.faces.facesContext")
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
public class FacesContext
1.2 +3 -4 jboss-seam/src/main/org/jboss/seam/faces/FacesExpressions.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FacesExpressions.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/FacesExpressions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- FacesExpressions.java 19 Jun 2007 20:08:12 -0000 1.1
+++ FacesExpressions.java 20 Jun 2007 17:45:55 -0000 1.2
@@ -1,7 +1,6 @@
-//$Id: FacesExpressions.java,v 1.1 2007/06/19 20:08:12 gavin Exp $
+//$Id: FacesExpressions.java,v 1.2 2007/06/20 17:45:55 gavin Exp $
package org.jboss.seam.faces;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.FRAMEWORK;
import static org.jboss.seam.el.EL.EL_CONTEXT;
@@ -13,9 +12,9 @@
import org.hibernate.validator.InvalidValue;
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.core.Expressions;
/**
@@ -24,7 +23,7 @@
* @author Gavin King
*/
@Scope(ScopeType.APPLICATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Install(precedence=FRAMEWORK, classDependencies="javax.faces.context.FacesContext")
@Name("org.jboss.seam.core.expressions")
public class FacesExpressions extends Expressions
1.5 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/FacesManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FacesManager.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/FacesManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- FacesManager.java 20 Jun 2007 08:23:17 -0000 1.4
+++ FacesManager.java 20 Jun 2007 17:45:55 -0000 1.5
@@ -6,7 +6,6 @@
*/
package org.jboss.seam.faces;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.FRAMEWORK;
import java.io.IOException;
@@ -21,9 +20,9 @@
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.FacesLifecycle;
import org.jboss.seam.core.Conversation;
import org.jboss.seam.core.Init;
@@ -44,7 +43,7 @@
@Scope(ScopeType.EVENT)
@Name("org.jboss.seam.core.manager")
@Install(precedence=FRAMEWORK, classDependencies="javax.faces.context.FacesContext")
- at Intercept(NEVER)
+ at BypassInterceptors
public class FacesManager extends Manager
{
private static final LogProvider log = Logging.getLogProvider(FacesManager.class);
1.4 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/FacesMessages.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FacesMessages.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/FacesMessages.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- FacesMessages.java 19 Jun 2007 20:08:12 -0000 1.3
+++ FacesMessages.java 20 Jun 2007 17:45:55 -0000 1.4
@@ -1,6 +1,5 @@
package org.jboss.seam.faces;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.Serializable;
@@ -20,9 +19,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.core.Interpolator;
import org.jboss.seam.core.ResourceBundle;
@@ -36,7 +35,7 @@
@Scope(ScopeType.CONVERSATION)
@Name("org.jboss.seam.faces.facesMessages")
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
- at Intercept(NEVER)
+ at BypassInterceptors
public class FacesMessages implements Serializable
{
private static final long serialVersionUID = -5395975397632138270L;
1.5 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/FacesPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FacesPage.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/FacesPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- FacesPage.java 20 Jun 2007 15:53:32 -0000 1.4
+++ FacesPage.java 20 Jun 2007 17:45:55 -0000 1.5
@@ -5,12 +5,11 @@
import java.io.Serializable;
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.core.Init;
import org.jboss.seam.core.Manager;
@@ -26,7 +25,7 @@
*
*/
@Name("org.jboss.seam.faces.facesPage")
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
@Scope(ScopeType.PAGE)
public class FacesPage implements Serializable
1.3 +3 -4 jboss-seam/src/main/org/jboss/seam/faces/HttpError.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HttpError.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/HttpError.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- HttpError.java 19 Jun 2007 20:08:12 -0000 1.2
+++ HttpError.java 20 Jun 2007 17:45:55 -0000 1.3
@@ -1,7 +1,6 @@
-//$Id: HttpError.java,v 1.2 2007/06/19 20:08:12 gavin Exp $
+//$Id: HttpError.java,v 1.3 2007/06/20 17:45:55 gavin Exp $
package org.jboss.seam.faces;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.IOException;
@@ -12,9 +11,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;
/**
@@ -23,7 +22,7 @@
* @author Gavin King
*/
@Scope(ScopeType.APPLICATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Name("org.jboss.seam.faces.httpError")
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
public class HttpError
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/IsUserInRole.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: IsUserInRole.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/IsUserInRole.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- IsUserInRole.java 19 Jun 2007 20:08:12 -0000 1.2
+++ IsUserInRole.java 20 Jun 2007 17:45:55 -0000 1.3
@@ -1,15 +1,14 @@
package org.jboss.seam.faces;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.FRAMEWORK;
import javax.faces.context.FacesContext;
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;
/**
* Manager component for a map of roles assigned
@@ -19,7 +18,7 @@
* @author Gavin King
*/
@Scope(ScopeType.APPLICATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Name("org.jboss.seam.web.isUserInRole")
@Install(precedence=FRAMEWORK, classDependencies="javax.faces.context.FacesContext")
public class IsUserInRole extends org.jboss.seam.web.IsUserInRole
1.2 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/Parameters.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Parameters.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/Parameters.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Parameters.java 19 Jun 2007 20:08:12 -0000 1.1
+++ Parameters.java 20 Jun 2007 17:45:55 -0000 1.2
@@ -8,15 +8,14 @@
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
-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;
@Name("org.jboss.seam.web.parameters")
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Scope(ScopeType.STATELESS)
@Install(precedence=FRAMEWORK, classDependencies="javax.faces.context.FacesContext")
public class Parameters extends org.jboss.seam.web.Parameters
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/Redirect.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Redirect.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/Redirect.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Redirect.java 19 Jun 2007 20:08:12 -0000 1.2
+++ Redirect.java 20 Jun 2007 17:45:55 -0000 1.3
@@ -9,13 +9,12 @@
import javax.faces.context.FacesContext;
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.PerNestedConversation;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.AbstractMutable;
import org.jboss.seam.core.Conversation;
@@ -28,7 +27,7 @@
* @author Gavin King
*/
@Name("org.jboss.seam.faces.redirect")
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Scope(ScopeType.CONVERSATION)
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
@PerNestedConversation
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/Switcher.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Switcher.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/Switcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Switcher.java 19 Jun 2007 20:08:12 -0000 1.2
+++ Switcher.java 20 Jun 2007 17:45:55 -0000 1.3
@@ -1,6 +1,5 @@
package org.jboss.seam.faces;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.io.Serializable;
@@ -15,9 +14,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.core.ConversationEntries;
import org.jboss.seam.core.ConversationEntry;
import org.jboss.seam.core.Manager;
@@ -31,7 +30,7 @@
@Scope(ScopeType.PAGE)
@Name("org.jboss.seam.faces.switcher")
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
- at Intercept(NEVER)
+ at BypassInterceptors
public class Switcher implements Serializable
{
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/UiComponent.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UiComponent.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/UiComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- UiComponent.java 19 Jun 2007 20:08:12 -0000 1.2
+++ UiComponent.java 20 Jun 2007 17:45:55 -0000 1.3
@@ -1,6 +1,5 @@
package org.jboss.seam.faces;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.ScopeType.STATELESS;
import static org.jboss.seam.annotations.Install.BUILT_IN;
@@ -12,13 +11,13 @@
import javax.faces.context.FacesContext;
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;
@Name("org.jboss.seam.faces.uiComponent")
- at Intercept(NEVER)
+ at BypassInterceptors
@Scope(STATELESS)
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
public class UiComponent
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/UserPrincipal.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UserPrincipal.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/UserPrincipal.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- UserPrincipal.java 19 Jun 2007 20:08:12 -0000 1.2
+++ UserPrincipal.java 20 Jun 2007 17:45:55 -0000 1.3
@@ -1,6 +1,5 @@
package org.jboss.seam.faces;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.FRAMEWORK;
import java.security.Principal;
@@ -10,10 +9,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.contexts.Contexts;
/**
@@ -23,7 +22,7 @@
* @author Gavin King
*/
@Scope(ScopeType.APPLICATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Name("org.jboss.seam.web.userPrincipal")
@Install(precedence=FRAMEWORK, classDependencies="javax.faces.context.FacesContext")
public class UserPrincipal extends org.jboss.seam.web.UserPrincipal
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/faces/Validation.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Validation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/Validation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Validation.java 19 Jun 2007 21:36:10 -0000 1.2
+++ Validation.java 20 Jun 2007 17:45:55 -0000 1.3
@@ -5,11 +5,10 @@
import javax.faces.context.FacesContext;
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.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
@@ -22,7 +21,7 @@
*
*/
@Name("org.jboss.seam.faces.validation")
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
public class Validation
{
More information about the jboss-cvs-commits
mailing list