[jboss-cvs] jboss-seam/src/main/org/jboss/seam/web ...
Gavin King
gavin.king at jboss.com
Sat Feb 10 11:31:25 EST 2007
User: gavin
Date: 07/02/10 11:31:25
Modified: src/main/org/jboss/seam/web
CharacterEncodingFilter.java ContextFilter.java
ExceptionFilter.java MultipartFilter.java
RedirectFilter.java SeamFilter.java
Log:
dont need disabled, we already have installed
Revision Changes Path
1.4 +2 -2 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CharacterEncodingFilter.java 10 Feb 2007 09:02:40 -0000 1.3
+++ CharacterEncodingFilter.java 10 Feb 2007 16:31:25 -0000 1.4
@@ -26,9 +26,9 @@
@Startup
@Scope(APPLICATION)
@Name("org.jboss.seam.servlet.characterEncodingFilter")
- at Install(precedence = BUILT_IN)
+ at Install(value=false, precedence = BUILT_IN)
@Intercept(NEVER)
-public class CharacterEncodingFilter extends BaseFilter
+public class CharacterEncodingFilter extends AbstractFilter
{
private String encoding;
private boolean overrideClient;
1.3 +2 -25 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ContextFilter.java 10 Feb 2007 08:52:10 -0000 1.2
+++ ContextFilter.java 10 Feb 2007 16:31:25 -0000 1.3
@@ -33,34 +33,11 @@
@Startup
@Scope(APPLICATION)
@Name("org.jboss.seam.servlet.contextFilter")
- at Install(precedence = BUILT_IN)
+ at Install(value=false, precedence = BUILT_IN)
@Intercept(NEVER)
-public class ContextFilter extends BaseFilter
+public class ContextFilter extends AbstractFilter
{
private static final LogProvider log = Logging.getLogProvider(ContextFilter.class);
- private boolean explicitDisabled = false;
-
- /**
- * This filter is disabled by default, unless a urlPattern is set
- */
- public ContextFilter()
- {
- super.setDisabled(true);
- }
-
- @Override
- public void setUrlPattern(String urlPattern)
- {
- super.setUrlPattern(urlPattern);
- if (!explicitDisabled) setDisabled(false);
- }
-
- @Override
- public void setDisabled(boolean disabled)
- {
- super.setDisabled(disabled);
- if (disabled) explicitDisabled = true;
- }
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException
1.3 +1 -1 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ExceptionFilter.java 10 Feb 2007 08:36:35 -0000 1.2
+++ ExceptionFilter.java 10 Feb 2007 16:31:25 -0000 1.3
@@ -44,7 +44,7 @@
@Name("org.jboss.seam.servlet.exceptionFilter")
@Install(precedence = BUILT_IN)
@Intercept(NEVER)
-public class ExceptionFilter extends BaseFilter
+public class ExceptionFilter extends AbstractFilter
{
private static final LogProvider log = Logging.getLogProvider(ExceptionFilter.class);
1.2 +1 -1 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MultipartFilter.java 10 Feb 2007 07:32:34 -0000 1.1
+++ MultipartFilter.java 10 Feb 2007 16:31:25 -0000 1.2
@@ -24,7 +24,7 @@
@Name("org.jboss.seam.servlet.multipartFilter")
@Install(precedence = BUILT_IN)
@Intercept(NEVER)
-public class MultipartFilter extends BaseFilter
+public class MultipartFilter extends AbstractFilter
{
public static final String MULTIPART = "multipart/";
1.3 +1 -1 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RedirectFilter.java 10 Feb 2007 08:36:35 -0000 1.2
+++ RedirectFilter.java 10 Feb 2007 16:31:25 -0000 1.3
@@ -34,7 +34,7 @@
@Name("org.jboss.seam.servlet.redirectFilter")
@Install(precedence = BUILT_IN)
@Intercept(NEVER)
-public class RedirectFilter extends BaseFilter
+public class RedirectFilter extends AbstractFilter
{
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException
1.4 +10 -20 jboss-seam/src/main/org/jboss/seam/web/SeamFilter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SeamFilter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/SeamFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SeamFilter.java 10 Feb 2007 09:21:42 -0000 1.3
+++ SeamFilter.java 10 Feb 2007 16:31:25 -0000 1.4
@@ -41,10 +41,10 @@
{
Filter filter = filters.get(index);
- if (filter instanceof BaseFilter)
+ if (filter instanceof AbstractFilter)
{
- BaseFilter bf = (BaseFilter) filter;
- if ( bf.getUrlPattern() == null || bf.matchesRequestPath(request) )
+ AbstractFilter bf = (AbstractFilter) filter;
+ if ( bf.matchesRequestPath(request) )
{
filter.doFilter(request, response, this);
}
@@ -65,35 +65,25 @@
}
}
- public void init(FilterConfig filterConfig)
- throws ServletException
+ public void init(FilterConfig filterConfig) throws ServletException
{
Context tempApplicationContext = new WebApplicationContext( filterConfig.getServletContext() );
Init init = (Init) tempApplicationContext.get(Init.class);
- for ( Class filterClass : init.getInstalledFilters() )
+ for ( String filterName: init.getInstalledFilters() )
{
- Filter filter = (Filter) tempApplicationContext.get(filterClass);
- if ( !isDisabled(filter) )
- {
- log.info( "Initializing filter: " + filterClass.getName() );
+ Filter filter = (Filter) tempApplicationContext.get(filterName);
+ log.info( "Initializing filter: " + filterName );
filter.init(filterConfig);
filters.add(filter);
}
}
- }
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain)
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException
{
new FilterChainImpl(chain).doFilter(request, response);
}
- private boolean isDisabled(Filter filter)
- {
- return filter instanceof BaseFilter && ( (BaseFilter) filter ).isDisabled();
- }
-
public void destroy()
{
for (Filter filter: filters)
More information about the jboss-cvs-commits
mailing list