Accept changes proposed by deprecation warnings

mdx/at_aconet/beans.xml

@@ -98,7 +98,7 @@
         Fetch the production entities as a collection.
     -->
     <bean id="at_aconet_productionEntities" parent="mda.CompositeStage">
-        <property name="composedStages">
+        <property name="stages">
             <list>
                 <ref bean="at_aconet_productionAggregate"/>
 
@@ -120,7 +120,7 @@
         Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="at_aconet_edugainEntities" parent="mda.CompositeStage">
-        <property name="composedStages">
+        <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainAggregate"/>
 

mdx/at_aconet/verbs.xml

@@ -95,7 +95,7 @@
                     a while to resolve.
                 -->
                 <bean id="filterEntities" parent="mda.EntityFilterStage"
-                    p:whitelistingEntities="false">
+                    p:keepingEntities="false">
                     <property name="designatedEntities">
                         <set>
                         </set>

mdx/common-beans.xml

@@ -57,7 +57,7 @@
         Shibboleth-defined Resource class parent bean.
     -->
     <bean id="HTTPResource" abstract="true"
-        class="net.shibboleth.ext.spring.resource.HTTPResource"/>
+        class="net.shibboleth.shared.spring.httpclient.resource.HTTPResource"/>
 
     <!--
         component_parent
@@ -73,7 +73,8 @@
 
         Parent for XML Signature validation stages.
 
-        Applies global algorithm blacklists. For values, see:
+        Applies global algorithm exclusions. For values, see:
+
             http://www.w3.org/TR/xmlsec-algorithms/
 
         Establishes a default of *not* permitting empty references
@@ -82,12 +83,12 @@
         require it.
     -->
     <bean id="XMLSignatureValidationStage" abstract="true" parent="mda.XMLSignatureValidationStage">
-        <property name="blacklistedDigests">
+        <property name="disallowedDigests">
             <list>
                 <value>http://www.w3.org/2001/04/xmldsig-more#md5</value>
             </list>
         </property>
-        <property name="blacklistedSignatureMethods">
+        <property name="disallowedSignatureMethods">
             <list>
                 <value>http://www.w3.org/2001/04/xmldsig-more#rsa-md5</value>
             </list>
@@ -103,13 +104,13 @@
     -->
     <bean id="XMLSignatureValidationStageSHA256" abstract="true"
         parent="XMLSignatureValidationStage">
-        <property name="blacklistedDigests">
+        <property name="disallowedDigests">
             <list>
                 <value>http://www.w3.org/2000/09/xmldsig#sha1</value>
                 <value>http://www.w3.org/2001/04/xmldsig-more#md5</value>
             </list>
         </property>
-        <property name="blacklistedSignatureMethods">
+        <property name="disallowedSignatureMethods">
             <list>
                 <value>http://www.w3.org/2000/09/xmldsig#rsa-sha1</value>
                 <value>http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1</value>
@@ -121,26 +122,25 @@
     <!-- *** Parent beans for Shibboleth spring-extensions factory beans. *** -->
 
     <bean id="DOMDocumentFactoryBean" abstract="true"
-        class="net.shibboleth.ext.spring.factory.DOMDocumentFactoryBean"/>
+        class="net.shibboleth.shared.spring.factory.DOMDocumentFactoryBean"/>
 
-    <!-- PKCS11PrivateKeyFactoryBean is in MDA in V0.9.2. -->
     <bean id="PKCS11PrivateKeyFactoryBean" abstract="true"
-        class="net.shibboleth.metadata.util.PKCS11PrivateKeyFactoryBean"/>
+        class="net.shibboleth.shared.spring.security.factory.PKCS11PrivateKeyFactoryBean"/>
 
     <bean id="PrivateKeyFactoryBean" abstract="true"
-        class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"/>
+        class="net.shibboleth.shared.spring.security.factory.PrivateKeyFactoryBean"/>
 
     <bean id="PublicKeyFactoryBean" abstract="true"
-        class="net.shibboleth.ext.spring.factory.PublicKeyFactoryBean"/>
+        class="net.shibboleth.shared.spring.security.factory.PublicKeyFactoryBean"/>
 
     <bean id="X509CertificateChainFactoryBean" abstract="true"
-        class="net.shibboleth.ext.spring.factory.X509CertificateChainFactoryBean"/>
+        class="net.shibboleth.shared.spring.security.factory.X509CertificateChainFactoryBean"/>
 
     <bean id="X509CertificateFactoryBean" abstract="true"
-        class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"/>
+        class="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean"/>
 
     <!-- *** Default Shibboleth component bean id property from Spring bean id *** -->
-    <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" lazy-init="false"/>
+    <bean class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" lazy-init="false"/>
 
 
     <!--
@@ -155,11 +155,11 @@
     <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
         <property name="converters">
             <set>
-                <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" />
-                <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
+                <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" />
             </set>
         </property>
     </bean>
@@ -286,7 +286,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.utilities.java.support.xml.SimpleNamespaceContext">
+    <bean id="commonNamespaces" class="net.shibboleth.metadata.dom.SimpleNamespaceContext">
         <constructor-arg>
             <util:map map-class="java.util.HashMap">
                 <entry key="alg"        value-ref="alg_namespace"/>
@@ -702,7 +702,7 @@
         any items that had errors.  Items with just warnings are retained.
     -->
     <bean id="errorAnnouncingFilter" parent="mda.CompositeStage">
-        <property name="composedStages">
+        <property name="stages">
             <list>
                 <ref bean="warningAndErrorAnnouncer"/>
                 <ref bean="errorRemover"/>
@@ -718,7 +718,7 @@
         Warnings are not announced, and do not cause termination.
     -->
     <bean id="errorTerminatingFilter" parent="mda.CompositeStage">
-        <property name="composedStages">
+        <property name="stages">
             <list>
                 <ref bean="errorAnnouncer"/>
                 <ref bean="errorTerminator"/>
@@ -990,7 +990,7 @@
         These options can be removed once the underlying issue has been resolved.
     -->
     <bean id="httpClientBuilder"
-        class="net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder"
+        class="net.shibboleth.shared.httpclient.HttpClientBuilder"
         p:connectionDisregardTLSCertificate="true"
         p:socketTimeout="PT100S"
         p:connectionTimeout="PT100S"
@@ -1009,7 +1009,7 @@
         A pre-configured parser pool for use by source stages.
     -->
     <bean id="parserPool" parent="component_parent"
-        class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+        class="net.shibboleth.shared.xml.impl.BasicParserPool"
         p:ignoreComments="false"
         p:ignoreElementContentWhitespace="false"/>
 
@@ -1227,7 +1227,7 @@
         that is left to the caller.
     -->
     <bean id="standardImportActions" parent="mda.CompositeStage">
-        <property name="composedStages">
+        <property name="stages">
             <list>
                 <ref bean="populateItemIds"/>
                 <ref bean="populateRegistrationAuthorities"/>
@@ -1237,7 +1237,7 @@
                     other than the ones we accept from partners.
                 -->
                 <bean id="whitelistImportedNamespaces" parent="mda.NamespacesStrippingStage"
-                    p:whitelisting="true">
+                    p:keeping="true">
                     <property name="namespaces">
                         <set>
                             <ref bean="alg_namespace"/>
@@ -1290,7 +1290,7 @@
         namespaces in the document ready for serialisation.
     -->
     <bean id="standardImportTail" parent="mda.CompositeStage">
-        <property name="composedStages">
+        <property name="stages">
             <list>
                 <!-- announce and remove any entities with errors -->
                 <ref bean="errorAnnouncingFilter"/>

mdx/int_edugain/beans.xml

@@ -86,14 +86,14 @@
         Remove blacklisted entities.
     -->
     <bean id="int_edugain_removeBlacklistedEntities" parent="mda.EntityFilterStage"
-        p:whitelistingEntities="false"
+        p:keepingEntities="false"
         p:designatedEntities-ref="int_edugain_entity_blacklist"/>
 
     <!--
         Fetch the production entities as a collection.
     -->
     <bean id="int_edugain_productionEntities" parent="mda.CompositeStage">
-        <property name="composedStages">
+        <property name="stages">
             <list>
                 <ref bean="int_edugain_productionAggregate_fromFile"/>
 

mdx/int_edugain/verbs.xml

@@ -90,7 +90,7 @@
                 <ref bean="int_edugain_productionEntities"/>
                 <ref bean="removeUKEntities"/>
                 <bean id="removeBlacklistedEntities" parent="mda.EntityFilterStage"
-                    p:whitelistingEntities="false"
+                    p:keepingEntities="false"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
 
                 <!--
@@ -127,7 +127,7 @@
                 <ref bean="int_edugain_productionEntities"/>
                 <ref bean="removeUKEntities"/>
                 <bean id="removeBlacklistedEntities" parent="mda.EntityFilterStage"
-                    p:whitelistingEntities="false"
+                    p:keepingEntities="false"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
 
                 <ref bean="standardImportActions"/>
@@ -156,7 +156,7 @@
 
                 <!-- remove all entities *other* than the ones in the blacklist -->
                 <bean id="removeAllButBlacklistedEntities" parent="mda.EntityFilterStage"
-                    p:whitelistingEntities="true"
+                    p:keepingEntities="true"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
 
                 <!-- flag up any remaining entities -->

mdx/test/beans.xml

@@ -23,7 +23,7 @@
         Fetch and process the entities as a collection.
     -->
     <bean id="test_entities" parent="mda.CompositeStage">
-        <property name="composedStages">
+        <property name="stages">
             <list>
                 <ref bean="test_aggregate"/>
                 <ref bean="disassemble"/>

mdx/uk/beans.xml

@@ -42,7 +42,7 @@
                 <value>administrative</value>
             </list>
         </property>
-        <property name="whitelistingTypes" value="false"/>
+        <property name="keepingTypes" value="false"/>
     </bean>
 
 
@@ -238,9 +238,9 @@
 
         Check against UKf-specific list of compromised RSA keys.
     -->
-    <bean id="compromised.ukf" parent="mda.X509RSAOpenSSLBlacklistValidator"
+    <bean id="compromised.ukf" parent="mda.X509RSAOpenSSLKeylistValidator"
         p:id="compromised.ukf">
-        <property name="blacklistResource">
+        <property name="keylistResource">
             <bean parent="FileSystemResource" c:_="${blocklists.dir}/compromised-keys.txt"/>
         </property>
     </bean>
@@ -271,7 +271,7 @@
         described by the EmailAddressStringValidator. In particular,
         this requires the "mailto:" scheme."
     -->
-    <bean id="check_uk_email" parent="ukf.StringElementValidationStage"
+    <bean id="check_uk_email" parent="mda.StringElementValidationStage"
         p:elementName-ref="md-EmailAddress">
         <property name="validators">
             <bean id="format" parent="ukf.EmailAddressStringValidator"/>
@@ -377,7 +377,7 @@
             </bean>
         </property>
         <property name="sourceFileFilter">
-            <bean parent="ukf.RegexFileFilter">
+            <bean parent="mda.RegexFileFilter">
                 <constructor-arg value="uk\d{6}.xml"/>
             </bean>
         </property>
@@ -388,7 +388,7 @@
         Fetch and process the registered entities as a collection.
     -->
     <bean id="uk_registeredEntities" parent="mda.CompositeStage">
-        <property name="composedStages">
+        <property name="stages">
             <list>
                 <ref bean="uk_fetchFragmentFiles"/>
                 <ref bean="uk_processFragment"/>
@@ -442,26 +442,26 @@
                     <property name="validators">
                         <list>
                             <!-- Error on DSA keys. -->
-                            <bean p:id="DSA" parent="ukf.X509DSADetector"/>
+                            <bean p:id="DSA" parent="mda.X509DSADetector"/>
 
                             <!-- Error on RSA key length less than 2048 bits. -->
                             <bean p:id="RSAKeyLength" parent="mda.X509RSAKeyLengthValidator"
                                 p:warningBoundary="0" p:errorBoundary="2048"/>
                             <!-- Error on small RSA public exponents. -->
                             <bean p:id="RSAExponent" parent="mda.X509RSAExponentValidator"/>
                             <!-- Error on keys vulnerable to ROCA. -->
-                            <bean p:id="ROCA" parent="ukf.X509ROCAValidator"/>
+                            <bean p:id="ROCA" parent="mda.X509ROCAValidator"/>
 
                             <!--
-                                Debian weak key blacklists.
+                                Debian weak key lists.
 
                                 Don't need to check for keys below our minimum key size.
                             -->
                             <ref bean="debian.2048"/>
                             <ref bean="debian.4096"/>
 
                             <!--
-                                Compromised key blacklists.
+                                Compromised key lists.
 
                                 Again, don't need to check for keys below our minimum key size.
                             -->
@@ -617,7 +617,7 @@
         Fetch the export entities as a collection.
     -->
     <bean id="uk_exportedEntities" parent="mda.CompositeStage">
-        <property name="composedStages">
+        <property name="stages">
             <list>
                 <ref bean="uk_exportAggregate"/>