*/
-public class HTTPExceptionTranslationFilter implements Filter{
+public class HTTPExceptionTranslationFilter implements GeoServerFilter {
static Logger LOGGER = org.geotools.util.logging.Logging.getLogger("org.geoserver.community");
diff --git a/src/community/openplans-authentication/src/main/java/org/openplans/security/OpenPlansProcessingFilter.java b/src/community/openplans-authentication/src/main/java/org/openplans/security/OpenPlansProcessingFilter.java
index c282be2..8f5b473 100644
--- a/src/community/openplans-authentication/src/main/java/org/openplans/security/OpenPlansProcessingFilter.java
+++ b/src/community/openplans-authentication/src/main/java/org/openplans/security/OpenPlansProcessingFilter.java
@@ -27,6 +27,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.geoserver.filters.GeoServerFilter;
import org.springframework.security.Authentication;
import org.springframework.security.AuthenticationException;
import org.springframework.security.AuthenticationManager;
@@ -50,7 +51,7 @@ import sun.misc.BASE64Decoder;
* @author David Winslow - TOPP
* @note This class is heavily based on the BasicProcessingFilter provided in the main Spring Security Security code.
*/
-public class OpenPlansProcessingFilter implements Filter, InitializingBean {
+public class OpenPlansProcessingFilter implements GeoServerFilter, InitializingBean {
//~ Static fields/initializers =====================================================================================
static Logger LOGGER = org.geotools.util.logging.Logging.getLogger("org.geoserver.community");
diff --git a/src/main/src/main/java/org/geoserver/filters/GeoServerFilter.java b/src/main/src/main/java/org/geoserver/filters/GeoServerFilter.java
new file mode 100644
index 0000000..0ac3de9
--- /dev/null
+++ b/src/main/src/main/java/org/geoserver/filters/GeoServerFilter.java
@@ -0,0 +1,18 @@
+/* Copyright (c) 2001 - 2010 TOPP - www.openplans.org. All rights reserved.
+ * This code is licensed under the GPL 2.0 license, availible at the root
+ * application directory.
+ */
+package org.geoserver.filters;
+
+import javax.servlet.Filter;
+
+/**
+ * Marks all filters that {@link SpringDelegatingFilter} will pick up from the Spring application
+ * context and run against each servlet request
+ *
+ * @author Andrea Aime - GeoSolutions
+ *
+ */
+public interface GeoServerFilter extends Filter {
+
+}
diff --git a/src/main/src/main/java/org/geoserver/filters/SpringDelegatingFilter.java b/src/main/src/main/java/org/geoserver/filters/SpringDelegatingFilter.java
new file mode 100644
index 0000000..3ff5213
--- /dev/null
+++ b/src/main/src/main/java/org/geoserver/filters/SpringDelegatingFilter.java
@@ -0,0 +1,79 @@
+/* Copyright (c) 2001 - 2010 TOPP - www.openplans.org. All rights reserved.
+ * This code is licensed under the GPL 2.0 license, availible at the root
+ * application directory.
+ */
+package org.geoserver.filters;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.geoserver.platform.ExtensionPriority;
+import org.geoserver.platform.GeoServerExtensions;
+
+/**
+ *
+ * A composite servlet filter that loaders delegate filters from a spring context, rather then from
+ * the traditional web.xml. This class allows for servlet filters to be dynamically contributed via
+ * a spring context.
+ *
+ * It will pick up any filter declared in the Spring context that implements the
+ * {@link GeoServerFilter} interface
.
+ * Ordering of the filters won't normally be predictable, but as with all other extension points
+ * it's possible to force a specific ordering by having filters implement the
+ * {@link ExtensionPriority} interface
+ *
+ *
+ * @author Justin Deoliveira, OpenGeo
+ */
+public class SpringDelegatingFilter implements Filter {
+
+ List filters;
+
+ public void init(FilterConfig filterConfig) throws ServletException {
+ filters = GeoServerExtensions.extensions(GeoServerFilter.class);
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+ throws IOException, ServletException {
+ new Chain(chain).doFilter(request, response);
+ }
+
+ public void destroy() {
+ if (filters != null) {
+ for (Filter f : filters) {
+ f.destroy();
+ }
+ filters = null;
+ }
+ }
+
+ class Chain implements FilterChain {
+
+ FilterChain delegate;
+ int filter = 0;
+
+ public Chain(FilterChain chain) {
+ this.delegate = chain;
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response) throws IOException,
+ ServletException {
+
+ if (filter < filters.size()) {
+ filters.get(filter++).doFilter(request, response, this);
+ }
+ else {
+ //resume the actual chain
+ delegate.doFilter(request, response);
+ }
+ }
+
+ }
+}
diff --git a/src/web/app/src/main/java/org/geoserver/filters/SpringDelegatingFilter.java b/src/web/app/src/main/java/org/geoserver/filters/SpringDelegatingFilter.java
deleted file mode 100644
index 5c543f2..0000000
--- a/src/web/app/src/main/java/org/geoserver/filters/SpringDelegatingFilter.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright (c) 2001 - 2010 TOPP - www.openplans.org. All rights reserved.
- * This code is licensed under the GPL 2.0 license, availible at the root
- * application directory.
- */
-package org.geoserver.filters;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.geoserver.platform.GeoServerExtensions;
-
-/**
- * @author Justin Deoliveira, OpenGeo
- *
- *
- * A composite servlet filter that loaders delegate filters from a spring context, rather then from
- * the traditional web.xml. This class allows for servlet filters to be dynamically contributed via
- * a spring context.
- *
- *
- */
-public class SpringDelegatingFilter implements Filter {
-
- List filters;
-
- public void init(FilterConfig filterConfig) throws ServletException {
- filters = GeoServerExtensions.extensions(Filter.class);
- }
-
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException {
- new Chain(chain).doFilter(request, response);
- }
-
- public void destroy() {
- if (filters != null) {
- for (Filter f : filters) {
- f.destroy();
- }
- filters = null;
- }
- }
-
- class Chain implements FilterChain {
-
- FilterChain delegate;
- int filter = 0;
-
- public Chain(FilterChain chain) {
- this.delegate = chain;
- }
-
- public void doFilter(ServletRequest request, ServletResponse response) throws IOException,
- ServletException {
-
- if (filter < filters.size()) {
- filters.get(filter++).doFilter(request, response, this);
- }
- else {
- //resume the actual chain
- delegate.doFilter(request, response);
- }
- }
-
- }
-}