[java-identity-provider] branch main updated: Rename Spring factory bean package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 14 17:15:52 UTC 2022
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=c836089a76f58c1222555bf7caab3b7f45e2357a
The following commit(s) were added to refs/heads/main by this push:
new c836089a7 Rename Spring factory bean package.
c836089a7 is described below
commit c836089a76f58c1222555bf7caab3b7f45e2357a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 13:15:49 2022 -0400
Rename Spring factory bean package.
---
.../resources/net/shibboleth/idp/conf/global-system.xml | 15 +++++++++++++--
.../net/shibboleth/idp/conf/services-system.xml | 16 ++++++++--------
2 files changed, 21 insertions(+), 10 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 d79914827..1136753e0 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
@@ -39,11 +39,13 @@
<bean id="shibboleth.IdentifiableBeanPostProcessor"
class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
- <!-- This BeanFactoryPostProcessor rewrites class and parent references to relocated classes or beans. -->
+ <!-- This BeanFactoryPostProcessor rewrites class and parent references to relocated classes or beans. -->
<bean id="shibboleth.RelocatedBeanFactoryPostProcessor"
class="net.shibboleth.ext.spring.util.RelocatedBeanFactoryPostProcessor">
<property name="classes">
<map>
+ <!-- At present all of these are being added for V5 and would be removable for V6. -->
+
<entry key="net.shibboleth.ext.spring.factory.KeyStoreFactoryBean"
value="net.shibboleth.shared.spring.security.factory.KeyStoreFactoryBean" />
<entry key="net.shibboleth.ext.spring.factory.PKCS11PrivateKeyFactoryBean"
@@ -74,12 +76,21 @@
value="net.shibboleth.shared.spring.expression.SpringExpressionFunction" />
<entry key="net.shibboleth.ext.spring.util.SpringExpressionPredicate"
value="net.shibboleth.shared.spring.expression.SpringExpressionPredicate" />
+
+ <entry key="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+ value="net.shibboleth.shared.spring.factory.CombiningListFactoryBean" />
+ <entry key="net.shibboleth.ext.spring.factory.DOMDocumentFactoryBean"
+ value="net.shibboleth.shared.spring.factory.DOMDocumentFactoryBean" />
+ <entry key="net.shibboleth.ext.spring.factory.EvaluableScriptFactoryBean"
+ value="net.shibboleth.shared.spring.factory.EvaluableScriptFactoryBean" />
+ <entry key="net.shibboleth.ext.spring.factory.PatternFactoryBean"
+ value="net.shibboleth.shared.spring.factory.PatternFactoryBean" />
</map>
</property>
</bean>
<!-- This extends the original user-space resource list with the classpath-embedded message tree. -->
- <bean id ="ExtendedMessageSourceResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+ <bean id ="ExtendedMessageSourceResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
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/services-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
index 0b7e9292b..3052ac92d 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.ext.spring.factory.CombiningListFactoryBean"
+ <bean id ="ExtendedAttributeFilterResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
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.ext.spring.factory.CombiningListFactoryBean"
+ <bean id ="ExtendedAttributeResolverResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
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.ext.spring.factory.CombiningListFactoryBean"
+ <bean id ="shibboleth.DefaultAttributeRegistryResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
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.ext.spring.factory.CombiningListFactoryBean"
+ <bean id ="ExtendedAttributeRegistryResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
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.ext.spring.factory.CombiningListFactoryBean"
+ <bean id ="ExtendedNameIdentifierGenerationResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
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.ext.spring.factory.CombiningListFactoryBean"
+ <bean id ="ExtendedRelyingPartyResolverResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
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.ext.spring.factory.CombiningListFactoryBean"
+ <bean id ="ExtendedMetadataResolverResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
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.ext.spring.factory.CombiningListFactoryBean"
+ <bean id ="ExtendedAccessControlResources" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
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.
More information about the commits
mailing list