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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov 20 00:00:34 2014
New Revision: 6960

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6960&view=rev
Log:
Move property configurers to BeanFactoryPostProcessor slot in services-system.xml

Modified:
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/system/conf/access-control-system.xml
    trunk/idp-conf/src/main/resources/system/conf/legacy-relying-party-defaults.xml
    trunk/idp-conf/src/main/resources/system/conf/property-placeholder.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
    trunk/idp-conf/src/test/resources/mapping/configs/override.xml

Modified: trunk/idp-conf/src/main/resources/conf/services.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.xml?rev=6960&r1=6959&r2=6960&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Thu Nov 20 00:00:34 2014
@@ -69,23 +69,19 @@
     <!-- This set of resources supports a legacy 2.x relying-party.xml file. -->
     <util:list id="shibboleth.LegacyRelyingPartyResolverResources">
         <value>%{idp.home}/conf/relying-party.xml</value>
-        <value>%{idp.home}/system/conf/property-placeholder.xml</value>
         <value>%{idp.home}/system/conf/legacy-relying-party-defaults.xml</value>
     </util:list>
 
     <util:list id="shibboleth.MetadataResolverResources">
         <value>%{idp.home}/conf/metadata-providers.xml</value>
-        <value>%{idp.home}/system/conf/property-placeholder.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.AttributeResolverResources">
         <value>%{idp.home}/conf/attribute-resolver.xml</value>
-        <value>%{idp.home}/system/conf/property-placeholder.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.AttributeFilterResources">
         <value>%{idp.home}/conf/attribute-filter.xml</value>
-        <value>%{idp.home}/system/conf/property-placeholder.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.NameIdentifierGenerationResources">

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=6960&r1=6959&r2=6960&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:00:34 2014
@@ -11,9 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
     <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />

Modified: trunk/idp-conf/src/main/resources/system/conf/legacy-relying-party-defaults.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/legacy-relying-party-defaults.xml?rev=6960&r1=6959&r2=6960&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/legacy-relying-party-defaults.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/legacy-relying-party-defaults.xml Thu Nov 20 00:00:34 2014
@@ -7,9 +7,6 @@
                             http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
                             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="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 	
     <!--  SAML2 -->
     <bean id="shibboleth.SAML2.Artifact.InboundFlowId" class="java.lang.String"

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=6960&r1=6959&r2=6960&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:00:34 2014
@@ -11,9 +11,6 @@
                            

[... 136 lines stripped ...]