From 13502945c2230e72b015a2b159b82b228fa5438a Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 1 May 2017 10:22:01 +0100
Subject: [PATCH] Separate out definitions of MDA beans

All Shibboleth MDA abstract beans are now defined in mda-beans.xml,
which is a first cut of a resource planned for inclusion in MDA 0.10.0.
---
 mdx/at_aconet/beans.xml   |   4 +-
 mdx/at_aconet/verbs.xml   |  17 ++-
 mdx/common-beans.xml      | 270 +++++++++----------------------------
 mdx/int_cobweb/beans.xml  |   2 +-
 mdx/int_cobweb/verbs.xml  |   6 +-
 mdx/int_edugain/beans.xml |   6 +-
 mdx/int_edugain/verbs.xml |  22 +--
 mdx/mda-beans.xml         | 272 ++++++++++++++++++++++++++++++++++++++
 mdx/test/beans.xml        |   2 +-
 mdx/test/verbs.xml        |   4 +-
 mdx/uk/beans.xml          |  57 ++++----
 mdx/uk/collect.xml        |   2 +-
 mdx/uk/generate.xml       |  83 ++++++------
 mdx/uk/mdq-multisign.xml  |  16 +--
 mdx/uk/verbs.xml          |  34 ++---
 mdx/us_incommon/beans.xml |  12 +-
 mdx/us_incommon/verbs.xml |   8 +-
 mdx/validation-beans.xml  | 123 +++++++++--------
 18 files changed, 529 insertions(+), 411 deletions(-)
 create mode 100644 mdx/mda-beans.xml

diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index 15d9c658..4d822ba2 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -95,7 +95,7 @@
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="at_aconet_productionEntities" parent="CompositeStage">
+    <bean id="at_aconet_productionEntities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="at_aconet_productionAggregate"/>
@@ -117,7 +117,7 @@
     <!--
         Fetch the eduGAIN export entities as a collection.
     -->
-    <bean id="at_aconet_edugainEntities" parent="CompositeStage">
+    <bean id="at_aconet_edugainEntities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="at_aconet_edugainAggregate"/>
diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
index 4b5a334a..9e77f6de 100644
--- a/mdx/at_aconet/verbs.xml
+++ b/mdx/at_aconet/verbs.xml
@@ -30,7 +30,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="SimplePipeline">
+    <bean id="importProduction" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_productionEntities"/>
@@ -41,7 +41,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="SimplePipeline">
+    <bean id="importProductionRaw" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_productionAggregate"/>
@@ -50,7 +50,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugain" parent="SimplePipeline">
+    <bean id="importEdugain" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
@@ -61,7 +61,7 @@
         </property>
     </bean>
     
-    <bean id="importEdugainRaw" parent="SimplePipeline">
+    <bean id="importEdugainRaw" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainAggregate"/>
@@ -70,17 +70,17 @@
         </property>
     </bean>
     
-    <bean id="verifyEdugain" parent="SimplePipeline">
+    <bean id="verifyEdugain" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
                 <ref bean="standardImportActions"/>
 
-                <bean id="checkCertificates" parent="X509ValidationStage">
+                <bean id="checkCertificates" parent="mda.X509ValidationStage">
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
-                            <bean parent="X509RSAKeyLengthValidator"
+                            <bean parent="mda.X509RSAKeyLengthValidator"
                                 p:warningBoundary="0" p:errorBoundary="2048"/>
                         </list>
                     </property>
@@ -90,8 +90,7 @@
                     Remove a specific entity we know has a problem that it will take
                     a while to resolve.
                 -->
-                <bean id="filterEntities" parent="stage_parent"
-                    class="net.shibboleth.metadata.dom.saml.EntityFilterStage"
+                <bean id="filterEntities" parent="mda.EntityFilterStage"
                     p:whitelistingEntities="false">
                     <property name="designatedEntities">
                         <set>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 0f2d3602..9a541410 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -19,6 +19,11 @@
     -->
     <context:property-placeholder/>
 
+    <!--
+        Pick up Shibboleth MDA beans.
+    -->
+    <import resource="mda-beans.xml"/>
+
     <!--
         ***********************************
         ***                             ***
@@ -62,9 +67,6 @@
         Parent for all stages.
     -->
     <bean id="stage_parent" abstract="true" parent="component_parent"/>
-    
-    <bean id="XMLSignatureSigningStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.XMLSignatureSigningStage"/>
 
     <!--
         XMLSignatureValidationStage
@@ -79,8 +81,7 @@
         overridden in specific beans where a signature is known to
         require it.
     -->
-    <bean id="XMLSignatureValidationStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.XMLSignatureValidationStage">
+    <bean id="XMLSignatureValidationStage" abstract="true" parent="mda.XMLSignatureValidationStage">
         <property name="blacklistedDigests">
             <list>
                 <value>http://www.w3.org/2001/04/xmldsig-more#md5</value>
@@ -117,57 +118,15 @@
         </property>
     </bean>
 
-    <bean id="XPathFilteringStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.XPathFilteringStage"
+    <bean id="XPathFilteringStage" abstract="true" parent="mda.XPathFilteringStage"
         p:namespaceContext-ref="commonNamespaces"/>
 
-    <!--
-        XSLTransformationStage
-        
-        Parent for XSLT-based checking stages.
-    -->
-    <bean id="XSLTransformationStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.XSLTransformationStage"/>
-    
-    <!--
-        XSLValidationStage
-        
-        Parent for XSLT-based checking stages.
-    -->
-    <bean id="XSLValidationStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.XSLValidationStage"/>
-    
-    <!--
-        EmptyContainerStrippingStage
-        
-        Parent for container stripping stages.
-    -->
-    <bean id="EmptyContainerStrippingStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.EmptyContainerStrippingStage"/>
-    
-    <!--
-        ElementStrippingStage
-        
-        Parent for element stripping stages.
-    -->
-    <bean id="ElementStrippingStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.ElementStrippingStage"/>
-    
-    <!--
-        NamespaceStrippingStage
-        
-        Parent for namespace stripping stages.
-    -->
-    <bean id="NamespaceStrippingStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.NamespaceStrippingStage"/>
-
     <!--
         DomFilesystemSourceStage
         
         Parent for DOM filesystem source stages.
     -->
-    <bean id="DOMFilesystemSourceStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DOMFilesystemSourceStage">
+    <bean id="DOMFilesystemSourceStage" abstract="true" parent="mda.DOMFilesystemSourceStage">
         <property name="parserPool" ref="parserPool"/>
     </bean>
 
@@ -176,19 +135,10 @@
         
         Parent for DOM resource source stages.
     -->
-    <bean id="DOMResourceSourceStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DOMResourceSourceStage">
+    <bean id="DOMResourceSourceStage" abstract="true" parent="mda.DOMResourceSourceStage">
         <property name="parserPool" ref="parserPool"/>
     </bean>
 
-    <!--
-        EntityRegistrationAuthorityFilterStage
-        
-        Parent for registration authority filtering stages.
-    -->
-    <bean id="EntityRegistrationAuthorityFilterStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.mdrpi.EntityRegistrationAuthorityFilterStage"/>
-    
     <!-- *** Parent beans for Shibboleth spring-extensions factory beans. *** -->
 
     <bean id="DOMDocumentFactoryBean" abstract="true"
@@ -210,108 +160,23 @@
     <bean id="X509CertificateFactoryBean" abstract="true"
         class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"/>
 
-    <!-- *** Parent beans for Shibboleth MDA components. *** -->
-
-    <bean id="CRDetectionStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.CRDetectionStage"/>
-    
-    <bean id="ElementWhitespaceTrimmingStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.ElementWhitespaceTrimmingStage"/>
-    
-    <bean id="EntityFilterStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntityFilterStage"/>
-
-    <bean id="GenerateIdStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.GenerateIdStage"/>
-
-    <bean id="NamespacesStrippingStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.NamespacesStrippingStage"/>
-    
-    <bean id="SetCacheDurationStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.SetCacheDurationStage"/>
-
-    <bean id="SetValidUntilStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.SetValidUntilStage"/>
-
-    <bean id="XPathItemSelectionStrategy" abstract="true"
-        class="net.shibboleth.metadata.dom.XPathItemSelectionStrategy"/>
-    
-    <!-- *** Parent beans for entity attribute handling. *** -->
-    
-    <bean id="EntityAttributeFilteringStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage"/>
-    
-    <bean id="EntityCategoryMatcher" abstract="true"
-        class="net.shibboleth.metadata.dom.saml.mdattr.EntityCategoryMatcher"/>
-    
-    <bean id="EntityCategorySupportMatcher" abstract="true"
-        class="net.shibboleth.metadata.dom.saml.mdattr.EntityCategorySupportMatcher"/>
-    
-    <bean id="MultiPredicateMatcher" abstract="true"
-        class="net.shibboleth.metadata.dom.saml.mdattr.MultiPredicateMatcher"/>
-    
-    <bean id="RegistrationAuthorityMatcher" abstract="true"
-        class="net.shibboleth.metadata.dom.saml.mdattr.RegistrationAuthorityMatcher"/>
-    
-    <!-- *** Parent beans for X.509 Certificate validation. *** -->
-
-    <bean id="X509ValidationStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.ds.X509ValidationStage"/>
-    
-    <bean id="validator_parent" abstract="true" parent="component_parent"/>
-    
-    <bean id="X509RSAExponentValidator" abstract="true" parent="validator_parent"
-        class="net.shibboleth.metadata.validate.x509.X509RSAExponentValidator"/>
-    
-    <bean id="X509RSAKeyLengthValidator" abstract="true" parent="validator_parent"
-        class="net.shibboleth.metadata.validate.x509.X509RSAKeyLengthValidator"/>
-    
-    <bean id="X509RSAOpenSSLBlacklistValidator" abstract="true" parent="validator_parent"
-        class="net.shibboleth.metadata.validate.x509.X509RSAOpenSSLBlacklistValidator"/>
-
     <!-- *** Parent beans for net.shibboleth.metadata.pipeline package. *** -->
 
-    <bean id="CompositeStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.CompositeStage"/>
-
-    <bean id="FilesInDirectoryMultiOutputStrategy" abstract="true" parent="component_parent"
-        class="net.shibboleth.metadata.pipeline.FilesInDirectoryMultiOutputStrategy"/>
-
-    <bean id="MultiOutputSerializationStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.MultiOutputSerializationStage">
+    <bean id="MultiOutputSerializationStage" abstract="true" parent="mda.MultiOutputSerializationStage">
         <property name="serializer" ref="serializer"/>
     </bean>
 
-    <bean id="PipelineDemultiplexerStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.PipelineDemultiplexerStage"
+    <bean id="PipelineDemultiplexerStage" abstract="true" parent="mda.PipelineDemultiplexerStage"
         p:waitingForPipelines="true"
     />
 
-    <bean id="PipelineMergeStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.PipelineMergeStage"/>
-
-    <bean id="PipelineMergeStage.deduplicate" abstract="true" parent="PipelineMergeStage"
+    <bean id="PipelineMergeStage.deduplicate" abstract="true" parent="mda.PipelineMergeStage"
         p:collectionMergeStrategy-ref="deduplicateMergeStrategy"/>
 
-    <bean id="SerializationStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.SerializationStage">
+    <bean id="SerializationStage" abstract="true" parent="mda.SerializationStage">
         <property name="serializer" ref="serializer"/>
     </bean>
 
-    <bean id="SimplePipeline" abstract="true" parent="component_parent"
-        class="net.shibboleth.metadata.pipeline.SimplePipeline"/>
-
-    <bean id="SplitMergeStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.SplitMergeStage"/>
-
-    <!-- *** Parent beans for net.shibboleth.metadata.utils package. *** -->
-
-    <bean id="PathSegmentStringTransformer" abstract="true"
-        class="net.shibboleth.metadata.util.PathSegmentStringTransformer"/>
-
-    <bean id="SHA1StringTransformer" abstract="true"
-        class="net.shibboleth.metadata.util.SHA1StringTransformer"/>
-
     <!-- *** Parent beans for ukf-mda. *** -->
 
     <bean id="EntityAttributeAddingStage" abstract="true" parent="stage_parent"
@@ -320,7 +185,7 @@
     <bean id="SAMLStringElementCheckingStage" abstract="true" parent="stage_parent"
         class="uk.org.ukfederation.mda.dom.saml.SAMLStringElementCheckingStage"/>
 
-    <bean id="X509ConsistentNameValidator" abstract="true" parent="validator_parent"
+    <bean id="X509ConsistentNameValidator" abstract="true" parent="mda.validator_parent"
         class="uk.org.ukfederation.mda.validate.X509ConsistentNameValidator"/>
         
     <!-- *** Default Shibboleth component bean id property from Spring bean id *** -->
@@ -403,7 +268,7 @@
         
         Remove the algorithm support namespace.
     -->
-    <bean id="stripAlgNamespace" parent="NamespaceStrippingStage"
+    <bean id="stripAlgNamespace" parent="mda.NamespaceStrippingStage"
         p:namespace-ref="alg_namespace"/>
     
     <!--
@@ -411,7 +276,7 @@
         
         Remove the IdP discovery namespace.
     -->
-    <bean id="stripIdpdiscNamespace" parent="NamespaceStrippingStage"
+    <bean id="stripIdpdiscNamespace" parent="mda.NamespaceStrippingStage"
         p:namespace-ref="idpdisc_namespace"/>
 
     <!--
@@ -419,7 +284,7 @@
         
         Remove the session initiation namespace.
     -->
-    <bean id="stripInitNamespace" parent="NamespaceStrippingStage"
+    <bean id="stripInitNamespace" parent="mda.NamespaceStrippingStage"
         p:namespace-ref="init_namespace"/>
     
     <!--
@@ -427,7 +292,7 @@
         
         Remove the namespace used by the entity attributes extension.
     -->
-    <bean id="stripMdattrNamespace" parent="NamespaceStrippingStage"
+    <bean id="stripMdattrNamespace" parent="mda.NamespaceStrippingStage"
         p:namespace-ref="mdattr_namespace"/>
     
     <!--
@@ -435,7 +300,7 @@
         
         Remove the namespace used by the registration and publication metdata extension.
     -->
-    <bean id="stripMdrpiNamespace" parent="NamespaceStrippingStage"
+    <bean id="stripMdrpiNamespace" parent="mda.NamespaceStrippingStage"
         p:namespace-ref="mdrpi_namespace"/>
     
     <!--
@@ -443,7 +308,7 @@
         
         Remove the UK federation label namespace.
     -->
-    <bean id="stripUkfedlabelNamespace" parent="NamespaceStrippingStage"
+    <bean id="stripUkfedlabelNamespace" parent="mda.NamespaceStrippingStage"
         p:namespace-ref="ukfedlabel_namespace"/>
     
     <!--
@@ -451,7 +316,7 @@
         
         Remove the UK federation WAYF namespace.
     -->
-    <bean id="stripWayfNamespace" parent="NamespaceStrippingStage"
+    <bean id="stripWayfNamespace" parent="mda.NamespaceStrippingStage"
         p:namespace-ref="wayf_namespace"/>
     
     <!--
@@ -460,7 +325,7 @@
         A pipeline stage that can be used before serialisation to normalise the namespaces
         used in an XML document.
     -->
-    <bean id="normaliseNamespaces" parent="XSLTransformationStage"
+    <bean id="normaliseNamespaces" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:ns_norm.xsl"/>
     
     <!--
@@ -610,8 +475,7 @@
         A pipeline stage that logs any errors present,
         but takes no action on them.
     -->
-    <bean id="errorAnnouncer" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.StatusMetadataLoggingStage">
+    <bean id="errorAnnouncer" parent="mda.StatusMetadataLoggingStage">
         <property name="identificationStrategy" ref="identificationStrategy"/>
         <property name="selectionRequirements">
             <list>
@@ -626,8 +490,7 @@
         A pipeline stage that logs any errors and warnings present,
         but takes no action on them.
     -->
-    <bean id="warningAndErrorAnnouncer" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.StatusMetadataLoggingStage">
+    <bean id="warningAndErrorAnnouncer" parent="mda.StatusMetadataLoggingStage">
         <property name="identificationStrategy" ref="identificationStrategy"/>
         <property name="selectionRequirements">
             <list>
@@ -642,8 +505,7 @@
         
         This pipeline stage removes any items marked with an error status.
     -->
-    <bean id="errorRemover" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.ItemMetadataFilterStage">
+    <bean id="errorRemover" parent="mda.ItemMetadataFilterStage">
         <property name="identificationStrategy" ref="identificationStrategy"/>
         <property name="selectionRequirements">
             <list>
@@ -657,8 +519,7 @@
         
         This pipeline stage causes CLI termination if any item is marked with an error status.
     -->
-    <bean id="errorTerminator" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.ItemMetadataTerminationStage">
+    <bean id="errorTerminator" parent="mda.ItemMetadataTerminationStage">
         <property name="identificationStrategy" ref="identificationStrategy"/>
         <property name="selectionRequirements">
             <list>
@@ -673,7 +534,7 @@
         Announce any errors or warnings encountered, then remove
         any items that had errors.  Items with just warnings are retained.
     -->
-    <bean id="errorAnnouncingFilter" parent="CompositeStage">
+    <bean id="errorAnnouncingFilter" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="warningAndErrorAnnouncer"/>
@@ -689,7 +550,7 @@
         
         Warnings are not announced, and do not cause termination.
     -->
-    <bean id="errorTerminatingFilter" parent="CompositeStage">
+    <bean id="errorTerminatingFilter" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="errorAnnouncer"/>
@@ -726,25 +587,22 @@
     <!--
         Basic EntitiesDescriptor disassembler pipeline stage.
     -->
-    <bean id="disassemble" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorDisassemblerStage"/>
+    <bean id="disassemble" parent="mda.EntitiesDescriptorDisassemblerStage"/>
     
     <!--
         Basic EntitiesDescriptor assembler pipeline stage.
     -->
-    <bean id="assemble" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage"/>
+    <bean id="assemble" parent="mda.EntitiesDescriptorAssemblerStage"/>
     
     <!--
         Populate ItemId values from entities.
     -->
-    <bean id="populateItemIds" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntityDescriptorItemIdPopulationStage"/>
+    <bean id="populateItemIds" parent="mda.EntityDescriptorItemIdPopulationStage"/>
 
     <!--
         Remove any empty Extensions elements.
     -->
-    <bean id="stripEmptyExtensions" parent="EmptyContainerStrippingStage"
+    <bean id="stripEmptyExtensions" parent="mda.EmptyContainerStrippingStage"
         p:elementName="Extensions"
         p:elementNamespace-ref="md_namespace"/>
     
@@ -752,43 +610,43 @@
         Beans to strip out selected SAML metadata elements.
     -->
     
-    <bean id="stripArtifactResolutionService" parent="ElementStrippingStage"
+    <bean id="stripArtifactResolutionService" parent="mda.ElementStrippingStage"
         p:elementName="ArtifactResolutionService"
         p:elementNamespace-ref="md_namespace"/>
     
-    <bean id="stripAssertionConsumerService" parent="ElementStrippingStage"
+    <bean id="stripAssertionConsumerService" parent="mda.ElementStrippingStage"
         p:elementName="AssertionConsumerService"
         p:elementNamespace-ref="md_namespace"/>
     
-    <bean id="stripAttributeAuthorityDescriptor" parent="ElementStrippingStage"
+    <bean id="stripAttributeAuthorityDescriptor" parent="mda.ElementStrippingStage"
         p:elementName="AttributeAuthorityDescriptor"
         p:elementNamespace-ref="md_namespace"/>
     
-    <bean id="stripAttributeConsumingService" parent="ElementStrippingStage"
+    <bean id="stripAttributeConsumingService" parent="mda.ElementStrippingStage"
         p:elementName="AttributeConsumingService"
         p:elementNamespace-ref="md_namespace"/>
     
-    <bean id="stripContactPerson" parent="ElementStrippingStage"
+    <bean id="stripContactPerson" parent="mda.ElementStrippingStage"
         p:elementName="ContactPerson"
         p:elementNamespace-ref="md_namespace"/>
     
-    <bean id="stripKeyDescriptor" parent="ElementStrippingStage"
+    <bean id="stripKeyDescriptor" parent="mda.ElementStrippingStage"
         p:elementName="KeyDescriptor"
         p:elementNamespace-ref="md_namespace"/>
     
-    <bean id="stripManageNameIDService" parent="ElementStrippingStage"
+    <bean id="stripManageNameIDService" parent="mda.ElementStrippingStage"
         p:elementName="ManageNameIDService"
         p:elementNamespace-ref="md_namespace"/>
     
-    <bean id="stripNameIDFormat" parent="ElementStrippingStage"
+    <bean id="stripNameIDFormat" parent="mda.ElementStrippingStage"
         p:elementName="NameIDFormat"
         p:elementNamespace-ref="md_namespace"/>
     
-    <bean id="stripSingleLogoutService" parent="ElementStrippingStage"
+    <bean id="stripSingleLogoutService" parent="mda.ElementStrippingStage"
         p:elementName="SingleLogoutService"
         p:elementNamespace-ref="md_namespace"/>
     
-    <bean id="stripSingleSignOnService" parent="ElementStrippingStage"
+    <bean id="stripSingleSignOnService" parent="mda.ElementStrippingStage"
         p:elementName="SingleSignOnService"
         p:elementNamespace-ref="md_namespace"/>
     
@@ -805,8 +663,7 @@
     <!--
         Populate RegistrationAuthority values from entities.
     -->
-    <bean id="populateRegistrationAuthorities" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthorityPopulationStage"/>
+    <bean id="populateRegistrationAuthorities" parent="mda.RegistrationAuthorityPopulationStage"/>
     
     <!--
         default_regauth_parent
@@ -816,7 +673,7 @@
         Any registrationAuthority already present on an entity in this
         channel must match the known registration authority value.
     -->
-    <bean id="default_regauth_parent" abstract="true" parent="XSLTransformationStage"
+    <bean id="default_regauth_parent" abstract="true" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:default_regauth.xsl"/>
     
 
@@ -838,7 +695,7 @@
     <bean id="mdui-Keywords"        parent="QName" c:_0-ref="mdui_namespace" c:_1="Keywords"/>
     <bean id="mdui-Logo"            parent="QName" c:_0-ref="mdui_namespace" c:_1="Logo"/>
 
-    <bean id="stripMDUIDiscoHints" parent="ElementStrippingStage"
+    <bean id="stripMDUIDiscoHints" parent="mda.ElementStrippingStage"
         p:elementName="DiscoHints"
         p:elementNamespace-ref="mdui_namespace"/>
     
@@ -847,7 +704,7 @@
         
         Remove all MDUI metadata from attribute authority roles.
     -->
-    <bean id="stripAAMDUI" parent="XSLTransformationStage"
+    <bean id="stripAAMDUI" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:strip-aa-mdui.xsl"/>
     
     <!--
@@ -855,7 +712,7 @@
         
         Remove all mdui:Logo elements containing data: URLs.
     -->
-    <bean id="stripMDUILogoData" parent="XSLTransformationStage"
+    <bean id="stripMDUILogoData" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:strip-mdui-logo-data.xsl"/>
 
     <!--
@@ -863,7 +720,7 @@
         
         Remove any mdui:Logo elements containing http:// URLs.
     -->
-    <bean id="stripMDUILogoHttp" parent="XSLTransformationStage"
+    <bean id="stripMDUILogoHttp" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:strip-mdui-logo-http.xsl"/>
     
     <!--
@@ -871,7 +728,7 @@
         
         Remove any empty mdui:UIInfo container elements.
     -->
-    <bean id="stripEmptyMDUIUIInfo" parent="EmptyContainerStrippingStage">
+    <bean id="stripEmptyMDUIUIInfo" parent="mda.EmptyContainerStrippingStage">
         <property name="elementNamespace" ref="mdui_namespace"/>
         <property name="elementName" value="UIInfo"/>
     </bean>
@@ -886,7 +743,7 @@
     
     <bean id="shibmd-Scope" parent="QName" c:_0-ref="shibmd_namespace" c:_1="Scope"/>
 
-    <bean id="stripShibScope" parent="ElementStrippingStage"
+    <bean id="stripShibScope" parent="mda.ElementStrippingStage"
         p:elementName="Scope"
         p:elementNamespace-ref="shibmd_namespace"/>
     
@@ -905,7 +762,7 @@
         
         Remove all ds:KeyName elements.
     -->
-    <bean id="stripKeyNames" parent="ElementStrippingStage"
+    <bean id="stripKeyNames" parent="mda.ElementStrippingStage"
         p:elementName="KeyName"
         p:elementNamespace-ref="ds_namespace"/>
     
@@ -1081,8 +938,7 @@
         
         A pipeline stage that checks against all the common schemas, as above.
     -->
-    <bean id="checkSchemas" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.XMLSchemaValidationStage">
+    <bean id="checkSchemas" parent="mda.XMLSchemaValidationStage">
         <property name="schemaResources" ref="schemaResources"/>
     </bean>
 
@@ -1092,7 +948,7 @@
         A pipeline stage that removes all XML comments from items.
     -->
     
-    <bean id="stripComments" parent="XSLTransformationStage"
+    <bean id="stripComments" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:strip-comments.xsl"/>
     
     <!--
@@ -1106,12 +962,12 @@
     <!--
         Standard serializer.
     -->
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DOMElementSerializer"/>
+    <bean id="serializer" parent="mda.DOMElementSerializer"/>
     
     <!--
         Merge strategy that removes duplicates.
     -->
-    <bean id="deduplicateMergeStrategy" class="net.shibboleth.metadata.DeduplicatingItemIdMergeStrategy"/>
+    <bean id="deduplicateMergeStrategy" parent="mda.DeduplicatingItemIdMergeStrategy"/>
     
 
 
@@ -1130,7 +986,7 @@
         presented, for example by removing redundant attributes or elements which only have
         meaning when added by the UK federation registrar.
     -->
-    <bean id="cleanImport" parent="XSLTransformationStage"
+    <bean id="cleanImport" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:clean-import.xsl"/>
     
     <!--
@@ -1141,7 +997,7 @@
         but repairing the metadata on the fly is often easier than
         asking for it to be corrected at source.
     -->
-    <bean id="trimImportElementWhitespace" parent="ElementWhitespaceTrimmingStage">
+    <bean id="trimImportElementWhitespace" parent="mda.ElementWhitespaceTrimmingStage">
         <property name="elementNames">
             <set>
                 <ref bean="md-EmailAddress"/>
@@ -1165,7 +1021,7 @@
         errors.  No announcement or removal of those entities is performed here;
         that is left to the caller.
     -->
-    <bean id="standardImportActions" parent="CompositeStage">
+    <bean id="standardImportActions" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="populateItemIds"/>
@@ -1175,7 +1031,7 @@
                     Strip all elements and attributes that are in namespaces
                     other than the ones we accept from partners.
                 -->
-                <bean id="whitelistImportedNamespaces" parent="NamespacesStrippingStage"
+                <bean id="whitelistImportedNamespaces" parent="mda.NamespacesStrippingStage"
                     p:whitelisting="true">
                     <property name="namespaces">
                         <set>
@@ -1209,14 +1065,14 @@
                 <ref bean="check_shib_regscope"/>
                 <ref bean="check_namespaces"/>
 
-                <bean id="checkCertificates" parent="X509ValidationStage">
+                <bean id="checkCertificates" parent="mda.X509ValidationStage">
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
-                            <bean parent="X509RSAKeyLengthValidator"
+                            <bean parent="mda.X509RSAKeyLengthValidator"
                                 p:warningBoundary="0" p:errorBoundary="2048"/>
                             <!-- Error on small RSA public exponents. -->
-                            <bean parent="X509RSAExponentValidator"/>
+                            <bean parent="mda.X509RSAExponentValidator"/>
                             
                             <!--
                                 Debian weak key blacklists.
@@ -1247,7 +1103,7 @@
         are currently ending up in files, build an EntitiesDescriptor and normalise the
         namespaces in the document ready for serialisation.
     -->
-    <bean id="standardImportTail" parent="CompositeStage">
+    <bean id="standardImportTail" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <!-- announce and remove any entities with errors -->
diff --git a/mdx/int_cobweb/beans.xml b/mdx/int_cobweb/beans.xml
index 2922f2fc..3d8e2f4d 100644
--- a/mdx/int_cobweb/beans.xml
+++ b/mdx/int_cobweb/beans.xml
@@ -47,7 +47,7 @@
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="int_cobweb_productionEntities" parent="CompositeStage">
+    <bean id="int_cobweb_productionEntities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="int_cobweb_productionAggregate"/>
diff --git a/mdx/int_cobweb/verbs.xml b/mdx/int_cobweb/verbs.xml
index dde7a217..2cadfed2 100644
--- a/mdx/int_cobweb/verbs.xml
+++ b/mdx/int_cobweb/verbs.xml
@@ -30,7 +30,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="SimplePipeline">
+    <bean id="importProduction" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_cobweb_productionEntities"/>
@@ -41,7 +41,7 @@
         </property>
     </bean>
     
-    <bean id="verifyProduction" parent="SimplePipeline">
+    <bean id="verifyProduction" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_cobweb_productionEntities"/>
@@ -51,7 +51,7 @@
         </property>
     </bean>
     
-    <bean id="importProductionRaw" parent="SimplePipeline">
+    <bean id="importProductionRaw" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_cobweb_productionAggregate"/>
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 05b7c9b3..976fef1d 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -70,14 +70,14 @@
     <!--
         Remove blacklisted entities.
     -->
-    <bean id="int_edugain_removeBlacklistedEntities" parent="EntityFilterStage"
+    <bean id="int_edugain_removeBlacklistedEntities" parent="mda.EntityFilterStage"
         p:whitelistingEntities="false"
         p:designatedEntities-ref="int_edugain_entity_blacklist"/>
 
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="int_edugain_productionEntities" parent="CompositeStage">
+    <bean id="int_edugain_productionEntities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="int_edugain_productionAggregate"/>
@@ -107,7 +107,7 @@
     <!--
         Fetch the test entities as a collection.
     -->
-    <bean id="int_edugain_testEntities" parent="CompositeStage">
+    <bean id="int_edugain_testEntities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="int_edugain_testAggregate"/>
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index e6cd01ce..36d62cd6 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -30,7 +30,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="SimplePipeline">
+    <bean id="importProduction" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
@@ -41,7 +41,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="SimplePipeline">
+    <bean id="importProductionRaw" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionAggregate"/>
@@ -50,7 +50,7 @@
         </property>
     </bean>
     
-    <bean id="importTest" parent="SimplePipeline">
+    <bean id="importTest" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_testEntities"/>
@@ -69,11 +69,11 @@
         blacklist are ignored, so that we only need to deal with each entity
         entering an error state once.
     -->
-    <bean id="verify" parent="SimplePipeline">
+    <bean id="verify" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
-                <bean id="removeBlacklistedEntities" parent="EntityFilterStage"
+                <bean id="removeBlacklistedEntities" parent="mda.EntityFilterStage"
                     p:whitelistingEntities="false"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
 
@@ -88,11 +88,11 @@
         
         Live verify, but adding "new" checks that we don't impose on the live import.
     -->
-    <bean id="verify.new" parent="SimplePipeline">
+    <bean id="verify.new" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
-                <bean id="removeBlacklistedEntities" parent="EntityFilterStage"
+                <bean id="removeBlacklistedEntities" parent="mda.EntityFilterStage"
                     p:whitelistingEntities="false"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
                 
@@ -108,7 +108,7 @@
         Looks for eduGAIN entities which *were* in an error state, as shown by
         their inclusion in our verification blacklist, but have now recovered.
     -->
-    <bean id="verify.recovered" parent="SimplePipeline">
+    <bean id="verify.recovered" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
@@ -118,12 +118,12 @@
                 <ref bean="errorRemover"/>
                 
                 <!-- remove all entities *other* than the ones in the blacklist -->
-                <bean id="removeAllButBlacklistedEntities" parent="EntityFilterStage"
+                <bean id="removeAllButBlacklistedEntities" parent="mda.EntityFilterStage"
                     p:whitelistingEntities="true"
                     p:designatedEntities-ref="int_edugain_verify_blacklist"/>
                 
                 <!-- flag up any remaining entities -->
-                <bean id="check_recovered" parent="XSLValidationStage"
+                <bean id="check_recovered" parent="mda.XSLValidationStage"
                     p:XSLResource="classpath:int_edugain/check_recovered.xsl"/>
 
                 <ref bean="errorTerminatingFilter"/>
@@ -140,7 +140,7 @@
         Output also includes any warnings attached to entities, although
         these do not result in an error termination.
     -->
-    <bean id="verify.all" parent="SimplePipeline">
+    <bean id="verify.all" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
diff --git a/mdx/mda-beans.xml b/mdx/mda-beans.xml
new file mode 100644
index 00000000..ea592084
--- /dev/null
+++ b/mdx/mda-beans.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:p="http://www.springframework.org/schema/p"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <!--
+        Bean definitions for simplified access to components in the
+        Shibboleth Metadata Aggregator's aggregator-pipeline artifact.
+
+        All defined bean names are prefixed with "mda.".
+    -->
+
+    <!--
+        Parent for anything based on the Shibboleth component system.
+        These all require initialization before use.
+    -->
+    <bean id="mda.component_parent" abstract="true"
+        init-method="initialize" destroy-method="destroy"/>
+
+    <!--
+        Parent for all stages.
+    -->
+    <bean id="mda.stage_parent" abstract="true" parent="mda.component_parent"/>
+
+    <!--
+        net.shibboleth.metadata
+    -->
+
+    <bean id="mda.DeduplicatingItemIdMergeStrategy" abstract="true"
+        class="net.shibboleth.metadata.DeduplicatingItemIdMergeStrategy"/>
+
+    <bean id="mda.FirstItemIdItemIdentificationStrategy" abstract="true"
+        class="net.shibboleth.metadata.FirstItemIdItemIdentificationStrategy"/>
+
+    <bean id="mda.SimpleCollectionMergeStrategy" abstract="true"
+        class="net.shibboleth.metadata.SimpleCollectionMergeStrategy"/>
+
+    <bean id="mda.SimpleItemCollectionSerializer" abstract="true"
+        class="net.shibboleth.metadata.SimpleItemCollectionSerializer"/>
+
+    <!--
+        net.shibboleth.metadata.dom
+    -->
+
+    <bean id="mda.CRDetectionStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.CRDetectionStage"/>
+
+    <bean id="mda.DOMElementSerializer" abstract="true"
+        class="net.shibboleth.metadata.dom.DOMElementSerializer"/>
+
+    <bean id="mda.DOMFilesystemSourceStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.DOMFilesystemSourceStage"/>
+
+    <bean id="mda.DOMResourceSourceStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.DOMResourceSourceStage"/>
+
+    <bean id="mda.ElementStrippingStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.ElementStrippingStage"/>
+
+    <bean id="mda.ElementWhitespaceTrimmingStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.ElementWhitespaceTrimmingStage"/>
+
+    <bean id="mda.EmptyContainerStrippingStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.EmptyContainerStrippingStage"/>
+
+    <bean id="mda.MultiOutputXSLTransformationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.MultiOutputXSLTransformationStage"/>
+
+    <bean id="mda.NamespacesStrippingStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.NamespacesStrippingStage"/>
+
+    <bean id="mda.NamespaceStrippingStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.NamespaceStrippingStage"/>
+
+    <bean id="mda.XMLSchemaValidationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.XMLSchemaValidationStage"/>
+
+    <bean id="mda.XMLSignatureSigningStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.XMLSignatureSigningStage"/>
+
+    <bean id="mda.XMLSignatureValidationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"/>
+
+    <bean id="mda.XPathFilteringStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.XPathFilteringStage"/>
+
+    <bean id="mda.XPathItemSelectionStrategy" abstract="true"
+        class="net.shibboleth.metadata.dom.XPathItemSelectionStrategy"/>
+
+    <bean id="mda.XSLTransformationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.XSLTransformationStage"/>
+
+    <bean id="mda.XSLValidationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.XSLValidationStage"/>
+
+    <!--
+        net.shibboleth.metadata.dom.ds
+    -->
+
+    <bean id="mda.X509ValidationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.ds.X509ValidationStage"/>
+
+    <!--
+        net.shibboleth.metadata.dom.saml
+    -->
+
+    <bean id="mda.ContactPersonFilterStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.ContactPersonFilterStage"/>
+
+    <bean id="mda.EntitiesDescriptorAssemblerStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage"/>
+
+    <bean id="mda.EntitiesDescriptorDisassemblerStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorDisassemblerStage"/>
+
+    <bean id="mda.EntityDescriptorItemIdPopulationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.EntityDescriptorItemIdPopulationStage"/>
+
+    <bean id="mda.EntityFilterStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.EntityFilterStage"/>
+
+    <bean id="mda.EntityRoleFilterStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.EntityRoleFilterStage"/>
+
+    <bean id="mda.GenerateIdStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.GenerateIdStage"/>
+
+    <bean id="mda.PullUpCacheDurationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.PullUpCacheDurationStage"/>
+
+    <bean id="mda.PullUpValidUntilStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.PullUpValidUntilStage"/>
+
+    <bean id="mda.RemoveOrganizationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.RemoveOrganizationStage"/>
+
+    <bean id="mda.SetCacheDurationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.SetCacheDurationStage"/>
+
+    <bean id="mda.SetValidUntilStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.SetValidUntilStage"/>
+
+    <bean id="mda.ValidateValidUntilStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.ValidateValidUntilStage"/>
+
+    <!--
+        net.shibboleth.metadata.dom.saml.mdattr
+    -->
+
+    <bean id="mda.EntityAttributeFilteringStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage"/>
+
+    <bean id="mda.EntityCategoryMatcher" abstract="true"
+        class="net.shibboleth.metadata.dom.saml.mdattr.EntityCategoryMatcher"/>
+
+    <bean id="mda.EntityCategorySupportMatcher" abstract="true"
+        class="net.shibboleth.metadata.dom.saml.mdattr.EntityCategorySupportMatcher"/>
+
+    <bean id="mda.MultiPredicateMatcher" abstract="true"
+        class="net.shibboleth.metadata.dom.saml.mdattr.MultiPredicateMatcher"/>
+
+    <bean id="mda.RegistrationAuthorityMatcher" abstract="true"
+        class="net.shibboleth.metadata.dom.saml.mdattr.RegistrationAuthorityMatcher"/>
+
+    <!--
+        net.shibboleth.metadata.dom.saml.mdrpi
+    -->
+
+    <bean id="mda.EntityRegistrationAuthorityFilterStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.mdrpi.EntityRegistrationAuthorityFilterStage"/>
+
+    <bean id="mda.RegistrationAuthorityItemIdentificationStrategy" abstract="true"
+        class="net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthorityItemIdentificationStrategy"/>
+
+    <bean id="mda.RegistrationAuthorityPopulationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthorityPopulationStage"/>
+
+    <!--
+        net.shibboleth.metadata.pipeline
+    -->
+
+    <bean id="mda.AtLeastCollectionPredicate" abstract="true"
+        class="net.shibboleth.metadata.pipeline.AtLeastCollectionPredicate"/>
+
+    <bean id="mda.CompositeStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.CompositeStage"/>
+
+    <bean id="mda.FilesInDirectoryMultiOutputStrategy" abstract="true" parent="mda.component_parent"
+        class="net.shibboleth.metadata.pipeline.FilesInDirectoryMultiOutputStrategy"/>
+
+    <bean id="mda.ItemIdTransformStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.ItemIdTransformStage"/>
+
+    <bean id="mda.ItemMetadataAddingStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.ItemMetadataAddingStage"/>
+
+    <bean id="mda.ItemMetadataFilterStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.ItemMetadataFilterStage"/>
+
+    <bean id="mda.ItemMetadataTerminationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.ItemMetadataTerminationStage"/>
+
+    <bean id="mda.MDQueryMD5ItemIdTransformer" abstract="true"
+        class="net.shibboleth.metadata.pipeline.MDQueryMD5ItemIdTransformer"/>
+
+    <bean id="mda.MDQuerySHA1ItemIdTransformer" abstract="true"
+        class="net.shibboleth.metadata.pipeline.MDQuerySHA1ItemIdTransformer"/>
+
+    <bean id="mda.MultiOutputSerializationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.MultiOutputSerializationStage"/>
+
+    <bean id="mda.PipelineDemultiplexerStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.PipelineDemultiplexerStage"/>
+
+    <bean id="mda.PipelineMergeStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.PipelineMergeStage"/>
+
+    <bean id="mda.ScriptletStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.ScriptletStage"/>
+
+    <bean id="mda.SerializationStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.SerializationStage"/>
+
+    <bean id="mda.SimplePipeline" abstract="true" parent="mda.component_parent"
+        class="net.shibboleth.metadata.pipeline.SimplePipeline"/>
+
+    <bean id="mda.SplitMergeStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.SplitMergeStage"/>
+
+    <bean id="mda.StaticItemSourceStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.StaticItemSourceStage"/>
+
+    <bean id="mda.StatusMetadataLoggingStage" abstract="true" parent="mda.stage_parent"
+        class="net.shibboleth.metadata.pipeline.StatusMetadataLoggingStage"/>
+
+    <!--
+        net.shibboleth.metadata.util
+    -->
+
+    <bean id="mda.PathSegmentStringTransformer" abstract="true"
+        class="net.shibboleth.metadata.util.PathSegmentStringTransformer"/>
+
+    <bean id="mda.SHA1StringTransformer" abstract="true"
+        class="net.shibboleth.metadata.util.SHA1StringTransformer"/>
+
+    <!--
+        net.shibboleth.metadata.validate
+    -->
+
+    <bean id="mda.validator_parent" abstract="true" parent="mda.component_parent"/>
+
+    <!--
+        net.shibboleth.metadata.validate.x509
+    -->
+
+    <bean id="mda.X509RSAExponentValidator" abstract="true" parent="mda.validator_parent"
+        class="net.shibboleth.metadata.validate.x509.X509RSAExponentValidator"/>
+
+    <bean id="mda.X509RSAKeyLengthValidator" abstract="true" parent="mda.validator_parent"
+        class="net.shibboleth.metadata.validate.x509.X509RSAKeyLengthValidator"/>
+
+    <bean id="mda.X509RSAOpenSSLBlacklistValidator" abstract="true" parent="mda.validator_parent"
+        class="net.shibboleth.metadata.validate.x509.X509RSAOpenSSLBlacklistValidator"/>
+
+</beans>
diff --git a/mdx/test/beans.xml b/mdx/test/beans.xml
index 2795c95b..93c69d81 100644
--- a/mdx/test/beans.xml
+++ b/mdx/test/beans.xml
@@ -21,7 +21,7 @@
     <!--
         Fetch and process the entities as a collection.
     -->
-    <bean id="test_entities" parent="CompositeStage">
+    <bean id="test_entities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="test_aggregate"/>
diff --git a/mdx/test/verbs.xml b/mdx/test/verbs.xml
index f5f692df..6f332c87 100644
--- a/mdx/test/verbs.xml
+++ b/mdx/test/verbs.xml
@@ -30,7 +30,7 @@
         </property>
     </bean>
     
-    <bean id="import" parent="SimplePipeline">
+    <bean id="import" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="test_entities"/>
@@ -41,7 +41,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="SimplePipeline">
+    <bean id="importRaw" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="test_aggregate"/>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index e0f9e151..1ff7171b 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -87,8 +87,7 @@
         yet expired.  Sets a bound of 30 days on the validity interval; 14 days is the
         expected value.
     -->
-    <bean id="uk_check_validUntil" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.ValidateValidUntilStage">
+    <bean id="uk_check_validUntil" parent="mda.ValidateValidUntilStage">
         <!--
             The validUntil attribute must be present.
         -->
@@ -108,8 +107,7 @@
         Each fragment file contains a single EntityDescriptor.  The name of each
         eligible file matches a particular regular expression.
     -->
-    <bean id="uk_fetchFragmentFiles" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DOMFilesystemSourceStage">
+    <bean id="uk_fetchFragmentFiles" parent="mda.DOMFilesystemSourceStage">
         <property name="parserPool" ref="parserPool"/>
         <property name="source">
             <bean class="java.io.File">
@@ -165,7 +163,7 @@
         
         Adds "mailto:" to md:EmailAddress elements which don't already have it.
     -->
-    <bean id="uk_fix_mailto" parent="XSLTransformationStage"
+    <bean id="uk_fix_mailto" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:uk/fix_mailto.xsl"/>
     
     
@@ -174,7 +172,7 @@
         
         Checks specific to the UK registrar function.
     -->
-    <bean id="check_ukreg" parent="XSLValidationStage"
+    <bean id="check_ukreg" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:uk/check_ukreg.xsl"/>
     
     <!--
@@ -189,28 +187,28 @@
     <!--
         check_uk_keydesc_key
     -->
-    <bean id="check_uk_keydesc_key" parent="XSLValidationStage"
+    <bean id="check_uk_keydesc_key" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:uk/check_uk_keydesc_key.xsl"/>
 
 
     <!--
         check_uk_mdattr
     -->
-    <bean id="check_uk_mdattr" parent="XSLValidationStage"
+    <bean id="check_uk_mdattr" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:uk/check_uk_mdattr.xsl"/>
     
     
     <!--
         check_uk_mdrps
     -->
-    <bean id="check_uk_mdrps" parent="XSLValidationStage"
+    <bean id="check_uk_mdrps" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:uk/check_uk_mdrps.xsl"/>
     
     
     <!--
         check_uk_urlenc
     -->
-    <bean id="check_uk_urlenc" parent="XSLValidationStage"
+    <bean id="check_uk_urlenc" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:uk/check_uk_urlenc.xsl"/>
     
 
@@ -219,7 +217,7 @@
         
         This stage performs any standard cleanup required for UK federation fragment files.
     -->
-    <bean id="uk_processFragment" parent="XSLTransformationStage"
+    <bean id="uk_processFragment" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:uk/fragment.xsl"/>
     
     
@@ -228,8 +226,7 @@
         
         Remove any md:ContactPerson elements with contactType of "administrative".
     -->
-    <bean id="uk_stripAdminContacts" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.ContactPersonFilterStage">
+    <bean id="uk_stripAdminContacts" parent="mda.ContactPersonFilterStage">
         <property name="designatedTypes">
             <list>
                 <value>administrative</value>
@@ -251,8 +248,7 @@
         
         Name attribute is set to the federation URI.  UK ordering is applied.
     -->
-    <bean id="uk_assemble" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage">
+    <bean id="uk_assemble" parent="mda.EntitiesDescriptorAssemblerStage">
         <property name="descriptorName" ref="uk_federation_uri"/>
         <property name="itemOrderingStrategy">
             <bean class="uk.org.ukfederation.mda.UKEntityOrderingStrategy"/>
@@ -265,8 +261,7 @@
         
         Name attribute is not set.  UK ordering is applied.
     -->
-    <bean id="uk_assembleUnnamed" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage">
+    <bean id="uk_assembleUnnamed" parent="mda.EntitiesDescriptorAssemblerStage">
         <property name="itemOrderingStrategy">
             <bean class="uk.org.ukfederation.mda.UKEntityOrderingStrategy"/>
         </property>
@@ -276,7 +271,7 @@
     <!--
         Fetch and process the registered entities as a collection.
     -->
-    <bean id="uk_registeredEntities" parent="CompositeStage">
+    <bean id="uk_registeredEntities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="uk_fetchFragmentFiles"/>
@@ -286,7 +281,7 @@
                     Make all three potential scope lists equivalent (on the entity, on
                     the IDPSSODescriptor and on the AttributeAuthority).
                 -->
-                <bean id="scopes_copy" parent="XSLTransformationStage"
+                <bean id="scopes_copy" parent="mda.XSLTransformationStage"
                     p:XSLResource="classpath:uk/scopes_copy.xsl"/>
 
                 <!--
@@ -305,17 +300,17 @@
                     Add REFEDS Hide from Discovery category as a standardised
                     equivalent to our HideFromWAYF element.
                 -->
-                <bean id="uk_addHideFromDiscovery" parent="SplitMergeStage">
+                <bean id="uk_addHideFromDiscovery" parent="mda.SplitMergeStage">
                     <!-- select entities with HideFromWayf label -->
                     <property name="selectionStrategy">
-                        <bean parent="XPathItemSelectionStrategy">
+                        <bean parent="mda.XPathItemSelectionStrategy">
                             <constructor-arg value="/md:EntityDescriptor[md:Extensions/wayf:HideFromWAYF]"/>
                             <constructor-arg ref="commonNamespaces"/>
                         </bean>
                     </property>
                     
                     <property name="selectedItemPipeline">
-                        <bean id="selectedItemPipeline" parent="SimplePipeline">
+                        <bean id="selectedItemPipeline" parent="mda.SimplePipeline">
                             <property name="stages">
                                 <bean id="addHideFromDiscovery" parent="EntityAttributeAddingStage"
                                     p:attributeValue="http://refeds.org/category/hide-from-discovery"
@@ -328,7 +323,7 @@
                 
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK_std"/>
-                <bean id="check_ukfedlabel" parent="XSLValidationStage"
+                <bean id="check_ukfedlabel" parent="mda.XSLValidationStage"
                     p:XSLResource="classpath:uk/check_ukfedlabel.xsl"/>
                 <ref bean="check_ukreg"/>
                 <ref bean="check_owner"/>
@@ -340,14 +335,14 @@
                 <ref bean="mdui_dn_en_match"/>
                 <ref bean="check_dup_display"/>
                 
-                <bean id="checkCertificates" parent="X509ValidationStage">
+                <bean id="checkCertificates" parent="mda.X509ValidationStage">
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
-                            <bean parent="X509RSAKeyLengthValidator"
+                            <bean parent="mda.X509RSAKeyLengthValidator"
                                 p:warningBoundary="0" p:errorBoundary="2048"/>
                             <!-- Error on small RSA public exponents. -->
-                            <bean parent="X509RSAExponentValidator"/>
+                            <bean parent="mda.X509RSAExponentValidator"/>
                             <!-- Error on inconsistent subjectAltNames. -->
                             <bean parent="X509ConsistentNameValidator"/>
                             
@@ -381,7 +376,7 @@
         
         Strip those UK federation extensions which we never publish.
     -->
-    <bean id="uk_stripExtensions" parent="XSLTransformationStage"
+    <bean id="uk_stripExtensions" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:uk/strip_extensions.xsl"/>
     
 
@@ -400,7 +395,7 @@
         used in an XML document.  This one is UK-specific, as it makes specific choices
         in order to limit the number of prefixes used.
     -->
-    <bean id="uk_normaliseNamespaces" parent="XSLTransformationStage"
+    <bean id="uk_normaliseNamespaces" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:uk/ns_norm_uk.xsl"/>
     
     <!--
@@ -466,7 +461,7 @@
         
         Input is an aggregate of all registered entities, output is the HTML statistics.
     -->
-    <bean id="uk_generateStatistics" parent="XSLTransformationStage"
+    <bean id="uk_generateStatistics" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:uk/statistics.xsl">
         <property name="transformParameters">
             <map>
@@ -483,7 +478,7 @@
         resulting HTML output is written into the appropriate file in the production
         XML directory.
     -->
-    <bean id="uk_statisticsPipeline" parent="SimplePipeline">
+    <bean id="uk_statisticsPipeline" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="assemble"/>
@@ -504,7 +499,7 @@
     <!--
         Fetch the export entities as a collection.
     -->
-    <bean id="uk_exportedEntities" parent="CompositeStage">
+    <bean id="uk_exportedEntities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="uk_exportAggregate"/>
diff --git a/mdx/uk/collect.xml b/mdx/uk/collect.xml
index fa987eb6..e36eb0f3 100644
--- a/mdx/uk/collect.xml
+++ b/mdx/uk/collect.xml
@@ -30,7 +30,7 @@
         </property>
     </bean>
 
-    <bean id="collect" parent="SimplePipeline">
+    <bean id="collect" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 1d5af74d..b20d2305 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -43,7 +43,7 @@
         Remove entity-level Scope elements, leaving only the ones associated
         with role descriptors.    
     -->
-    <bean id="stripEntityScopes" parent="XSLTransformationStage"
+    <bean id="stripEntityScopes" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:uk/entity_scopes.xsl"/>
     
     <!--
@@ -52,7 +52,7 @@
         Template for a stage used in each output pipeline which performs
         final tweaks on the document.
     -->
-    <bean id="finalise_parent" abstract="true" parent="XSLTransformationStage"
+    <bean id="finalise_parent" abstract="true" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:uk/final_tweak.xsl">
         <property name="transformParameters">
             <map>
@@ -69,7 +69,7 @@
         export flows, for which we desire the closest possible correspondence to
         the registered metadata.
     -->
-    <bean id="checkPublishable" parent="CompositeStage">
+    <bean id="checkPublishable" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="checkSchemas"/>
@@ -92,7 +92,7 @@
     <!--
         Entity attribute matcher for the SIRTFI assurance certification.
     -->
-    <bean id="SIRTFI.entity.attribute.matcher" parent="MultiPredicateMatcher">
+    <bean id="SIRTFI.entity.attribute.matcher" parent="mda.MultiPredicateMatcher">
         <property name="nameFormatPredicate">
             <bean class="com.google.common.base.Predicates"
                 factory-method="equalTo"
@@ -116,24 +116,24 @@
     <!--
         Remove the REFEDS metadata namespace.
     -->
-    <bean id="strip.remd.namespace" parent="NamespaceStrippingStage"
+    <bean id="strip.remd.namespace" parent="mda.NamespaceStrippingStage"
         p:namespace-ref="remd_namespace"/>
 
     <!--
         Strip SIRTFI information.
     -->
-    <bean id="strip.SIRTFI" parent="CompositeStage">
+    <bean id="strip.SIRTFI" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <!-- remove REFEDS contacts associated with SIRTFI -->
-                <bean id="strip.SIRTFI.contacts" parent="XSLTransformationStage"
+                <bean id="strip.SIRTFI.contacts" parent="mda.XSLTransformationStage"
                     p:XSLResource="classpath:uk/strip_sirtfi_contacts.xsl"/>
 
                 <!-- remove the REFEDS metadata namespace -->
                 <ref bean="strip.remd.namespace"/>
 
                 <!-- remove the SIRTFI entity attribute -->
-                <bean id="entityAttributes" parent="EntityAttributeFilteringStage"
+                <bean id="entityAttributes" parent="mda.EntityAttributeFilteringStage"
                     p:whitelisting="false">
                     <property name="rules">
                         <list>
@@ -161,7 +161,7 @@
         from another registrar or metadata exchange as they may be
         old versions of entities we have deregistered, or spoofed.
     -->
-    <bean id="removeUKEntities" parent="EntityRegistrationAuthorityFilterStage">
+    <bean id="removeUKEntities" parent="mda.EntityRegistrationAuthorityFilterStage">
         <property name="designatedRegistrationAuthorities">
             <list>
                 <ref bean="uk_ukf_registrar"/>
@@ -176,8 +176,7 @@
         
         Filter out entities which are included in our global import blacklist.
     -->
-    <bean id="removeBlacklistedEntities" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntityFilterStage"
+    <bean id="removeBlacklistedEntities" parent="mda.EntityFilterStage"
         p:whitelistingEntities="false"
         p:designatedEntities-ref="importEntityBlacklist"/>
 
@@ -186,7 +185,7 @@
         
         Common actions to be performed on each import pipeline.
     -->
-    <bean id="importCommonTail" parent="CompositeStage">
+    <bean id="importCommonTail" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="removeUKEntities"/>
@@ -204,22 +203,22 @@
         </property>
     </bean>
 
-    <bean id="entityAttributes.blacklist" parent="EntityAttributeFilteringStage">
+    <bean id="entityAttributes.blacklist" parent="mda.EntityAttributeFilteringStage">
         <property name="whitelisting" value="false"/>
         <property name="rules">
             <list>
                 <!-- Deny "InCommon registration" attribute (duplicates mdrpi:registrationAuthority) -->
-                <bean parent="EntityCategoryMatcher"
+                <bean parent="mda.EntityCategoryMatcher"
                     c:category="http://id.incommon.org/category/registered-by-incommon"/>
 
                 <!-- Deny InCommon "supports InCommon R+S" attribute (duplicates REFEDS variant) -->
-                <bean parent="EntityCategorySupportMatcher"
+                <bean parent="mda.EntityCategorySupportMatcher"
                     c:category="http://id.incommon.org/category/research-and-scholarship"/>
             </list>
         </property>
     </bean>
 
-    <bean id="uk_int_edugain_importPipeline" parent="SimplePipeline">
+    <bean id="uk_int_edugain_importPipeline" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionEntities"/>
@@ -259,7 +258,7 @@
         </property>
     </bean>
 
-    <bean id="uk_productionPipeline" parent="SimplePipeline">
+    <bean id="uk_productionPipeline" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -296,7 +295,7 @@
     	   * identity providers, and
     	   * members of the "hide from discovery" entity category.
     -->
-    <bean id="uk_wayfSelector" parent="XPathItemSelectionStrategy">
+    <bean id="uk_wayfSelector" parent="mda.XPathItemSelectionStrategy">
         <constructor-arg value="/md:EntityDescriptor[not(md:IDPSSODescriptor and
             md:Extensions[mdattr:EntityAttributes/saml:Attribute
                 [@Name = 'http://macedir.org/entity-category']
@@ -314,7 +313,7 @@
         </property>
     </bean>
     
-    <bean id="uk_wayfPipeline" parent="SimplePipeline">
+    <bean id="uk_wayfPipeline" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -365,7 +364,7 @@
         normal metadata in order to do its job.  This stage
         removes everything it does not need.
     -->
-    <bean id="CDSStripUnwanted" parent="CompositeStage">
+    <bean id="CDSStripUnwanted" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="stripComments"/>
@@ -404,7 +403,7 @@
         </property>
     </bean>
     
-    <bean id="CDSNormaliseNamespaces" parent="XSLTransformationStage"
+    <bean id="CDSNormaliseNamespaces" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:uk/ns_norm_cds.xsl"/>
 
     <!--
@@ -419,7 +418,7 @@
         Entities in the CDSALL aggregate are restricted to those entities registered by the
         UK federation plus all identity providers from whatever source.
     -->
-    <bean id="CDSAllSelector" parent="XPathItemSelectionStrategy">
+    <bean id="CDSAllSelector" parent="mda.XPathItemSelectionStrategy">
         <constructor-arg value="/md:EntityDescriptor[md:IDPSSODescriptor or
             md:Extensions/mdrpi:RegistrationInfo/@registrationAuthority = 'http://ukfederation.org.uk']"/>
         <constructor-arg ref="commonNamespaces"/>
@@ -433,7 +432,7 @@
         </property>
     </bean>
     
-    <bean id="CDSAllPipeline" parent="SimplePipeline">
+    <bean id="CDSAllPipeline" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -484,7 +483,7 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseFallback" parent="XSLTransformationStage"
+    <bean id="uk_normaliseFallback" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:uk/ns_norm_back.xsl"/>
     
     <bean id="serializeUnsignedFallbackAggregate" parent="SerializationStage">
@@ -495,7 +494,7 @@
         </property>
     </bean>
     
-    <bean id="uk_fallbackPipeline" parent="SimplePipeline">
+    <bean id="uk_fallbackPipeline" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -536,7 +535,7 @@
         </property>
     </bean>
     
-    <bean id="uk_normaliseTest" parent="XSLTransformationStage"
+    <bean id="uk_normaliseTest" parent="mda.XSLTransformationStage"
         p:XSLResource="classpath:uk/ns_norm_test.xsl"/>
     
     <bean id="serializeUnsignedTestAggregate" parent="SerializationStage">
@@ -547,7 +546,7 @@
         </property>
     </bean>
     
-    <bean id="uk_testPipeline" parent="CompositeStage">
+    <bean id="uk_testPipeline" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <!--
@@ -587,7 +586,7 @@
         </property>
     </bean>
     
-    <bean id="uk_exportSelector" parent="XPathItemSelectionStrategy">
+    <bean id="uk_exportSelector" parent="mda.XPathItemSelectionStrategy">
         <constructor-arg value="/md:EntityDescriptor[not(md:Extensions/ukfedlabel:ExportOptOut)]"/>
         <constructor-arg ref="commonNamespaces"/>
     </bean>
@@ -600,7 +599,7 @@
         </property>
     </bean>
     
-    <bean id="uk_exportPipeline" parent="SimplePipeline">
+    <bean id="uk_exportPipeline" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -612,11 +611,11 @@
                     have the ExportOptIn label: in other words, a rule in this section
                     can always be overridden by an explicit ExportOptIn.
                 -->
-                <bean id="exclusion" parent="SplitMergeStage">
+                <bean id="exclusion" parent="mda.SplitMergeStage">
                     
                     <!-- select entities with ExportOptIn label -->
                     <property name="selectionStrategy">
-                        <bean parent="XPathItemSelectionStrategy">
+                        <bean parent="mda.XPathItemSelectionStrategy">
                             <constructor-arg value="/md:EntityDescriptor[md:Extensions/ukfedlabel:ExportOptIn]"/>
                             <constructor-arg ref="commonNamespaces"/>
                         </bean>
@@ -627,7 +626,7 @@
                         matching specific rules.
                     -->
                     <property name="nonselectedItemPipeline">
-                        <bean id="nonSelectedItemPipeline" parent="SimplePipeline">
+                        <bean id="nonSelectedItemPipeline" parent="mda.SimplePipeline">
                             <property name="stages">
                                 <list>
                                     
@@ -650,7 +649,7 @@
                                     <bean id="syntheticScopes" parent="XPathFilteringStage"
                                         p:XPathExpression="//shibmd:Scope[contains(., '.eng.ukfederation.org.uk')]"/>
                                     <!-- Specific providers not caught by the previous condition -->
-                                    <bean id="GlowScotland" parent="EntityFilterStage">
+                                    <bean id="GlowScotland" parent="mda.EntityFilterStage">
                                         <property name="designatedEntities">
                                             <set>
                                                 <value>https://idp.glowscotland.org.uk/shibboleth</value>
@@ -680,7 +679,7 @@
                 <ref bean="stripEmptyExtensions"/>
                 <ref bean="uk_finaliseExport"/>
 
-                <bean id="uk_normaliseExport" parent="XSLTransformationStage"
+                <bean id="uk_normaliseExport" parent="mda.XSLTransformationStage"
                     p:XSLResource="classpath:uk/ns_norm_export.xsl"/>
 
                 <!--
@@ -707,12 +706,12 @@
         ***********************************************************
     -->
     
-    <bean id="uk_exportPreviewSelector" parent="XPathItemSelectionStrategy">
+    <bean id="uk_exportPreviewSelector" parent="mda.XPathItemSelectionStrategy">
         <constructor-arg value="/md:EntityDescriptor[not(md:Extensions/ukfedlabel:ExportOptOut)]"/>
         <constructor-arg ref="commonNamespaces"/>
     </bean>
     
-    <bean id="uk_exportPreviewPipeline" parent="SimplePipeline">
+    <bean id="uk_exportPreviewPipeline" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -724,11 +723,11 @@
                     have the ExportOptIn label: in other words, a rule in this section
                     can always be overridden by an explicit ExportOptIn.
                 -->
-                <bean id="exclusion" parent="SplitMergeStage">
+                <bean id="exclusion" parent="mda.SplitMergeStage">
 
                     <!-- select entities with ExportOptIn label -->
                     <property name="selectionStrategy">
-                        <bean parent="XPathItemSelectionStrategy">
+                        <bean parent="mda.XPathItemSelectionStrategy">
                             <constructor-arg value="/md:EntityDescriptor[md:Extensions/ukfedlabel:ExportOptIn]"/>
                             <constructor-arg ref="commonNamespaces"/>
                         </bean>
@@ -739,7 +738,7 @@
                         matching specific rules.
                     -->
                     <property name="nonselectedItemPipeline">
-                        <bean id="nonSelectedItemPipeline" parent="SimplePipeline">
+                        <bean id="nonSelectedItemPipeline" parent="mda.SimplePipeline">
                             <property name="stages">
                                 <list>
 
@@ -762,7 +761,7 @@
                                     <bean id="syntheticScopes" parent="XPathFilteringStage"
                                         p:XPathExpression="//shibmd:Scope[contains(., '.eng.ukfederation.org.uk')]"/>
                                     <!-- Specific providers not caught by the previous condition -->
-                                    <bean id="GlowScotland" parent="EntityFilterStage">
+                                    <bean id="GlowScotland" parent="mda.EntityFilterStage">
                                         <property name="designatedEntities">
                                             <set>
                                                 <value>https://idp.glowscotland.org.uk/shibboleth</value>
@@ -792,7 +791,7 @@
                 <ref bean="stripEmptyExtensions"/>
                 <ref bean="uk_finaliseExport"/>
 
-                <bean id="uk_normaliseExportPreview" parent="XSLTransformationStage"
+                <bean id="uk_normaliseExportPreview" parent="mda.XSLTransformationStage"
                     p:XSLResource="classpath:uk/ns_norm_export_preview.xsl"/>
 
                 <!--
@@ -827,7 +826,7 @@
         *************************************
     -->
     
-    <bean id="generate" parent="SimplePipeline">
+    <bean id="generate" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <!--
diff --git a/mdx/uk/mdq-multisign.xml b/mdx/uk/mdq-multisign.xml
index 443f09a8..1643d6a6 100644
--- a/mdx/uk/mdq-multisign.xml
+++ b/mdx/uk/mdq-multisign.xml
@@ -38,7 +38,7 @@
     <!--
         Generate per-entity metadata.
     -->
-    <bean id="mdq-multisign" parent="SimplePipeline">
+    <bean id="mdq-multisign" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -57,16 +57,16 @@
                 <ref bean="populateItemIds"/>
 
                 <!-- Set ID, cacheDuration and validUntil attributes. -->
-                <bean parent="GenerateIdStage"/>
-                <bean parent="SetCacheDurationStage" p:cacheDuration="PT6H"/>
-                <bean parent="SetValidUntilStage" p:validityDuration="P14D"/>
+                <bean parent="mda.GenerateIdStage"/>
+                <bean parent="mda.SetCacheDurationStage" p:cacheDuration="PT6H"/>
+                <bean parent="mda.SetValidUntilStage" p:validityDuration="P14D"/>
 
                 <!-- Identity transform fixes signing issues. -->
-                <bean parent="XSLTransformationStage"
+                <bean parent="mda.XSLTransformationStage"
                     p:XSLResource="classpath:identity.xsl"/>
 
                 <!-- Sign each item. -->
-                <bean id="perform.signature" parent="XMLSignatureSigningStage">
+                <bean id="perform.signature" parent="mda.XMLSignatureSigningStage">
                     <property name="privateKey">
                         <bean parent="PKCS11PrivateKeyFactoryBean"
                             p:pkcs11Config="${sign.pkcs11Config}"
@@ -79,12 +79,12 @@
                 <!-- Write individual entity documents to files. -->
                 <bean id="write.perentity" parent="MultiOutputSerializationStage">
                     <property name="outputStrategy">
-                        <bean parent="FilesInDirectoryMultiOutputStrategy" p:nameSuffix=".xml">
+                        <bean parent="mda.FilesInDirectoryMultiOutputStrategy" p:nameSuffix=".xml">
                             <property name="directory">
                                 <bean class="java.io.File" c:_="${mdq.output}"/>
                             </property>
                             <property name="nameTransformer">
-                                <bean parent="PathSegmentStringTransformer"/>
+                                <bean parent="mda.PathSegmentStringTransformer"/>
                             </property>
                         </bean>
                     </property>
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 7941a6ad..51b93a15 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -35,7 +35,7 @@
         
         Stand-alone statistics generation.
     -->
-    <bean id="statistics" parent="SimplePipeline">
+    <bean id="statistics" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
@@ -51,12 +51,12 @@
         
         Stand-along statistics generation for charting.
     -->
-    <bean id="statistics.charting" parent="SimplePipeline">
+    <bean id="statistics.charting" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
                 <ref bean="assemble"/>
-                <bean parent="XSLTransformationStage"
+                <bean parent="mda.XSLTransformationStage"
                     p:XSLResource="classpath:uk/statistics-charting.xsl">
                     <property name="transformParameters">
                         <map>
@@ -81,12 +81,12 @@
         Generates a page of links to discovery services, for each SP that
         has mdui:uiinfo metadata.
     -->
-    <bean id="sp_mdui_test" parent="SimplePipeline">
+    <bean id="sp_mdui_test" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
                 <ref bean="assemble"/>
-                <bean id="process" parent="XSLTransformationStage"
+                <bean id="process" parent="mda.XSLTransformationStage"
                     p:XSLResource="classpath:uk/sp_mdui_test.xsl"/>
                 <bean id="serialize" parent="SerializationStage">
                     <property name="outputFile">
@@ -107,7 +107,7 @@
         ***********************
     -->
     
-    <bean id="verify" parent="SimplePipeline">
+    <bean id="verify" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <!--
@@ -138,7 +138,7 @@
         *********************************
     -->
     
-    <bean id="checkPorts" parent="SimplePipeline">
+    <bean id="checkPorts" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
@@ -170,7 +170,7 @@
         ***********************************
     -->
     
-    <bean id="checkFuture" parent="SimplePipeline">
+    <bean id="checkFuture" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_registeredEntities"/>
@@ -192,7 +192,7 @@
                     Additional X.509 certificate checks, over and above those
                     performed in uk_registeredEntities.
                 -->
-                <bean id="checkCertificates" parent="X509ValidationStage">
+                <bean id="checkCertificates" parent="mda.X509ValidationStage">
                     <property name="validators">
                         <list>
                             <!-- none at present -->
@@ -248,7 +248,7 @@
         
         For now, just the head of that pipeline.
     -->
-    <bean id="import.metadata" parent="SimplePipeline">
+    <bean id="import.metadata" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <!-- fetch the input file -->
@@ -263,11 +263,11 @@
                 <ref bean="uk_fix_mailto"/>
                 
                 <!-- transform into a fragment using our local conventions -->
-                <bean id="importTransform" parent="XSLTransformationStage"
+                <bean id="importTransform" parent="mda.XSLTransformationStage"
                     p:XSLResource="classpath:uk/import.xsl"/>
                 
                 <!-- normalise namespaces in a specific way -->
-                <bean id="normalizeFragment" parent="XSLTransformationStage"
+                <bean id="normalizeFragment" parent="mda.XSLTransformationStage"
                     p:XSLResource="classpath:uk/ns_norm_fragment.xsl"/>
                 
                 <!-- check the transformed input -->
@@ -302,14 +302,14 @@
                 <ref bean="check_sp_tls"/>
                 <ref bean="check_uk_trust"/>
                 
-                <bean id="checkCertificates" parent="X509ValidationStage">
+                <bean id="checkCertificates" parent="mda.X509ValidationStage">
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
-                            <bean parent="X509RSAKeyLengthValidator"
+                            <bean parent="mda.X509RSAKeyLengthValidator"
                                 p:warningBoundary="0" p:errorBoundary="2048"/>
                             <!-- Error on small RSA public exponents. -->
-                            <bean parent="X509RSAExponentValidator"/>
+                            <bean parent="mda.X509RSAExponentValidator"/>
                             <!-- Error on inconsistent subjectAltNames. -->
                             <bean parent="X509ConsistentNameValidator"/>
 
@@ -360,7 +360,7 @@
         </property>
     </bean>
     
-    <bean id="importExported" parent="SimplePipeline">
+    <bean id="importExported" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_exportedEntities"/>
@@ -371,7 +371,7 @@
         </property>
     </bean>
     
-    <bean id="importExportedRaw" parent="SimplePipeline">
+    <bean id="importExportedRaw" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="uk_exportAggregate"/>
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index 749202da..58cfa539 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -84,7 +84,7 @@
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="us_incommon_productionEntities" parent="CompositeStage">
+    <bean id="us_incommon_productionEntities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="us_incommon_productionAggregate"/>
@@ -106,7 +106,7 @@
     <!--
         Synthesise an export collection by filtering the production entities.
     -->
-    <bean id="us_incommon_exportedEntities" parent="CompositeStage">
+    <bean id="us_incommon_exportedEntities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="us_incommon_productionAggregate"/>
@@ -133,8 +133,7 @@
                 <!--
                     Filter out all entities not involved in the pilot.
                 -->
-                <bean id="us_incommon_pilot_filterEntities" parent="stage_parent"
-                    class="net.shibboleth.metadata.dom.saml.EntityFilterStage"
+                <bean id="us_incommon_pilot_filterEntities" parent="mda.EntityFilterStage"
                     p:whitelistingEntities="true">
                     <property name="designatedEntities">
                         <set>
@@ -147,8 +146,7 @@
                 <!--
                     Remove all contact information.
                 -->
-                <bean id="us_incommon_remove_contacts" parent="stage_parent"
-                    class="net.shibboleth.metadata.dom.saml.ContactPersonFilterStage"
+                <bean id="us_incommon_remove_contacts" parent="mda.ContactPersonFilterStage"
                     p:whitelistingTypes="true">
                     <property name="designatedTypes">
                         <set>
@@ -175,7 +173,7 @@
     <!--
         Fake an export aggregate by aggregating the exported entities.
     -->
-    <bean id="us_incommon_exportedAggregate" parent="CompositeStage">
+    <bean id="us_incommon_exportedAggregate" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="us_incommon_exportedEntities"/>
diff --git a/mdx/us_incommon/verbs.xml b/mdx/us_incommon/verbs.xml
index 6ca5a631..32b7d3df 100644
--- a/mdx/us_incommon/verbs.xml
+++ b/mdx/us_incommon/verbs.xml
@@ -33,7 +33,7 @@
         </property>
     </bean>
     
-    <bean id="importProduction" parent="SimplePipeline">
+    <bean id="importProduction" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="us_incommon_productionEntities"/>
@@ -44,7 +44,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="SimplePipeline">
+    <bean id="importProductionRaw" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="us_incommon_productionAggregate"/>
@@ -53,7 +53,7 @@
         </property>
     </bean>
     
-    <bean id="importExported" parent="SimplePipeline">
+    <bean id="importExported" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="us_incommon_exportedEntities"/>
@@ -64,7 +64,7 @@
         </property>
     </bean>
     
-    <bean id="importExportedRaw" parent="SimplePipeline">
+    <bean id="importExportedRaw" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="us_incommon_exportedAggregate"/>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index d59f8ca9..3076a5c4 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -37,61 +37,61 @@
     <!--
         check_future_0
     -->
-    <bean id="check_future_0" parent="XSLValidationStage"
+    <bean id="check_future_0" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_future_0.xsl"/>
     
     <!--
         check_future_1
     -->
-    <bean id="check_future_1" parent="XSLValidationStage"
+    <bean id="check_future_1" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_future_1.xsl"/>
     
     <!--
         check_future_2
     -->
-    <bean id="check_future_2" parent="XSLValidationStage"
+    <bean id="check_future_2" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_future_2.xsl"/>
     
     <!--
         check_future_3
     -->
-    <bean id="check_future_3" parent="XSLValidationStage"
+    <bean id="check_future_3" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_future_3.xsl"/>
     
     <!--
         check_future_4
     -->
-    <bean id="check_future_4" parent="XSLValidationStage"
+    <bean id="check_future_4" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_future_4.xsl"/>
     
     <!--
         check_future_5
     -->
-    <bean id="check_future_5" parent="XSLValidationStage"
+    <bean id="check_future_5" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_future_5.xsl"/>
     
     <!--
         check_future_6
     -->
-    <bean id="check_future_6" parent="XSLValidationStage"
+    <bean id="check_future_6" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_future_6.xsl"/>
     
     <!--
         check_future_7
     -->
-    <bean id="check_future_7" parent="XSLValidationStage"
+    <bean id="check_future_7" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_future_7.xsl"/>
     
     <!--
         check_future_8
     -->
-    <bean id="check_future_8" parent="XSLValidationStage"
+    <bean id="check_future_8" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_future_8.xsl"/>
     
     <!--
         check_future_9
     -->
-    <bean id="check_future_9" parent="XSLValidationStage"
+    <bean id="check_future_9" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_future_9.xsl"/>
     
     <!--
@@ -99,7 +99,7 @@
         
         Combines all check_future_N stages.
     -->
-    <bean id="check_future" parent="CompositeStage">
+    <bean id="check_future" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="check_future_0"/>
@@ -128,7 +128,7 @@
     <!--
         check_algsupport
     -->
-    <bean id="check_algsupport" parent="XSLValidationStage"
+    <bean id="check_algsupport" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_algsupport.xsl"/>
 
 
@@ -143,7 +143,7 @@
     <!--
         check_mdattr
     -->
-    <bean id="check_mdattr" parent="XSLValidationStage"
+    <bean id="check_mdattr" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_mdattr.xsl"/>
 
     
@@ -160,7 +160,7 @@
         
         Miscellaneous MDRPI tests, in XSLT.
     -->
-    <bean id="check_mdrpi_xslt" parent="XSLValidationStage"
+    <bean id="check_mdrpi_xslt" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_mdrpi.xsl"/>
     
     <!--
@@ -168,7 +168,7 @@
         
         Composite check for the MDRPI specification.
     -->
-    <bean id="check_mdrpi" parent="CompositeStage">
+    <bean id="check_mdrpi" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="check_mdrpi_xslt"/>
@@ -184,7 +184,7 @@
         Any registrationAuthority already present on an entity in this
         channel must match the known registration authority value.
     -->
-    <bean id="check_regauth_parent" abstract="true" parent="XSLValidationStage"
+    <bean id="check_regauth_parent" abstract="true" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_regauth.xsl"/>
     
     <!--
@@ -192,7 +192,7 @@
         
         Check that each entity has an mdrpi:RegistrationInfo element.
     -->
-    <bean id="check_hasreginfo" parent="XSLValidationStage"
+    <bean id="check_hasreginfo" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_hasreginfo.xsl"/>
 
     
@@ -218,7 +218,7 @@
         
         Miscellaneous MDUI tests, in XSLT.
     -->
-    <bean id="check_mdui_xslt" parent="XSLValidationStage"
+    <bean id="check_mdui_xslt" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_mdui.xsl"/>
     
     <!--
@@ -229,7 +229,7 @@
         
         UKFTS 1.4 section 3.3
     -->
-    <bean id="mdui_dn_en_match" parent="XSLValidationStage"
+    <bean id="mdui_dn_en_match" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/mdui_dn_en_match.xsl"/>
     
     <!--
@@ -238,7 +238,7 @@
         If an entity has mdui:UIInfo, then that must include at least an
         mdui:DisplayName with an English name.
     -->
-    <bean id="mdui_dn_en_present" parent="XSLValidationStage"
+    <bean id="mdui_dn_en_present" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/mdui_dn_en_present.xsl"/>
     
     <!--
@@ -252,7 +252,7 @@
             mdui_dn_en_present
             mdui_dn_en_match
     -->
-    <bean id="check_mdui" parent="CompositeStage">
+    <bean id="check_mdui" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="check_mdui_iphint"/>
@@ -273,7 +273,7 @@
     <!--
         check_incmd
     -->
-    <bean id="check_incmd" parent="XSLValidationStage"
+    <bean id="check_incmd" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_incmd.xsl"/>
 
     
@@ -285,13 +285,13 @@
         ***********************************************************
     -->
 
-    <bean id="check_rands_member" parent="XSLValidationStage"
+    <bean id="check_rands_member" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_rands_member.xsl"/>
 
-    <bean id="check_rands_support" parent="XSLValidationStage"
+    <bean id="check_rands_support" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_rands_support.xsl"/>
 
-    <bean id="check_rands" parent="CompositeStage">
+    <bean id="check_rands" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="check_rands_member"/>
@@ -315,7 +315,7 @@
         Check for regular expressions in Shibboleth Scope elements.  Applied very selectively,
         because we do permit this in certain circumstances.
     -->
-    <bean id="check_shib_regscope" parent="XSLValidationStage"
+    <bean id="check_shib_regscope" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_shib_regscope.xsl"/>
 
     <!--
@@ -325,13 +325,13 @@
         problems with signature generation and validation because the schema includes
         a default value.
     -->
-    <bean id="check_shib_noregscope" parent="XSLValidationStage"
+    <bean id="check_shib_noregscope" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_shib_noregscope.xsl"/>
 
     <!--
         check_shibboleth
     -->
-    <bean id="check_shibboleth" parent="XSLValidationStage"
+    <bean id="check_shibboleth" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_shibboleth.xsl"/>
 
 
@@ -346,7 +346,7 @@
     <!--
         check_sirtfi
     -->
-    <bean id="check_sirtfi" parent="XSLValidationStage"
+    <bean id="check_sirtfi" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_sirtfi.xsl"/>
 
 
@@ -361,19 +361,19 @@
     <!--
         check_uk_algorithms
     -->
-    <bean id="check_uk_algorithms" parent="XSLValidationStage"
+    <bean id="check_uk_algorithms" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_uk_algorithms.xsl"/>
     
     <!--
         check_uk_trust
     -->
-    <bean id="check_uk_trust" parent="XSLValidationStage"
+    <bean id="check_uk_trust" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_uk_trust.xsl"/>
     
     <!--
         check_uk_wayf
     -->
-    <bean id="check_uk_wayf" parent="XSLValidationStage"
+    <bean id="check_uk_wayf" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_uk_wayf.xsl"/>
 
 
@@ -397,7 +397,7 @@
         
         It is assumed that the entities are wrapped in a single EntitiesDescriptor.
     -->
-    <bean id="check_aggregate" parent="XSLValidationStage"
+    <bean id="check_aggregate" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_aggregate.xsl"/>
     
     <!--
@@ -425,15 +425,15 @@
         Debian weak key blacklists.
     -->
 
-    <bean id="debian.1024" parent="X509RSAOpenSSLBlacklistValidator"
+    <bean id="debian.1024" parent="mda.X509RSAOpenSSLBlacklistValidator"
         p:keySize="1024"
         p:blacklistResource="classpath:net/shibboleth/metadata/validate/x509/debian-1024.txt"/>
 
-    <bean id="debian.2048" parent="X509RSAOpenSSLBlacklistValidator"
+    <bean id="debian.2048" parent="mda.X509RSAOpenSSLBlacklistValidator"
         p:keySize="2048"
         p:blacklistResource="classpath:net/shibboleth/metadata/validate/x509/debian-2048.txt"/>
 
-    <bean id="debian.4096" parent="X509RSAOpenSSLBlacklistValidator"
+    <bean id="debian.4096" parent="mda.X509RSAOpenSSLBlacklistValidator"
         p:keySize="4096"
         p:blacklistResource="classpath:net/shibboleth/metadata/validate/x509/debian-4096.txt"/>
 
@@ -441,7 +441,7 @@
         Blacklist of known compromised 1024-bit keys, e.g., "dummy" keys shipped with
         SAML products that are sometimes deployed by accident.
     -->
-    <bean id="compromised.1024" parent="X509RSAOpenSSLBlacklistValidator"
+    <bean id="compromised.1024" parent="mda.X509RSAOpenSSLBlacklistValidator"
         p:keySize="1024"
         p:blacklistResource="classpath:net/shibboleth/metadata/validate/x509/compromised-1024.txt"/>
 
@@ -449,7 +449,7 @@
         Blacklist of known compromised 2048-bit keys, e.g., "dummy" keys shipped with
         SAML products that are sometimes deployed by accident.
     -->
-    <bean id="compromised.2048" parent="X509RSAOpenSSLBlacklistValidator"
+    <bean id="compromised.2048" parent="mda.X509RSAOpenSSLBlacklistValidator"
         p:keySize="2048"
         p:blacklistResource="classpath:net/shibboleth/metadata/validate/x509/compromised-2048.txt"/>
 
@@ -465,49 +465,49 @@
     <!--
         check_adfs
     -->
-    <bean id="check_adfs" parent="XSLValidationStage"
+    <bean id="check_adfs" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_adfs.xsl"/>
     
     <!--
         check_bindings
     -->
-    <bean id="check_bindings" parent="XSLValidationStage"
+    <bean id="check_bindings" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_bindings.xsl"/>
     
     <!--
         check_filtered
     -->
-    <bean id="check_filtered" parent="XSLValidationStage"
+    <bean id="check_filtered" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_filtered.xsl"/>
     
     <!--
         check_hoksso
     -->
-    <bean id="check_hoksso" parent="XSLValidationStage"
+    <bean id="check_hoksso" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_hoksso.xsl"/>
         
     <!--
         check_idpdisc
     -->
-    <bean id="check_idpdisc" parent="XSLValidationStage"
+    <bean id="check_idpdisc" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_idpdisc.xsl"/>
     
     <!--
         check_imported
     -->
-    <bean id="check_imported" parent="XSLValidationStage"
+    <bean id="check_imported" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_imported.xsl"/>
     
     <!--
         check_init
     -->
-    <bean id="check_init" parent="XSLValidationStage"
+    <bean id="check_init" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_init.xsl"/>
     
     <!--
         check_mdiop
     -->
-    <bean id="check_mdiop" parent="XSLValidationStage"
+    <bean id="check_mdiop" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_mdiop.xsl"/>
 
     <!--
@@ -516,66 +516,66 @@
         Check for the presence of CR characters in text content or attribute values.
         This protects against SSPCPP-684 in the Shibboleth SP.
     -->
-    <bean id="check_cr" parent="CRDetectionStage"/>
+    <bean id="check_cr" parent="mda.CRDetectionStage"/>
 
     <!--
         check_entityid_prefix
     -->
-    <bean id="check_entityid_prefix" parent="XSLValidationStage"
+    <bean id="check_entityid_prefix" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_entityid_prefix.xsl"/>
 
     <!--
         check_idp_tls
     -->
-    <bean id="check_idp_tls" parent="XSLValidationStage"
+    <bean id="check_idp_tls" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_idp_tls.xsl"/>
 
     <!--
         check_sp_tls
     -->
-    <bean id="check_sp_tls" parent="XSLValidationStage"
+    <bean id="check_sp_tls" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_sp_tls.xsl"/>
 
     <!--
         check_misc
     -->
-    <bean id="check_misc" parent="XSLValidationStage"
+    <bean id="check_misc" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_misc.xsl"/>
     
     <!--
         check_namespaces
     -->
-    <bean id="check_namespaces" parent="XSLValidationStage"
+    <bean id="check_namespaces" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_namespaces.xsl"/>
     
     <!--
         check_reqattr
     -->
-    <bean id="check_reqattr" parent="XSLValidationStage"
+    <bean id="check_reqattr" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_reqattr.xsl"/>
     
     <!--
         check_saml2int
     -->
-    <bean id="check_saml2int" parent="XSLValidationStage"
+    <bean id="check_saml2int" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_saml2int.xsl"/>
 
     <!--
         check_saml1
     -->
-    <bean id="check_saml1" parent="XSLValidationStage"
+    <bean id="check_saml1" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_saml1.xsl"/>
     
     <!--
         check_saml2
     -->
-    <bean id="check_saml2" parent="XSLValidationStage"
+    <bean id="check_saml2" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_saml2.xsl"/>
     
     <!--
         check_saml2meta
     -->
-    <bean id="check_saml2meta" parent="XSLValidationStage"
+    <bean id="check_saml2meta" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_saml2meta.xsl"/>
     
     <!--
@@ -611,15 +611,14 @@
         Check that an aggregate has a validUntil instant specified, and that it has not
         yet expired.  Does not put an upper bound on validUntil intervals.
     -->
-    <bean id="check_validUntil" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.saml.ValidateValidUntilStage">
+    <bean id="check_validUntil" parent="mda.ValidateValidUntilStage">
         <!--
             The validUntil attribute must be present.
         -->
         <property name="requireValidUntil" value="true"/>
         <!--
             Do not constrain the validity interval in this general stage.
-            Constrain in necessary on a per-channel basis.
+            Constrain if necessary on a per-channel basis.
         -->
         <property name="maxValidityInterval" value="0"/>
     </bean>
@@ -627,7 +626,7 @@
     <!--
         check_vhosts
     -->
-    <bean id="check_vhosts" parent="XSLValidationStage"
+    <bean id="check_vhosts" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_vhosts.xsl"/>
 
 
@@ -642,7 +641,7 @@
     <!--
         CHECK_std
     -->
-    <bean id="CHECK_std" parent="CompositeStage">
+    <bean id="CHECK_std" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="check_adfs"/>