From f1fbf442cb4c6d48b53df7bb4ef9dc94495011d1 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 15 Jan 2018 15:10:12 +0000
Subject: [PATCH] Consolidate ODN-to-MDUI processing

Now that this is being done everywhere, we can just do it once, and simplify the way it's done.
See ukf/ukf-meta#150.
---
 mdx/uk/generate.xml | 85 +++++----------------------------------------
 1 file changed, 9 insertions(+), 76 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index f7ce2f7c..459f39d2 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -112,46 +112,6 @@
     </bean>
 
 
-    <!--
-        *************************************
-        ***                               ***
-        ***   M D U I   H A N D L I N G   ***
-        ***                               ***
-        *************************************
-    -->
-
-
-    <!--
-        odn_to_mdui
-
-        Ensure that all UKf-registered identity providers have
-        mdui:DisplayName and mdui:Description elements.
-    -->
-    <bean id="odn_to_mdui" parent="mda.SplitMergeStage">
-
-        <!-- Select UKf-registered entities only. -->
-        <property name="selectionStrategy">
-            <bean parent="mda.XPathItemSelectionStrategy"
-                c:_0 = "/md:EntityDescriptor/md:Extensions/mdrpi:RegistrationInfo/@registrationAuthority =
-                    'http://ukfederation.org.uk'"
-                c:_1-ref="commonNamespaces"
-            />
-        </property>
-
-        <!-- Process selected entities. -->
-        <property name="selectedItemPipeline">
-            <bean parent="mda.SimplePipeline">
-                <property name="stages">
-                    <list>
-                        <bean parent="mda.XSLTransformationStage"
-                            p:XSLResource="classpath:uk/odn_to_mdui.xsl"/>
-                    </list>
-                </property>
-            </bean>
-        </property>
-    </bean>
-
-
     <!--
         *****************************************
         ***                                   ***
@@ -334,12 +294,6 @@
     <bean id="uk_productionPipeline" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
-                <!--
-                    Ensure that all UKf-registered identity providers have
-                    mdui:DisplayName elements.
-                -->
-                <ref bean="odn_to_mdui"/>
-
                 <!--
                     Enforce IdP display name uniqueness before assembling aggregate
                 -->
@@ -400,12 +354,6 @@
                 -->
                 <ref bean="strip.SIRTFI"/>
 
-                <!--
-                    Ensure that all UKf-registered identity providers have
-                    mdui:DisplayName and mdui:Description elements.
-                -->
-                <ref bean="odn_to_mdui"/>
-
                 <!--
                     Enforce IdP display name uniqueness before assembling aggregate
                 -->
@@ -585,12 +533,6 @@
     <bean id="uk_fallbackPipeline" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
-                <!--
-                    Ensure that all UKf-registered identity providers have
-                    mdui:DisplayName elements.
-                -->
-                <ref bean="odn_to_mdui"/>
-
                 <!--
                     Enforce IdP display name uniqueness before assembling aggregate
                 -->
@@ -768,12 +710,6 @@
                     </property>
                 </bean>
 
-                <!--
-                    Ensure that all UKf-registered identity providers have
-                    mdui:DisplayName and mdui:Description elements.
-                -->
-                <ref bean="odn_to_mdui"/>
-
                 <!--
                     Enforce IdP display name uniqueness before assembling aggregate
                 -->
@@ -889,12 +825,6 @@
                     </property>
                 </bean>
 
-                <!--
-                    Ensure that all UKf-registered identity providers have
-                    mdui:DisplayName and mdui:Description elements.
-                -->
-                <ref bean="odn_to_mdui"/>
-
                 <!--
                     Enforce IdP display name uniqueness before assembling aggregate
                 -->
@@ -986,6 +916,15 @@
                 <ref bean="uk_stripAdminContacts"/>
                 <ref bean="stripEmptyExtensions"/>
 
+                <!--
+                    odn_to_mdui
+
+                    Ensure that beyond this point, all UKf-registered identity providers
+                    have mdui:DisplayName and mdui:Description elements.
+                -->
+                <bean id="odn_to_mdui" parent="mda.XSLTransformationStage"
+                    p:XSLResource="classpath:uk/odn_to_mdui.xsl"/>
+
                 <!--
                     ***********************************************
                     ***                                         ***
@@ -1123,12 +1062,6 @@
                     and pre-production-status MDX relationships.
                 -->
 
-                <!--
-                    Ensure that beyond this point, UKf-registered identity providers
-                    have mdui:DisplayName and mdui:Description elements.
-                -->
-                <ref bean="odn_to_mdui"/>
-
                 <!--
                     Fork into new pipelines for additional aggregates.
                 -->