From 31adc8886ebec40fbc662df06159a03e0c43d94f Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 21 Jul 2023 06:18:38 +0100
Subject: [PATCH] Adopt new parent beans

---
 mdx/at_aconet/beans.xml   |  6 ++---
 mdx/common-beans.xml      | 46 ++++++++-------------------------------
 mdx/int_edugain/beans.xml |  4 ++--
 mdx/uk/beans.xml          | 10 ++++-----
 mdx/uk/mdq-multisign.xml  |  2 +-
 mdx/us_incommon/beans.xml |  4 ++--
 6 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index 9d29767..69040fb 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -30,7 +30,7 @@
     <bean id="at_aconet_productionAggregate" parent="mda.DOMResourceSourceStage">
         <property name="parserPool" ref="parserPool"/>
         <property name="DOMResource">
-            <bean parent="HTTPResource">
+            <bean parent="mda.HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="at_aconet_registrarAggregate_url"/>
             </bean>
@@ -43,7 +43,7 @@
     <bean id="at_aconet_edugainAggregate" parent="mda.DOMResourceSourceStage">
         <property name="parserPool" ref="parserPool"/>
         <property name="DOMResource">
-            <bean parent="HTTPResource">
+            <bean parent="mda.HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="at_aconet_edugainAggregate_url"/>
             </bean>
@@ -53,7 +53,7 @@
     <!--
         Signing certificate.
     -->
-    <bean id="at_aconet_signingCertificate" parent="X509CertificateFactoryBean"
+    <bean id="at_aconet_signingCertificate" parent="mda.X509CertificateFactoryBean"
         p:resource="classpath:at_aconet/aconet-aai-metadata-signing.crt"/>
 
     <!--
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index aa8abf4..de41e26 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -53,12 +53,6 @@
     <bean id="FileSystemResource" abstract="true"
         class="org.springframework.core.io.FileSystemResource"/>
 
-    <!--
-        Shibboleth-defined Resource class parent bean.
-    -->
-    <bean id="HTTPResource" abstract="true"
-        class="net.shibboleth.shared.spring.httpclient.resource.HTTPResource"/>
-
     <!--
         component_parent
 
@@ -119,28 +113,8 @@
         </property>
     </bean>
 
-    <!-- *** Parent beans for Shibboleth spring-extensions factory beans. *** -->
-
-    <bean id="DOMDocumentFactoryBean" abstract="true"
-        class="net.shibboleth.shared.spring.factory.DOMDocumentFactoryBean"/>
-
-    <bean id="PKCS11PrivateKeyFactoryBean" abstract="true"
-        class="net.shibboleth.shared.spring.security.factory.PKCS11PrivateKeyFactoryBean"/>
-
-    <bean id="PrivateKeyFactoryBean" abstract="true"
-        class="net.shibboleth.shared.spring.security.factory.PrivateKeyFactoryBean"/>
-
-    <bean id="PublicKeyFactoryBean" abstract="true"
-        class="net.shibboleth.shared.spring.security.factory.PublicKeyFactoryBean"/>
-
-    <bean id="X509CertificateChainFactoryBean" abstract="true"
-        class="net.shibboleth.shared.spring.security.factory.X509CertificateChainFactoryBean"/>
-
-    <bean id="X509CertificateFactoryBean" abstract="true"
-        class="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean"/>
-
     <!-- *** Default Shibboleth component bean id property from Spring bean id *** -->
-    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" lazy-init="false"/>
+    <bean parent="mda.IdentifiableBeanPostProcessor" lazy-init="false"/>
 
 
     <!--
@@ -155,11 +129,11 @@
     <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
         <property name="converters">
             <set>
-                <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" />
-                <bean class="net.shibboleth.shared.spring.config.StringToIPRangeConverter" />
-                <bean class="net.shibboleth.shared.spring.config.BooleanToPredicateConverter" />
-                <bean class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter" />
-                <bean class="net.shibboleth.shared.spring.config.StringToResourceConverter" />
+                <bean parent="mda.StringToDurationConverter"/>
+                <bean parent="mda.StringToIPRangeConverter"/>
+                <bean parent="mda.BooleanToPredicateConverter"/>
+                <bean parent="mda.StringBooleanToPredicateConverter"/>
+                <bean parent="mda.StringToResourceConverter"/>
             </set>
         </property>
     </bean>
@@ -286,7 +260,7 @@
         A NamespaceContext that assigns the usual prefix for each of the commonly used XML namespaces.
         This is used in the evaluation of XPath expressions.
     -->
-    <bean id="commonNamespaces" class="net.shibboleth.metadata.dom.SimpleNamespaceContext">
+    <bean id="commonNamespaces" parent="mda.SimpleNamespaceContext">
         <constructor-arg>
             <util:map map-class="java.util.HashMap">
                 <entry key="alg"        value-ref="alg_namespace"/>
@@ -989,8 +963,7 @@
 
         These options can be removed once the underlying issue has been resolved.
     -->
-    <bean id="httpClientBuilder"
-        class="net.shibboleth.shared.httpclient.HttpClientBuilder"
+    <bean id="httpClientBuilder" parent="mda.HttpClientBuilder"
         p:connectionDisregardTLSCertificate="true"
         p:socketTimeout="PT100S"
         p:connectionTimeout="PT100S"
@@ -1008,8 +981,7 @@
 
         A pre-configured parser pool for use by source stages.
     -->
-    <bean id="parserPool" parent="component_parent"
-        class="net.shibboleth.shared.xml.impl.BasicParserPool"
+    <bean id="parserPool" parent="mda.BasicParserPool"
         p:ignoreComments="false"
         p:ignoreElementContentWhitespace="false"/>
 
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 92de8b6..5229e2f 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -50,7 +50,7 @@
     <bean id="int_edugain_productionAggregate" parent="mda.DOMResourceSourceStage">
         <property name="parserPool" ref="parserPool"/>
         <property name="DOMResource">
-            <bean parent="HTTPResource">
+            <bean parent="mda.HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"
                     ref="int_edugain_${int.edugain.aggregate.name:production}Aggregate_url"/>
@@ -72,7 +72,7 @@
     <!--
         eduGAIN signing certificate.
     -->
-    <bean id="int_edugain_signingCertificate" parent="X509CertificateFactoryBean"
+    <bean id="int_edugain_signingCertificate" parent="mda.X509CertificateFactoryBean"
         p:resource="classpath:int_edugain/mds-v2.cer"/>
 
     <!--
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 4d24136..3bc5b5f 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -107,7 +107,7 @@
     <bean id="uk_exportAggregate" parent="mda.DOMResourceSourceStage">
         <property name="parserPool" ref="parserPool"/>
         <property name="DOMResource">
-            <bean parent="HTTPResource">
+            <bean parent="mda.HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="uk_exportAggregate_url"/>
             </bean>
@@ -121,7 +121,7 @@
     <bean id="uk_productionAggregate" parent="mda.DOMResourceSourceStage">
         <property name="parserPool" ref="parserPool"/>
         <property name="DOMResource">
-            <bean parent="HTTPResource">
+            <bean parent="mda.HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="uk_productionAggregate_url"/>
             </bean>
@@ -132,7 +132,7 @@
     <!--
         Metadata signing certificate.
     -->
-    <bean id="uk_signingCertificate" parent="X509CertificateFactoryBean"
+    <bean id="uk_signingCertificate" parent="mda.X509CertificateFactoryBean"
         p:resource="classpath:uk/ukfederation-2014.pem"/>
 
 
@@ -177,7 +177,7 @@
 
         This bean contains the contents of the members.xml file as a DOM Document.
     -->
-    <bean id="uk_membersDocument" parent="DOMDocumentFactoryBean">
+    <bean id="uk_membersDocument" parent="mda.DOMDocumentFactoryBean">
         <property name="resource">
             <bean parent="FileSystemResource" c:_="${members.dir}/members.xml"/>
         </property>
@@ -190,7 +190,7 @@
 
         This bean loads the schema for the members.xml file as a DOM Document.
     -->
-    <bean id="uk_membersSchemaDocument" parent="DOMDocumentFactoryBean">
+    <bean id="uk_membersSchemaDocument" parent="mda.DOMDocumentFactoryBean">
         <property name="resource">
             <bean parent="FileSystemResource" c:_="${members.dir}/ukfederation-members.xsd"/>
         </property>
diff --git a/mdx/uk/mdq-multisign.xml b/mdx/uk/mdq-multisign.xml
index 606d21c..376bf0a 100644
--- a/mdx/uk/mdq-multisign.xml
+++ b/mdx/uk/mdq-multisign.xml
@@ -75,7 +75,7 @@
                 <!-- Sign each item. -->
                 <bean id="perform.signature" parent="mda.XMLSignatureSigningStage">
                     <property name="privateKey">
-                        <bean parent="PKCS11PrivateKeyFactoryBean"
+                        <bean parent="mda.PKCS11PrivateKeyFactoryBean"
                             p:pkcs11Config="${sign.pkcs11Config}"
                             p:keyPassword="${sign.keyPassword}"
                             p:keyAlias="${sign.keyAlias}"
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index 22cad05..8bda14e 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -34,7 +34,7 @@
     <bean id="us_incommon_productionAggregate" parent="mda.DOMResourceSourceStage">
         <property name="parserPool" ref="parserPool"/>
         <property name="DOMResource">
-            <bean parent="HTTPResource">
+            <bean parent="mda.HTTPResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="us_incommon_productionAggregate_url"/>
             </bean>
@@ -44,7 +44,7 @@
     <!--
         InCommon signing certificate.
     -->
-    <bean id="us_incommon_signingCertificate" parent="X509CertificateFactoryBean"
+    <bean id="us_incommon_signingCertificate" parent="mda.X509CertificateFactoryBean"
         p:resource="classpath:us_incommon/inc-md-cert.pem"/>
 
     <!--