diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/FilterToBeanProxy.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/FilterToBeanProxy.java deleted file mode 100644 index cda4fb5..0000000 --- a/cas-client-core/src/main/java/org/jasig/cas/client/util/FilterToBeanProxy.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2006 The JA-SIG Collaborative. All rights reserved. See license - * distributed with this file and available online at - * http://www.ja-sig.org/products/cas/overview/license/index.html - */ -package org.jasig.cas.client.util; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.ApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; - -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 java.io.IOException; - -/** - * Utility class to retrieve a Filter from a Spring-managed configuration file. - * Based on the FilterToBeanProxy class in Acegi Security (but simplified) - * - * @author Scott Battaglia - * @version $Revision$ $Date$ - * @since 3.0 - */ -public class FilterToBeanProxy implements Filter { - - /** - * The filter we are proxying. - */ - private Filter filter; - - /** - * Instance of commons logging. - */ - protected final Log log = LogFactory.getLog(this.getClass()); - - public final void destroy() { - // nothing to do - } - - public final void doFilter(final ServletRequest request, - final ServletResponse response, final FilterChain chain) - throws IOException, ServletException { - this.filter.doFilter(request, response, chain); - } - - public final void init(final FilterConfig filterConfig) - throws ServletException { - final String targetBean = filterConfig.getInitParameter("targetBean"); - - if (CommonUtils.isBlank(targetBean)) { - throw new ServletException( - "init-parameter missing: targetBean is required."); - } - - final ApplicationContext ctx = this.getContext(filterConfig); - - if (!ctx.containsBean(targetBean)) { - throw new ServletException("targetBean '" + targetBean - + "' not found in context"); - } - - log.trace("Loading filter from Spring ApplicationContext with name: " + targetBean); - this.filter = (Filter) ctx.getBean(targetBean, Filter.class); - } - - protected ApplicationContext getContext(FilterConfig filterConfig) { - return WebApplicationContextUtils - .getRequiredWebApplicationContext(filterConfig.getServletContext()); - } -} diff --git a/cas-client-core/src/main/resources/web-simple-example.xml b/cas-client-core/src/main/resources/web-simple-example.xml index 372ec48..6cbeb37 100644 --- a/cas-client-core/src/main/resources/web-simple-example.xml +++ b/cas-client-core/src/main/resources/web-simple-example.xml @@ -17,27 +17,27 @@ CAS Authentication Filter Proxy - org.jasig.cas.client.util.FilterToBeanProxy + org.springframework.web.filter.DelegatingFilterProxy - targetBean + targetBeanName casAuthenticationFilter CAS Validation Filter Proxy - org.jasig.cas.client.util.FilterToBeanProxy + org.springframework.web.filter.DelegatingFilterProxy - targetBean + targetBeanName casValidationFilter CAS Authorization Filter Proxy - org.jasig.cas.client.util.FilterToBeanProxy + org.springframework.web.filter.DelegatingFilterProxy - targetBean + targetBeanName casAuthorizationFilter