[java-identity-provider] 01/02: IDP-1533 Inherit default attribute regsitry files from attribute resolver.

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-identity-provider.

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

commit 1606635aa32633cb5c046955ae863b9d6d7dbbe2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Feb 13 15:01:18 2020 +0000

    IDP-1533 Inherit default attribute regsitry files from attribute resolver.
    
    https://issues.shibboleth.net/jira/browse/IDP-1533
    
    Specifically if the user hasn't specified them (i.e. its an upgrade)
    we add conf/attribute-registry.xml and system/conf/attribute-registry-system.xml
    to whatever the user is already plumbing in to the Attibute resolver
---
 .../src/main/resources/system/conf/services-system.xml    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/services-system.xml b/idp-conf/src/main/resources/system/conf/services-system.xml
index feaf5f9..e25d00b 100644
--- a/idp-conf/src/main/resources/system/conf/services-system.xml
+++ b/idp-conf/src/main/resources/system/conf/services-system.xml
@@ -69,11 +69,16 @@
 	           p:namingRegistry="#{'%{idp.service.attribute.registry.namingRegistry:shibboleth.DefaultNamingRegistry}'.trim()}" />
 	    </constructor-arg>
     </bean>
-    <util:list id ="shibboleth.DefaultAttributeRegistryResources">
-        <value>%{idp.home}/conf/attribute-registry.xml</value>
-        <value>%{idp.home}/conf/attribute-resolver.xml</value>
-        <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
-    </util:list>
+
+    <bean id ="shibboleth.DefaultAttributeRegistryResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+          p:firstList-ref="#{'%{idp.service.attribute.resolver.resources:shibboleth.AttributeResolverResources}'.trim()}" >
+        <property name="secondList">
+            <util:list >
+                <value>%{idp.home}/conf/attribute-registry.xml</value>
+                <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
+            </util:list>
+        </property>
+    </bean>
 
     <bean id="shibboleth.NameIdentifierGenerationService" class="net.shibboleth.ext.spring.service.ReloadableSpringService" 
         c:claz="net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService"

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