[java-metadata-aggregator] branch main updated: MDA-277 - Implement migration assistance with bean post-processor

[Ian Young]

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

iay pushed a commit to branch main
in repository java-metadata-aggregator.

View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=b0f19e9e0ddb162813129dea22d1f64d4ae7e7a6

The following commit(s) were added to refs/heads/main by this push:
     new b0f19e9  MDA-277 - Implement migration assistance with bean post-processor
b0f19e9 is described below

commit b0f19e9e0ddb162813129dea22d1f64d4ae7e7a6
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Feb 8 16:21:36 2023 +0000

    MDA-277 - Implement migration assistance with bean post-processor
    
    Add more classes and beans.
    
    https://shibboleth.atlassian.net/browse/MDA-277
---
 .../resources/net/shibboleth/metadata/beans.xml    | 48 +++++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml b/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
index eefaa9a..65d9303 100644
--- a/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
+++ b/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
@@ -346,16 +346,60 @@
 		lazy-init="false" p:classes-ref="mda.MigrationClassMap" p:beans-ref="mda.MigrationBeanMap"/>
 
 	<util:map id="mda.MigrationClassMap">
-		<!-- MDA changes from 0.9 to 0.10 -->
 
-		<!-- dependency changes from 0.9 to 0.10 -->
+		<!-- MDA changes from 0.9 to 0.10 -->
+		<entry key="net.shibboleth.metadata.util.PKCS11PrivateKeyFactoryBean"
+			 value="net.shibboleth.shared.spring.security.factory.PKCS11PrivateKeyFactoryBean"/>
+
+		<!-- Classes from spring-extensions in MDA 0.9, not in MDA 0.10. -->
+		<entry key="net.shibboleth.ext.spring.config.BooleanToPredicateConverter"
+			 value="net.shibboleth.shared.spring.config.BooleanToPredicateConverter"/>
+		<entry key="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor"
+			 value="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor"/>
+		<entry key="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter"
+			 value="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter"/>
+		<entry key="net.shibboleth.ext.spring.config.StringToDurationConverter"
+			 value="net.shibboleth.shared.spring.config.StringToDurationConverter"/>
+		<entry key="net.shibboleth.ext.spring.config.StringToIPRangeConverter"
+			 value="net.shibboleth.shared.spring.config.StringToIPRangeConverter"/>
+		<entry key="net.shibboleth.ext.spring.config.StringToResourceConverter"
+			 value="net.shibboleth.shared.spring.config.StringToResourceConverter"/>
+		<entry key="net.shibboleth.ext.spring.factory.DOMDocumentFactoryBean"
+			 value="net.shibboleth.shared.spring.factory.DOMDocumentFactoryBean"/>
+		<entry key="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"
+			 value="net.shibboleth.shared.spring.security.factory.PrivateKeyFactoryBean"/>
+		<entry key="net.shibboleth.ext.spring.factory.PublicKeyFactoryBean"
+			 value="net.shibboleth.shared.spring.security.factory.PublicKeyFactoryBean"/>
+		<entry key="net.shibboleth.ext.spring.factory.X509CertificateChainFactoryBean"
+			 value="net.shibboleth.shared.spring.security.factory.X509CertificateChainFactoryBean"/>
+		<entry key="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
+			 value="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean"/>
 		<entry key="net.shibboleth.ext.spring.resource.HTTPResource"
 			 value="net.shibboleth.shared.spring.httpclient.resource.HTTPResource"/>
 
+		<!-- Classes from java-support in MDA 0.9, not in MDA 0.10. -->
+		<entry key="net.shibboleth.utilities.java.support.collection.Pair"
+			 value="net.shibboleth.shared.collection.Pair"/>
+		<entry key="net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder"
+			 value="net.shibboleth.shared.httpclient.HttpClientBuilder"/>
+		<entry key="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+			 value="net.shibboleth.shared.xml.impl.BasicParserPool"/>
+		<entry key="net.shibboleth.utilities.java.support.xml.SimpleNamespaceContext"
+			 value="net.shibboleth.metadata.dom.SimpleNamespaceContext"/>
+
 	</util:map>
 
 	<util:map id="mda.MigrationBeanMap">
 
+		<!-- Beans adopted from ukf-mda project in MDA 0.10. -->
+		<entry key="ukf.AssuranceCertificationMatcher" 		value="mda.AssuranceCertificationMatcher"/>
+		<entry key="ukf.DiscoFeedCollectionSerializer"		value="mda.DiscoFeedCollectionSerializer"/>
+		<entry key="ukf.IPHintValidationStage"				value="mda.IPHintValidationStage"/>
+		<entry key="ukf.RegexFileFilter"					value="mda.RegexFileFilter"/>
+		<entry key="ukf.SAMLStringElementCheckingStage"		value="mda.SAMLStringElementCheckingStage"/>
+		<entry key="ukf.StringElementValidationStage"		value="mda.StringElementValidationStage"/>
+		<entry key="ukf.X509ROCAValidator"					value="mda.X509ROCAValidator"/>
+
 	</util:map>
 
 </beans>

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