[jboss-cvs] jboss-seam/src/main/org/jboss/seam/web ...
Gavin King
gavin.king at jboss.com
Wed Jun 20 13:45:58 EDT 2007
User: gavin
Date: 07/06/20 13:45:58
Modified: src/main/org/jboss/seam/web
AbstractAjax4jsfFilter.java
AuthenticationFilter.java
CharacterEncodingFilter.java ContextFilter.java
ExceptionFilter.java IsUserInRole.java
MultipartFilter.java Parameters.java
RedirectFilter.java ServletContexts.java
UserPrincipal.java
Log:
refactored interception annotations
Revision Changes Path
1.2 +2 -3 jboss-seam/src/main/org/jboss/seam/web/AbstractAjax4jsfFilter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractAjax4jsfFilter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/AbstractAjax4jsfFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AbstractAjax4jsfFilter.java 4 May 2007 11:31:34 -0000 1.1
+++ AbstractAjax4jsfFilter.java 20 Jun 2007 17:45:58 -0000 1.2
@@ -1,6 +1,5 @@
package org.jboss.seam.web;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.ScopeType.APPLICATION;
import static org.jboss.seam.annotations.Install.BUILT_IN;
@@ -14,14 +13,14 @@
import org.jboss.seam.annotations.Filter;
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;
@Scope(APPLICATION)
@Name("org.jboss.seam.web.ajax4jsfFilter")
@Install(precedence = BUILT_IN, classDependencies="org.ajax4jsf.Filter")
- at Intercept(NEVER)
+ at BypassInterceptors
@Filter
public class AbstractAjax4jsfFilter extends AbstractFilter
{
1.7 +2 -3 jboss-seam/src/main/org/jboss/seam/web/AuthenticationFilter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AuthenticationFilter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/AuthenticationFilter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- AuthenticationFilter.java 20 Jun 2007 08:23:18 -0000 1.6
+++ AuthenticationFilter.java 20 Jun 2007 17:45:58 -0000 1.7
@@ -1,6 +1,5 @@
package org.jboss.seam.web;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.ScopeType.APPLICATION;
import static org.jboss.seam.annotations.Install.BUILT_IN;
@@ -19,11 +18,11 @@
import org.jboss.seam.Seam;
import org.jboss.seam.annotations.Filter;
import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Logger;
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.Context;
import org.jboss.seam.contexts.ContextualHttpServletRequest;
import org.jboss.seam.contexts.SessionContext;
@@ -46,7 +45,7 @@
@Scope(APPLICATION)
@Name("org.jboss.seam.web.authenticationFilter")
@Install(value = false, precedence = BUILT_IN)
- at Intercept(NEVER)
+ at BypassInterceptors
@Filter(within = "org.jboss.seam.web.exceptionFilter")
public class AuthenticationFilter extends AbstractFilter
{
1.6 +2 -3 jboss-seam/src/main/org/jboss/seam/web/CharacterEncodingFilter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CharacterEncodingFilter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/CharacterEncodingFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CharacterEncodingFilter.java 4 May 2007 11:31:34 -0000 1.5
+++ CharacterEncodingFilter.java 20 Jun 2007 17:45:58 -0000 1.6
@@ -1,5 +1,4 @@
package org.jboss.seam.web;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.ScopeType.APPLICATION;
import static org.jboss.seam.annotations.Install.BUILT_IN;
@@ -12,10 +11,10 @@
import org.jboss.seam.annotations.Filter;
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.Startup;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
/**
* A servlet filter that lets you set the character encoding of
* submitted data. There are two init parameters: "encoding" and
@@ -28,7 +27,7 @@
@Scope(APPLICATION)
@Name("org.jboss.seam.servlet.characterEncodingFilter")
@Install(value=false, precedence = BUILT_IN)
- at Intercept(NEVER)
+ at BypassInterceptors
@Filter(within="org.jboss.seam.web.ajax4jsfFilter")
public class CharacterEncodingFilter extends AbstractFilter
{
1.10 +2 -3 jboss-seam/src/main/org/jboss/seam/web/ContextFilter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ContextFilter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/ContextFilter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ContextFilter.java 20 Jun 2007 08:23:18 -0000 1.9
+++ ContextFilter.java 20 Jun 2007 17:45:58 -0000 1.10
@@ -1,6 +1,5 @@
package org.jboss.seam.web;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.ScopeType.APPLICATION;
import static org.jboss.seam.annotations.Install.BUILT_IN;
@@ -14,10 +13,10 @@
import org.jboss.seam.annotations.Filter;
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.Startup;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.ContextualHttpServletRequest;
/**
@@ -29,7 +28,7 @@
@Scope(APPLICATION)
@Name("org.jboss.seam.web.contextFilter")
@Install(value=false, precedence = BUILT_IN)
- at Intercept(NEVER)
+ at BypassInterceptors
@Filter(within="org.jboss.seam.web.ajax4jsfFilter")
public class ContextFilter extends AbstractFilter
{
1.13 +2 -3 jboss-seam/src/main/org/jboss/seam/web/ExceptionFilter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ExceptionFilter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/ExceptionFilter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ExceptionFilter.java 20 Jun 2007 08:23:18 -0000 1.12
+++ ExceptionFilter.java 20 Jun 2007 17:45:58 -0000 1.13
@@ -6,7 +6,6 @@
*/
package org.jboss.seam.web;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.ScopeType.APPLICATION;
import static org.jboss.seam.annotations.Install.BUILT_IN;
@@ -21,10 +20,10 @@
import org.jboss.seam.annotations.Filter;
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.Startup;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.FacesLifecycle;
import org.jboss.seam.exceptions.Exceptions;
import org.jboss.seam.log.LogProvider;
@@ -47,7 +46,7 @@
@Scope(APPLICATION)
@Name("org.jboss.seam.web.exceptionFilter")
@Install(precedence = BUILT_IN)
- at Intercept(NEVER)
+ at BypassInterceptors
@Filter(within="org.jboss.seam.web.ajax4jsfFilter")
public class ExceptionFilter extends AbstractFilter
{
1.2 +2 -3 jboss-seam/src/main/org/jboss/seam/web/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/web/IsUserInRole.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- IsUserInRole.java 19 Jun 2007 20:08:14 -0000 1.1
+++ IsUserInRole.java 20 Jun 2007 17:45:58 -0000 1.2
@@ -1,6 +1,5 @@
package org.jboss.seam.web;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.util.AbstractMap;
@@ -12,10 +11,10 @@
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;
/**
* Manager component for a map of roles assigned
@@ -25,7 +24,7 @@
* @author Gavin King
*/
@Scope(ScopeType.APPLICATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Name("org.jboss.seam.web.isUserInRole")
@Install(precedence=BUILT_IN)
public class IsUserInRole
1.6 +2 -3 jboss-seam/src/main/org/jboss/seam/web/MultipartFilter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MultipartFilter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/MultipartFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- MultipartFilter.java 13 Jun 2007 11:06:53 -0000 1.5
+++ MultipartFilter.java 20 Jun 2007 17:45:58 -0000 1.6
@@ -1,6 +1,5 @@
package org.jboss.seam.web;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.ScopeType.APPLICATION;
import static org.jboss.seam.annotations.Install.BUILT_IN;
@@ -15,16 +14,16 @@
import org.jboss.seam.annotations.Filter;
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.Startup;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
@Startup
@Scope(APPLICATION)
@Name("org.jboss.seam.web.multipartFilter")
@Install(precedence = BUILT_IN)
- at Intercept(NEVER)
+ at BypassInterceptors
@Filter(within={"org.jboss.seam.web.ajax4jsfFilter", "org.jboss.seam.web.exceptionFilter"})
public class MultipartFilter extends AbstractFilter
{
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/web/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/web/Parameters.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Parameters.java 19 Jun 2007 20:08:14 -0000 1.2
+++ Parameters.java 20 Jun 2007 17:45:58 -0000 1.3
@@ -9,15 +9,14 @@
import javax.servlet.ServletRequest;
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;
@Name("org.jboss.seam.web.parameters")
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Scope(ScopeType.STATELESS)
@Install(precedence=BUILT_IN)
public class Parameters
1.13 +2 -3 jboss-seam/src/main/org/jboss/seam/web/RedirectFilter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RedirectFilter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/RedirectFilter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- RedirectFilter.java 20 Jun 2007 05:48:03 -0000 1.12
+++ RedirectFilter.java 20 Jun 2007 17:45:58 -0000 1.13
@@ -1,6 +1,5 @@
package org.jboss.seam.web;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.ScopeType.APPLICATION;
import static org.jboss.seam.annotations.Install.BUILT_IN;
@@ -17,10 +16,10 @@
import org.jboss.seam.annotations.Filter;
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.Startup;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.faces.FacesManager;
import org.jboss.seam.navigation.Pages;
@@ -37,7 +36,7 @@
@Scope(APPLICATION)
@Name("org.jboss.seam.web.redirectFilter")
@Install(precedence = BUILT_IN, classDependencies="javax.faces.FacesContext")
- at Intercept(NEVER)
+ at BypassInterceptors
@Filter(within="org.jboss.seam.web.ajax4jsfFilter")
public class RedirectFilter extends AbstractFilter
{
1.3 +2 -3 jboss-seam/src/main/org/jboss/seam/web/ServletContexts.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServletContexts.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/ServletContexts.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ServletContexts.java 19 Jun 2007 20:08:14 -0000 1.2
+++ ServletContexts.java 20 Jun 2007 17:45:58 -0000 1.3
@@ -11,12 +11,11 @@
import javax.servlet.http.HttpServletRequest;
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;
/**
@@ -27,7 +26,7 @@
*/
@Scope(ScopeType.EVENT)
@Name("org.jboss.seam.web.servletContexts")
- at Intercept(InterceptionType.NEVER)
+ at BypassInterceptors
@Install(precedence=BUILT_IN)
public class ServletContexts
{
1.2 +2 -3 jboss-seam/src/main/org/jboss/seam/web/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/web/UserPrincipal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UserPrincipal.java 19 Jun 2007 20:08:14 -0000 1.1
+++ UserPrincipal.java 20 Jun 2007 17:45:58 -0000 1.2
@@ -1,6 +1,5 @@
package org.jboss.seam.web;
-import static org.jboss.seam.InterceptionType.NEVER;
import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.security.Principal;
@@ -11,10 +10,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;
/**
@@ -24,7 +23,7 @@
* @author Gavin King
*/
@Scope(ScopeType.APPLICATION)
- at Intercept(NEVER)
+ at BypassInterceptors
@Name("org.jboss.seam.web.userPrincipal")
@Install(precedence=BUILT_IN)
public class UserPrincipal
More information about the jboss-cvs-commits
mailing list