From fa396c6cdff0c284a01b68401004e227e9c9e590 Mon Sep 17 00:00:00 2001 From: Ben Alex Date: Tue, 3 Aug 2004 07:18:33 +0000 Subject: [PATCH] Load AutoIntegrationFilter via FilterToBeanProxy. --- docs/reference/src/index.xml | 11 +++++++++- .../contacts/etc/ca/applicationContext.xml | 2 ++ samples/contacts/etc/ca/web.xml | 6 +++++- .../contacts/etc/cas/applicationContext.xml | 2 ++ samples/contacts/etc/cas/web.xml | 6 +++++- .../etc/filter/applicationContext.xml | 2 ++ samples/contacts/etc/filter/web.xml | 6 +++++- .../war-root/WEB-INF/applicationContext.xml | 2 ++ samples/quick-start/war-root/WEB-INF/web.xml | 6 +++++- upgrade-05-06.txt | 20 +++++++++++++++++++ 10 files changed, 58 insertions(+), 5 deletions(-) diff --git a/docs/reference/src/index.xml b/docs/reference/src/index.xml index bd31914eca..9d9cc57da1 100644 --- a/docs/reference/src/index.xml +++ b/docs/reference/src/index.xml @@ -1856,7 +1856,11 @@ public boolean supports(Class clazz); <filter> <filter-name>Acegi Security System for Spring Auto Integration Filter</filter-name> - <filter-class>net.sf.acegisecurity.ui.AutoIntegrationFilter</filter-class> + <filter-class>net.sf.acegisecurity.util.FilterToBeanProxy</filter-class> + <init-param> + <param-name>targetClass</param-name> + <param-value>net.sf.acegisecurity.ui.AutoIntegrationFilter</param-value> + </init-param> </filter> <filter-mapping> @@ -1864,6 +1868,11 @@ public boolean supports(Class clazz); <url-pattern>/*</url-pattern> </filter-mapping> + You will also need to add the following line to your application + context: + + <bean id="autoIntegrationFilter" class="net.sf.acegisecurity.ui.AutoIntegrationFilter" /> + Once in the ContextHolder, the standard Acegi Security System for Spring classes can be used. Because ContextHolder is a standard object which is diff --git a/samples/contacts/etc/ca/applicationContext.xml b/samples/contacts/etc/ca/applicationContext.xml index 46802b2516..bb68bb07f7 100644 --- a/samples/contacts/etc/ca/applicationContext.xml +++ b/samples/contacts/etc/ca/applicationContext.xml @@ -59,6 +59,8 @@ Contacts Realm + + diff --git a/samples/contacts/etc/ca/web.xml b/samples/contacts/etc/ca/web.xml index 4bc7ff1dc6..4994cbca72 100644 --- a/samples/contacts/etc/ca/web.xml +++ b/samples/contacts/etc/ca/web.xml @@ -35,7 +35,11 @@ Acegi Security System for Spring Auto Integration Filter - net.sf.acegisecurity.ui.AutoIntegrationFilter + net.sf.acegisecurity.util.FilterToBeanProxy + + targetClass + net.sf.acegisecurity.ui.AutoIntegrationFilter + diff --git a/samples/contacts/etc/cas/applicationContext.xml b/samples/contacts/etc/cas/applicationContext.xml index 3de67912e4..9fb59f0e98 100644 --- a/samples/contacts/etc/cas/applicationContext.xml +++ b/samples/contacts/etc/cas/applicationContext.xml @@ -50,6 +50,8 @@ Contacts Realm + + diff --git a/samples/contacts/etc/cas/web.xml b/samples/contacts/etc/cas/web.xml index 8474ca5842..51c6fd479b 100644 --- a/samples/contacts/etc/cas/web.xml +++ b/samples/contacts/etc/cas/web.xml @@ -62,7 +62,11 @@ Acegi Security System for Spring Auto Integration Filter - net.sf.acegisecurity.ui.AutoIntegrationFilter + net.sf.acegisecurity.util.FilterToBeanProxy + + targetClass + net.sf.acegisecurity.ui.AutoIntegrationFilter + diff --git a/samples/contacts/etc/filter/applicationContext.xml b/samples/contacts/etc/filter/applicationContext.xml index b5886c5b19..a78d2e547e 100644 --- a/samples/contacts/etc/filter/applicationContext.xml +++ b/samples/contacts/etc/filter/applicationContext.xml @@ -70,6 +70,8 @@ Contacts Realm + + diff --git a/samples/contacts/etc/filter/web.xml b/samples/contacts/etc/filter/web.xml index 07460a12ea..9e138212d4 100644 --- a/samples/contacts/etc/filter/web.xml +++ b/samples/contacts/etc/filter/web.xml @@ -53,7 +53,11 @@ Acegi Security System for Spring Auto Integration Filter - net.sf.acegisecurity.ui.AutoIntegrationFilter + net.sf.acegisecurity.util.FilterToBeanProxy + + targetClass + net.sf.acegisecurity.ui.AutoIntegrationFilter + diff --git a/samples/quick-start/war-root/WEB-INF/applicationContext.xml b/samples/quick-start/war-root/WEB-INF/applicationContext.xml index 3ac87fe5b6..0d828f1cec 100644 --- a/samples/quick-start/war-root/WEB-INF/applicationContext.xml +++ b/samples/quick-start/war-root/WEB-INF/applicationContext.xml @@ -88,4 +88,6 @@ false + + diff --git a/samples/quick-start/war-root/WEB-INF/web.xml b/samples/quick-start/war-root/WEB-INF/web.xml index 055a243688..c9c9f4a0eb 100644 --- a/samples/quick-start/war-root/WEB-INF/web.xml +++ b/samples/quick-start/war-root/WEB-INF/web.xml @@ -26,7 +26,11 @@ Acegi Security System for Spring Auto Integration Filter - net.sf.acegisecurity.ui.AutoIntegrationFilter + net.sf.acegisecurity.util.FilterToBeanProxy + + targetClass + net.sf.acegisecurity.ui.AutoIntegrationFilter + diff --git a/upgrade-05-06.txt b/upgrade-05-06.txt index cee8b6b34a..0c04bf1d5e 100644 --- a/upgrade-05-06.txt +++ b/upgrade-05-06.txt @@ -47,4 +47,24 @@ applications: changed. Most CAS users will be using DaoCasAuthoritiesPopulator, so this change is unlikely to require any action. +- Please check your web.xml for whether you are using AutoIntegrationFilter. + Previously this class was loaded directly by web.xml as a filter. It is + now recommended to load it via FilterToBeanProxy and define it as a + bean in your application context. This usually involves making the entry + in web.xml match the following: + + + Acegi Security System for Spring Auto Integration Filter + net.sf.acegisecurity.util.FilterToBeanProxy + + targetClass + net.sf.acegisecurity.ui.AutoIntegrationFilter + + + + Then add the following to applicationContext.xml: + + + + $Id$