[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/conf: access-control-system.xml global-s...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov 20 00:17:53 2014
New Revision: 6963

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6963&view=rev
Log:
Reuse root context instance of IdentifiableBeanPostProcessor in service contexts.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/access-control-system.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
    trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/access-control-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/access-control-system.xml?rev=6963&r1=6962&r2=6963&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/access-control-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/access-control-system.xml Thu Nov 20 00:17:53 2014
@@ -12,9 +12,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
-    <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
-
     <bean class="net.shibboleth.idp.security.ReloadingAccessControlService">
         <constructor-arg>
             <bean class="net.shibboleth.utilities.java.support.security.BasicAccessControlService"

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=6963&r1=6962&r2=6963&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 Thu Nov 20 00:17:53 2014
@@ -30,7 +30,8 @@
     </bean>
 
     <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
-    <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+    <bean id="shibboleth.IdentifiableBeanPostProcessor"
+        class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
     <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource"
             p:cacheSeconds="%{idp.message.cacheSeconds:300}"

Modified: trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml?rev=6963&r1=6962&r2=6963&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml Thu Nov 20 00:17:53 2014
@@ -11,9 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
-    <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
     <!-- This is one of the few properties we rely on that has no default. -->
     <bean id="entityID" class="java.lang.String" c:_0="%{idp.entityID}" />

Modified: trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml?rev=6963&r1=6962&r2=6963&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml Thu Nov 20 00:17:53 2014
@@ -11,9 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
-    <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
     <!-- Bean templates for defining generators that produce custom formats based on attributes. -->
 

Modified: trunk/idp-conf/src/main/resources/system/conf/services-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/services-system.xml?rev=6963&r1=6962&r2=6963&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/services-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/services-system.xml Thu Nov 20 00:17:53 2014
@@ -59,6 +59,7 @@

[... 24 lines stripped ...]