[java-identity-provider COMMIT] in /trunk: idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml idp-conf/src/...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Feb 22 11:46:52 2014
New Revision: 5450

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5450&view=rev
Log:
JSPT-43 Add a Bean Post processor which understand Identifiable interface and configure it in everywhere.  Remove the name fernangling from the ProfileActionBeanPostProcessor.  

For now the new post processor issues a warn when there is (now) a redundant p:id="foo" id="foo" in a configuration

Added:
    trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdentifiableBeanPostProcessor.java   (with props)
Modified:
    trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/legacy-pc-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-crypto-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-direct-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-crypto-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-direct-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/simple-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-unsolicited-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-post-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-redirect-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-unsolicited-beans.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ProfileActionBeanPostProcessor.java

Modified: trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml?rev=5450&r1=5449&r2=5450&view=diff
==============================================================================
--- trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml (original)
+++ trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml Sat Feb 22 11:46:52 2014
@@ -6,8 +6,10 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
        default-init-method="initialize">
 
-    <!-- BeanPostProcessor auto-wraps OpenSAML ProfileActions in WebFlowProfileActionAdaptor. -->
+    <!-- This BeanPostProcessor auto-wraps OpenSAML ProfileActions in WebFlowProfileActionAdaptor. -->
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
+    <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
+    <bean class="net.shibboleth.idp.spring.IdentifiableBeanPostProcessor" />
 
     <!-- Spring-aware action that bootstraps us. We need *something* to create a profile context. -->
     <bean id="InitializeProfileRequestContext" class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype" />

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=5450&r1=5449&r2=5450&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Sat Feb 22 11:46:52 2014
@@ -23,6 +23,9 @@
             </list>
         </property>
     </bean>
+
+    <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
+    <bean class="net.shibboleth.idp.spring.IdentifiableBeanPostProcessor" />
 
     <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource"
             p:cacheSeconds="300" p:basename="file://${idp.home}/conf/messages" />

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml?rev=5450&r1=5449&r2=5450&view=diff

[... 339 lines stripped ...]