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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov 20 00:05:02 2014
New Revision: 6961

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

Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml

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=6961&r1=6960&r2=6961&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:05:02 2014
@@ -12,7 +12,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
+    <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
+        class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
     <!-- This bean MUST be called "conversionService" to work properly. -->

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=6961&r1=6960&r2=6961&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:05:02 2014
@@ -30,16 +30,13 @@
             p:serviceConfigurations-ref="%{idp.service.attribute.filter.resources:shibboleth.AttributeFilterResources}"
             p:failFast="%{idp.service.attribute.filter.failFast:false}"
             p:reloadCheckDelay="%{idp.service.attribute.filter.checkInterval:0}"
-            p:reloadTaskTimer-ref="shibboleth.TaskTimer">
+            p:reloadTaskTimer-ref="shibboleth.TaskTimer"
+            p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer">
         <constructor-arg name="claz" value="net.shibboleth.idp.attribute.filter.AttributeFilter" />
         <constructor-arg name="strategy">
             <bean class="net.shibboleth.idp.attribute.filter.spring.AttributeFilterServiceStrategy"
                 id="ShibbolethAttributeFilter"/>
         </constructor-arg>
-        <property name="beanFactoryPostProcessors">
-            <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-                p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-        </property>
     </bean>
 
     <bean id="shibboleth.AttributeResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService" 
@@ -47,44 +44,34 @@
             p:serviceConfigurations-ref="%{idp.service.attribute.resolver.resources:shibboleth.AttributeResolverResources}"
             p:failFast="%{idp.service.attribute.resolver.failFast:false}"
             p:reloadCheckDelay="%{idp.service.attribute.resolver.checkInterval:0}"
-            p:reloadTaskTimer-ref="shibboleth.TaskTimer">
+            p:reloadTaskTimer-ref="shibboleth.TaskTimer"
+            p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer">
         <constructor-arg name="claz" value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
         <constructor-arg name="strategy">
             <bean class="net.shibboleth.idp.attribute.resolver.spring.AttributeResolverServiceStrategy"
                 id="ShibbolethAttributeResolver"/>
         </constructor-arg>
-        <property name="beanFactoryPostProcessors">
-            <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-                p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-        </property>
     </bean>
 
     <bean id="shibboleth.NameIdentifierGenerationService" class="net.shibboleth.ext.spring.service.ReloadableSpringService" 
-            c:claz="net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService"
-            p:serviceConfigurations-ref="%{idp.service.nameidGeneration.resources:shibboleth.NameIdentifierGenerationResources}"
-            p:failFast="%{idp.service.nameidGeneration.failFast:false}"
-            p:reloadCheckDelay="%{idp.service.nameidGeneration.checkInterval:0}"
-            p:reloadTaskTimer-ref="shibboleth.TaskTimer">
-        <property name="beanFactoryPostProcessors">
-            <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-                p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-        </property>
-    </bean>
+        c:claz="net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService"

[... 66 lines stripped ...]