[java-identity-provider] branch main updated: IDP-2130 - FlowModelFlowBuilder should add our profile bean processors

Scott Cantor cantor.2 at osu.edu
Wed Jun 14 17:57:39 UTC 2023 

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=29974c7a47a4a9bb11db633762c75e987bf22b05

The following commit(s) were added to refs/heads/main by this push:
     new 29974c7a4 IDP-2130 - FlowModelFlowBuilder should add our profile bean processors
29974c7a4 is described below

commit 29974c7a47a4a9bb11db633762c75e987bf22b05
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jun 14 13:57:35 2023 -0400

    IDP-2130 - FlowModelFlowBuilder should add our profile bean processors
    
    https://shibboleth.atlassian.net/browse/IDP-2130
---
 .../src/test/resources/spring/test-flow-beans.xml        | 16 ----------------
 .../shibboleth/idp/flows/admin/admin-abstract-beans.xml  |  3 ---
 .../shibboleth/idp/flows/authn/authn-abstract-beans.xml  |  5 -----
 .../net/shibboleth/idp/flows/authn/authn-beans.xml       |  3 ---
 .../net/shibboleth/idp/flows/authn/discovery-beans.xml   |  3 ---
 .../shibboleth/idp/flows/authn/external-authn-beans.xml  |  3 ---
 .../shibboleth/idp/flows/authn/function-authn-beans.xml  |  3 ---
 .../shibboleth/idp/flows/authn/ipaddress-authn-beans.xml |  3 ---
 .../net/shibboleth/idp/flows/authn/mfa-authn-beans.xml   |  3 ---
 .../shibboleth/idp/flows/authn/password-authn-beans.xml  |  3 ---
 .../idp/flows/authn/remoteuser-authn-beans.xml           |  3 ---
 .../idp/flows/authn/remoteuser-internal-authn-beans.xml  |  3 ---
 .../net/shibboleth/idp/flows/authn/saml-authn-beans.xml  |  2 --
 .../shibboleth/idp/flows/authn/spnego-authn-beans.xml    |  3 ---
 .../net/shibboleth/idp/flows/authn/x509-authn-beans.xml  |  3 ---
 .../idp/flows/authn/x509-internal-authn-beans.xml        |  3 ---
 .../flows/c14n/attribute-sourced-subject-c14n-beans.xml  |  3 ---
 .../idp/flows/c14n/simple-subject-c14n-beans.xml         |  3 ---
 .../net/shibboleth/idp/flows/c14n/subject-c14n-beans.xml |  3 ---
 .../idp/flows/c14n/subject-c14n-saml-default-beans.xml   |  3 ---
 .../idp/flows/c14n/x500-subject-c14n-beans.xml           |  3 ---
 .../net/shibboleth/idp/flows/cas/cas-abstract-beans.xml  |  3 ---
 .../flows/client-storage/client-storage-read-beans.xml   |  3 ---
 .../flows/client-storage/client-storage-write-beans.xml  |  3 ---
 .../idp/flows/intercept/attribute-release-beans.xml      |  3 ---
 .../flows/intercept/attribute-release-query-beans.xml    |  3 ---
 .../idp/flows/intercept/context-check-beans.xml          |  3 ---
 .../idp/flows/intercept/expiring-password-beans.xml      |  3 ---
 .../shibboleth/idp/flows/intercept/external-beans.xml    |  3 ---
 .../shibboleth/idp/flows/intercept/impersonate-beans.xml |  3 ---
 .../shibboleth/idp/flows/intercept/intercept-beans.xml   |  3 ---
 .../idp/flows/intercept/terms-of-use-beans.xml           |  3 ---
 .../net/shibboleth/idp/flows/intercept/warning-beans.xml |  3 ---
 .../net/shibboleth/idp/flows/logout/logout-beans.xml     |  3 ---
 .../idp/flows/logout/logout-propagation-beans.xml        |  3 ---
 .../idp/flows/saml/logout/saml2-logoutprop-beans.xml     |  3 ---
 .../shibboleth/idp/flows/saml/saml-abstract-beans.xml    |  3 ---
 .../net/shibboleth/idp/flows/saml/security-beans.xml     |  3 ---
 .../net/shibboleth/idp/test/flows/AbstractFlowTest.java  |  2 +-
 .../net/shibboleth/idp/flows/resolveAndFilter/beans.xml  |  2 --
 .../resources/exception/flows/test-exception-beans.xml   |  2 --
 .../test/resources/flow-load-test/flows/import-beans.xml |  2 --
 .../flow-load-test/flows/test-flow-loads-beans.xml       |  2 --
 .../test/client-storage/client-storage-test-beans.xml    |  3 ---
 .../resources/intercept/flows/test-intercept-beans.xml   |  2 --
 idp-spring/pom.xml                                       |  6 ++++++
 .../idp/profile/spring/factory/FlowModelFlowBuilder.java |  6 ++++++
 47 files changed, 13 insertions(+), 142 deletions(-)

diff --git a/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml b/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
index bd6aec5ad..8afa7bbb5 100644
--- a/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
+++ b/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
@@ -12,22 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean destroy-method="" class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean destroy-method="" class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
-    <bean id="conversionService" destroy-method=""
-          class="org.springframework.context.support.ConversionServiceFactoryBean">
-        <property name="converters">
-            <set>
-                <bean class="net.shibboleth.shared.spring.config.StringToIPRangeConverter" destroy-method=""/>
-                <bean class="net.shibboleth.shared.spring.config.BooleanToPredicateConverter" destroy-method=""/>
-                <bean class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter" destroy-method=""/>
-                <bean class="net.shibboleth.shared.spring.config.StringToResourceConverter" destroy-method=""/>
-                <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" destroy-method=""/>
-            </set>
-        </property>
-    </bean>
-
     <bean id="shibboleth.StorageService"
         class="org.opensaml.storage.impl.MemoryStorageService" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
index 31b4e4b51..518748a9c 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
@@ -12,9 +12,6 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId-ref="shibboleth.AdminProfileId" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-abstract-beans.xml
index 9e054bb8b..a90407493 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-abstract-beans.xml
@@ -12,11 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <!-- The actual abstract-authn flow doesn't use anything in here so far but child flows do. -->
-
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Most/all of this is for login flow auditing right now. -->
 
     <!-- Private copy of AuditContext for login flows. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
index 94905d4e6..824d6320e 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-    
     <bean id="PotentialFlowsLookup" parent="shibboleth.ContextFunctions.Expression"
         p:customObject-ref="shibboleth.AuthenticationFlowDescriptorManager"
         c:outputType="#{T(java.util.Collection)}"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-beans.xml
index 7a0b2fde1..4d62045bb 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-beans.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Legacy compatibility location to define strategy/location. -->
     <import resource="conditional:%{idp.home}/conf/authn/discovery-config.xml" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-beans.xml
index 9cfc89409..471e05530 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-beans.xml
@@ -11,9 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-       
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
     <!-- Default strategy function to obtain the external path. -->
     <bean id="shibboleth.authn.External.externalAuthnPathStrategy" parent="shibboleth.Functions.Constant"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/function-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/function-authn-beans.xml
index b2c756266..51338b0ab 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/function-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/function-authn-beans.xml
@@ -11,9 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-    
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
     <import resource="conditional:%{idp.home}/conf/authn/function-authn-config.xml" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-beans.xml
index eb89b2001..de6966a77 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-beans.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <import resource="conditional:%{idp.home}/conf/authn/ipaddress-authn-config.xml" />
     
     <bean id="ExtractUserAgentAddress" class="net.shibboleth.idp.authn.impl.ExtractUserAgentAddress" scope="prototype"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/mfa-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/mfa-authn-beans.xml
index d9270abfe..6f8f7db54 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/mfa-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/mfa-authn-beans.xml
@@ -8,9 +8,6 @@
 
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Parent bean for transition rules. -->
     <bean id="shibboleth.authn.MFA.Transition"
         class="net.shibboleth.idp.authn.MultiFactorAuthenticationTransition" abstract="true" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
index 70fab232d..619c88cc6 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
@@ -11,9 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-       
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
     <bean id="shibboleth.X509ResourceCredentialConfig"
         class="net.shibboleth.idp.authn.impl.X509ResourceCredentialConfig" abstract="true" /> 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-beans.xml
index 7c5c15965..badfad1a4 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-beans.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Default strategy function to obtain the external path. -->
     <bean id="shibboleth.authn.RemoteUser.externalAuthnPathStrategy" parent="shibboleth.Functions.Constant"
         c:target="#{getObject('shibboleth.authn.RemoteUser.externalAuthnPath') ?: '%{idp.authn.RemoteUser.externalAuthnPath:contextRelative:/Authn/RemoteUser}'.trim()}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
index 4c2b653c2..d07b23ca5 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
@@ -11,9 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-    
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
     <bean id="shibboleth.authn.RemoteUser.checkHeaders" parent="shibboleth.CommaDelimStringArray"
         c:_0="#{'%{idp.authn.RemoteUserInternal.checkHeaders:}'.trim()}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
index 01f0399ec..bf78628bf 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
@@ -12,8 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-
     <bean id="PropertyDrivenDiscovery" parent="shibboleth.Functions.Constant"
         c:target="#{'%{idp.authn.SAML.proxyEntityID:}'.trim()}" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-beans.xml
index 7c572177f..dfed5d630 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-beans.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <bean id="shibboleth.KerberosRealmSettings"
         class="net.shibboleth.idp.authn.spnego.impl.KerberosRealmSettings" abstract="true" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-beans.xml
index 2203e3f0b..16d8f6848 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-beans.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Default strategy function to obtain the external path. -->
     <bean id="shibboleth.authn.X509.externalAuthnPathStrategy" parent="shibboleth.Functions.Constant"
         c:target="#{getObject('shibboleth.authn.X509.externalAuthnPath') ?: '%{idp.authn.X509.externalAuthnPath:contextRelative:x509-prompt.jsp}'.trim()}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-beans.xml
index 016098ada..2922e0142 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-beans.xml
@@ -11,9 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-    
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
     <import resource="conditional:%{idp.home}/conf/authn/x509-internal-authn-config.xml" />
     
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-beans.xml
index 04218e5cd..538de7961 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-beans.xml
@@ -19,9 +19,6 @@
         c:_0="#{'%{idp.c14n.attribute.attributeSourceIds:%{idp.c14n.attribute.attributesToResolve:}}'.trim()}" />
 
     <import resource="conditional:%{idp.home}/conf/c14n/attribute-sourced-subject-c14n-config.xml" />
-
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     
     <bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes" scope="prototype"
             c:resolverService-ref="shibboleth.AttributeResolverService"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/simple-subject-c14n-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/simple-subject-c14n-beans.xml
index 296f67be2..db9ad348f 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/simple-subject-c14n-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/simple-subject-c14n-beans.xml
@@ -13,9 +13,6 @@
        default-destroy-method="destroy">
 
     <import resource="conditional:%{idp.home}/conf/c14n/simple-subject-c14n-config.xml" />
-
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     
     <bean id="SimpleSubjectCanonicalization"
         class="net.shibboleth.idp.authn.impl.SimpleSubjectCanonicalization" scope="prototype"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-beans.xml
index 3a650ee1d..ba6262704 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-beans.xml
@@ -11,9 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     
     <bean id="SelectSubjectCanonicalizationFlow"
         class="net.shibboleth.idp.authn.impl.SelectSubjectCanonicalizationFlow" scope="prototype" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-beans.xml
index 604e8d754..df70b4c17 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-beans.xml
@@ -9,9 +9,6 @@
 
 	default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <bean id="Shibboleth.C14N.SAML2Transient"
             class="net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization" scope="prototype">
         <property name="decoder">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/x500-subject-c14n-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/x500-subject-c14n-beans.xml
index 3aadebea0..b6b974930 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/x500-subject-c14n-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/x500-subject-c14n-beans.xml
@@ -19,9 +19,6 @@
         c:_0="#{'%{idp.c14n.x500.objectIDs:}'.trim()}" />
 
     <import resource="conditional:%{idp.home}/conf/c14n/x500-subject-c14n-config.xml" />
-
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     
     <bean id="X500SubjectCanonicalization"
         class="net.shibboleth.idp.authn.impl.X500SubjectCanonicalization" scope="prototype"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
index ee7bc6457..c0f8d63c3 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
@@ -9,9 +9,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- These are beans that are common to all CAS protocol flows. -->
 
     <bean id="FlowStartPopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-beans.xml
index daaa3735c..6320970e2 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-beans.xml
@@ -12,9 +12,6 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <bean id="UseLocalStorage" class="java.lang.Boolean">
         <constructor-arg value="%{idp.storage.htmlLocalStorage:false}" type="boolean" />
     </bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-beans.xml
index 1f78c5429..e6cc3ba56 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-beans.xml
@@ -12,9 +12,6 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <bean id="UseLocalStorage" class="java.lang.Boolean">
         <constructor-arg value="%{idp.storage.htmlLocalStorage:false}" type="boolean" />
     </bean>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml
index b1adf3c0a..855968df7 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml
@@ -8,9 +8,6 @@
 
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Default audit format. -->
     <util:map id="DefaultAuditFormattingMap">
         <entry key="Shibboleth-Consent-Audit" value="#{'%{idp.consent.attribute-release.auditFormat:%T|%SP|%e|%u|%CCI|%CCV|%CCA}'.trim()}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-query-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-query-beans.xml
index dde196f61..f45b1125f 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-query-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-query-beans.xml
@@ -8,9 +8,6 @@
 
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Use 'intercept/attribute-release' as storage context. -->
 
     <bean id="AttributeReleaseStorageContextLookupStrategy" parent="shibboleth.Functions.Constant"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/context-check-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/context-check-beans.xml
index 726b0f43a..655b0aa1b 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/context-check-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/context-check-beans.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Default to be overridden by config. -->
     <bean id="shibboleth.context-check.Condition" parent="shibboleth.Conditions.TRUE" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/expiring-password-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/expiring-password-beans.xml
index 8afe2d220..431a117f9 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/expiring-password-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/expiring-password-beans.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Name of cookie to track when user was last notified. -->
     <bean id="shibboleth.expiring-password.NotifyCookieName" class="java.lang.String" c:_0="shib_idp_exp_pwd" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml
index ab76c00db..955365847 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Default strategy function to obtain the external path. -->
     <bean id="shibboleth.intercept.externalPathStrategy" parent="shibboleth.Functions.Constant"
         c:target="#{getObject('shibboleth.intercept.externalPath') ?: '%{idp.intercept.External.externalPath:contextRelative:intercept.jsp}'.trim()}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-beans.xml
index 3d14e4637..6fa6a9116 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-beans.xml
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Legacy config. -->
     <import resource="conditional:%{idp.home}/conf/intercept/impersonate-intercept-config.xml" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/intercept-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/intercept-beans.xml
index 6070474a2..46f0e11f4 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/intercept-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/intercept-beans.xml
@@ -11,9 +11,6 @@
 
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     
     <bean id="FilterFlowsByNonBrowserSupport"
         class="net.shibboleth.idp.profile.interceptor.impl.FilterFlowsByNonBrowserSupport" scope="prototype" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-beans.xml
index f6a349673..ba1688ed6 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-beans.xml
@@ -8,9 +8,6 @@
 
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- Default audit format. -->
     <util:map id="DefaultAuditFormattingMap">
         <entry key="Shibboleth-Consent-Audit" value="#{'%{idp.consent.terms-of-use.auditFormat:%T|%SP|%e|%u|%CCI|%CCV|%CCA}'.trim()}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-beans.xml
index b9134f05d..21a7e9cc3 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-beans.xml
@@ -11,9 +11,6 @@
 
        default-init-method="initialize"
        default-destroy-method="destroy">
-       
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
     <!-- Empty map to override in config file. -->
     <util:map id="shibboleth.warning.ConditionMap" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-beans.xml
index af3b780de..4a2685850 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-beans.xml
@@ -12,9 +12,6 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <alias alias="UserPromptCondition" name="%{idp.logout.promptUser:shibboleth.Conditions.FALSE}" />
 
     <bean id="InitializeProfileRequestContext"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml
index d752a3bde..96ad7deaa 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml
@@ -12,9 +12,6 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="http://shibboleth.net/ns/profiles/logout-propagation"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
index 7eee633a2..ae1b2222d 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
@@ -11,9 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <import resource="../saml-abstract-beans.xml" />
 
     <util:constant id="shibboleth.EndpointType"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
index 691e05db4..eb4695073 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
@@ -12,9 +12,6 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-
     <!-- These are beans that are common to most or all SAML profile flows, regardless of version. -->
 
     <bean id="FlowStartPopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/security-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/security-beans.xml
index 75ae1051c..ad3416322 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/security-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/security-beans.xml
@@ -11,9 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     
     <bean id="MessageReplaySecurityHandler"
             class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
diff --git a/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
index 96510b653..d2c4af391 100644
--- a/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
+++ b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
@@ -102,7 +102,7 @@ import net.shibboleth.shared.xml.ParserPool;
                 IdPPropertiesApplicationContextInitializer.class},
         loader = PreferFileSystemContextLoader.class)
 @WebAppConfiguration
- at SuppressWarnings({"javadoc", "null"})
+ at SuppressWarnings({"null"})
 public abstract class AbstractFlowTest extends AbstractTestNGSpringContextTests {
 
     /** Logger. */
diff --git a/idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml b/idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
index 342be2931..b095221ea 100644
--- a/idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
+++ b/idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
@@ -10,8 +10,6 @@
 
 	<!-- Beans from the standard flows -->
 
-	<bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-
 	<bean id="InitializeProfileRequestContext"
 		class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext"
 		scope="prototype" p:profileId="test_flow" />
diff --git a/idp-conf-impl/src/test/resources/exception/flows/test-exception-beans.xml b/idp-conf-impl/src/test/resources/exception/flows/test-exception-beans.xml
index 36b176454..3df7b72fd 100644
--- a/idp-conf-impl/src/test/resources/exception/flows/test-exception-beans.xml
+++ b/idp-conf-impl/src/test/resources/exception/flows/test-exception-beans.xml
@@ -8,8 +8,6 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext"
         scope="prototype" p:profileId="test_flow" />
diff --git a/idp-conf-impl/src/test/resources/flow-load-test/flows/import-beans.xml b/idp-conf-impl/src/test/resources/flow-load-test/flows/import-beans.xml
index 5d88c4820..59f12cf08 100644
--- a/idp-conf-impl/src/test/resources/flow-load-test/flows/import-beans.xml
+++ b/idp-conf-impl/src/test/resources/flow-load-test/flows/import-beans.xml
@@ -8,8 +8,6 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-
     <!-- ensure this bean gets imported and loaded -->
     <bean id="LoadThisBean" class="net.shibboleth.idp.test.flows.load.LoadThisBean"
     c:msg="loaded"/>
diff --git a/idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml b/idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml
index 7cde7ce27..cf16be551 100644
--- a/idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml
+++ b/idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml
@@ -8,8 +8,6 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-
     <!--  Do something meaningful to make sure beans are wiring properly -->
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext"
diff --git a/idp-conf-impl/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml b/idp-conf-impl/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml
index 492880ba0..9be93cf53 100644
--- a/idp-conf-impl/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml
+++ b/idp-conf-impl/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml
@@ -9,9 +9,6 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="http://shibboleth.net/ns/profiles/client-storage"
diff --git a/idp-conf-impl/src/test/resources/intercept/flows/test-intercept-beans.xml b/idp-conf-impl/src/test/resources/intercept/flows/test-intercept-beans.xml
index bf464a19f..9571da5cd 100644
--- a/idp-conf-impl/src/test/resources/intercept/flows/test-intercept-beans.xml
+++ b/idp-conf-impl/src/test/resources/intercept/flows/test-intercept-beans.xml
@@ -8,8 +8,6 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext"
         scope="prototype" p:profileId="test-profile-flow" />
diff --git a/idp-spring/pom.xml b/idp-spring/pom.xml
index 7d4425ebf..af85ee32b 100644
--- a/idp-spring/pom.xml
+++ b/idp-spring/pom.xml
@@ -22,6 +22,12 @@
 
     <dependencies>
         <!-- Compile Dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-profile-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-spring</artifactId>
diff --git a/idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowModelFlowBuilder.java b/idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowModelFlowBuilder.java
index 56692a001..d9860888b 100644
--- a/idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowModelFlowBuilder.java
+++ b/idp-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowModelFlowBuilder.java
@@ -38,7 +38,9 @@ import org.springframework.webflow.scope.FlashScope;
 import org.springframework.webflow.scope.FlowScope;
 import org.springframework.webflow.scope.ViewScope;
 
+import net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor;
 import net.shibboleth.shared.collection.CollectionSupport;
+import net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor;
 import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
 import net.shibboleth.shared.spring.context.FilesystemGenericWebApplicationContext;
 import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
@@ -132,6 +134,10 @@ public class FlowModelFlowBuilder extends org.springframework.webflow.engine.bui
         propertyConfigurer.setEnvironment(flowContext.getEnvironment());
         flowContext.addBeanFactoryPostProcessor(propertyConfigurer);
         
+        // Shibboleth change - auto-inject our profile flow bean processors.
+        flowContext.getBeanFactory().addBeanPostProcessor(new IdentifiableBeanPostProcessor());
+        flowContext.getBeanFactory().addBeanPostProcessor(new ProfileActionBeanPostProcessor());
+        
         // Shibboleth change - Use our document reader instead, which fixes import resolution.
         new SchemaTypeAwareXMLBeanDefinitionReader(flowContext).loadBeanDefinitions(resources);
         

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the commits mailing list