[java-identity-provider] branch main updated: Add list combiner factory bean.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/main by this push:
     new f9708f84b Add list combiner factory bean.
f9708f84b is described below

commit f9708f84b2f34fdacb54f5d72a24b78faedc58bf
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 13:20:47 2022 -0400

    Add list combiner factory bean.
---
 .../resources/net/shibboleth/idp/conf/global-system.xml  |  2 +-
 .../resources/net/shibboleth/idp/conf/primitives.xml     |  4 ++++
 .../net/shibboleth/idp/conf/services-system.xml          | 16 ++++++++--------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index 1136753e0..873d071e7 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -90,7 +90,7 @@
     </bean>
 
     <!-- This extends the original user-space resource list with the classpath-embedded message tree. -->
-    <bean id ="ExtendedMessageSourceResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
+    <bean id ="ExtendedMessageSourceResources" parent="shibboleth.ListCombiner"
           p:firstList-ref="#{'%{idp.message.resources:shibboleth.MessageSourceResources}'.trim()}" >
         <property name="secondList">
             <util:list >
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml
index ecf22dfe5..8ab0ecb01 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml
@@ -25,6 +25,10 @@
         class="net.shibboleth.shared.service.reloadable.ProxiedFactoryBean"
         c:service-ref="shibboleth.ManagedBeanService" />
 
+    <!-- List combiner factory bean. -->
+    <bean id="shibboleth.ListCombiner" abstract="true"
+        class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean" />
+
     <!-- TrustEngine helpers. -->
         
     <bean id="shibboleth.StaticExplicitTrustEngine" abstract="true"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
index 3052ac92d..1f25b217b 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
@@ -47,7 +47,7 @@
         </constructor-arg>
     </bean>
     <!-- Auto-append system config file to resource set. -->
-    <bean id ="ExtendedAttributeFilterResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
+    <bean id ="ExtendedAttributeFilterResources" parent="shibboleth.ListCombiner"
           p:firstList="#{getObject('%{idp.service.attribute.filter.resources:shibboleth.AttributeFilterResources}'.trim())}" >
         <property name="secondList">
             <util:list >
@@ -71,7 +71,7 @@
         </constructor-arg>
     </bean>
     <!-- Auto-append system config file to resource set. -->
-    <bean id ="ExtendedAttributeResolverResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
+    <bean id ="ExtendedAttributeResolverResources" parent="shibboleth.ListCombiner"
           p:firstList="#{getObject('%{idp.service.attribute.resolver.resources:shibboleth.AttributeResolverResources}'.trim())}" >
         <property name="secondList">
             <util:list >
@@ -95,7 +95,7 @@
             </bean>
 	    </constructor-arg>
     </bean>
-    <bean id ="shibboleth.DefaultAttributeRegistryResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
+    <bean id ="shibboleth.DefaultAttributeRegistryResources" parent="shibboleth.ListCombiner"
           p:firstList-ref="#{'%{idp.service.attribute.resolver.resources:shibboleth.AttributeResolverResources}'.trim()}" >
         <property name="secondList">
             <util:list >
@@ -104,7 +104,7 @@
         </property>
     </bean>
     <!-- Auto-append system config file to resource set. -->
-    <bean id ="ExtendedAttributeRegistryResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
+    <bean id ="ExtendedAttributeRegistryResources" parent="shibboleth.ListCombiner"
           p:firstList="#{getObject('%{idp.service.attribute.registry.resources:shibboleth.AttributeRegistryResources}'.trim()) ?:
                 getObject('shibboleth.DefaultAttributeRegistryResources')}" >
         <property name="secondList">
@@ -122,7 +122,7 @@
         p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
         p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors" />
     <!-- Auto-append system config file to resource set. -->
-    <bean id ="ExtendedNameIdentifierGenerationResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
+    <bean id ="ExtendedNameIdentifierGenerationResources" parent="shibboleth.ListCombiner"
           p:firstList-ref="#{'%{idp.service.nameidGeneration.resources:shibboleth.NameIdentifierGenerationResources}'.trim()}" >
         <property name="secondList">
             <util:list >
@@ -144,7 +144,7 @@
         </constructor-arg>
     </bean>
     <!-- Auto-append system config file to resource set. -->
-    <bean id ="ExtendedRelyingPartyResolverResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
+    <bean id ="ExtendedRelyingPartyResolverResources" parent="shibboleth.ListCombiner"
           p:firstList-ref="#{'%{idp.service.relyingparty.resources:shibboleth.RelyingPartyResolverResources}'.trim()}" >
         <property name="secondList">
             <util:list >
@@ -166,7 +166,7 @@
         </constructor-arg>
     </bean>
     <!-- Auto-append system config file to resource set. -->
-    <bean id ="ExtendedMetadataResolverResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
+    <bean id ="ExtendedMetadataResolverResources" parent="shibboleth.ListCombiner"
           p:firstList-ref="#{'%{idp.service.metadata.resources:shibboleth.MetadataResolverResources}'.trim()}" >
         <property name="secondList">
             <util:list >
@@ -183,7 +183,7 @@
         p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
         p:beanFactoryPostProcessors-ref="shibboleth.BeanFactoryPostProcessors" />
     <!-- Auto-append system config file to resource set. -->
-    <bean id ="ExtendedAccessControlResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
+    <bean id ="ExtendedAccessControlResources" parent="shibboleth.ListCombiner"
           p:firstList-ref="#{'%{idp.service.access.resources:shibboleth.AccessControlResources}'.trim()}" >
         <property name="secondList">
             <util:list >

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