From d42223db47433d0ac7a91d16a11b14056f0af188 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 5 Dec 2017 15:08:19 +0000
Subject: [PATCH] Populate UKf MDUI DisplayName,Description in production, wayf
 and export aggregates

See ukf/ukf-meta#21.
See ukf/ukf-meta#150.
---
 mdx/uk/README.md    | 29 +++++++++++++++--------------
 mdx/uk/generate.xml | 40 ++++++++++++++++++++++++++--------------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/mdx/uk/README.md b/mdx/uk/README.md
index 4d4491f2..1cb3bfc2 100644
--- a/mdx/uk/README.md
+++ b/mdx/uk/README.md
@@ -28,11 +28,9 @@ before being included in the `export` version consumed by interfederation partne
 
 ### Export Preview Aggregate vs. Export Aggregate
 
-Status (2017-10-25):
+Status (2017-12-05):
 
-* The export preview aggregate ensures that all UKf-registered identity providers have `mdui:DisplayName`
-metadata by copying data from `md:OrganizationDisplayName` if required. The copying process also
-generates `mdui:Description` elements with the same content.
+* These aggregates are currently identical.
 
 ## Production Maturity Pipeline
 
@@ -61,22 +59,25 @@ when it appeared in the fallback aggregate, which would be too late to take corr
 
 ### Test Aggregate vs. Production Aggregate
 
-Status (2017-10-25):
+Status (2017-12-05):
+
+* The `test` aggregate does not include the `<UKFederationMember>` label (`ukf-meta#34`).
 
-* The test aggregate ensures that all UKf-registered identity providers have `mdui:DisplayName`
-metadata by copying data from `md:OrganizationDisplayName` if required. The copying process also
-generates `mdui:Description` elements with the same content.
+* The `test` aggregate does not include the entity-level copy of the scopes for an
+  identity provider (`ukf-meta#49`) 
 
 ### `cds-all` Aggregate vs. Production Aggregate
 
-Status (2017-11-22):
+Status (2017-12-05):
 
-* The `cds-all` aggregate ensures that all UKf-registered identity providers have `mdui:DisplayName`
-  metadata by copying data from `md:OrganizationDisplayName` if required. The copying process also
-  generates `mdui:Description` elements with the same content.
+* The `cdsall` aggregate omits many elements not necessary for the generation of a discovery feed.
+
+* Otherwise, these aggregates are currently identical.
 
 ### Fallback Aggregate vs. Production Aggregate
 
-Status (2017-04-10):
+Status (2017-12-05):
 
-* These aggregates are currently identical.
+* The production aggregate ensures that all UKf-registered identity providers have `mdui:DisplayName`
+  metadata by copying data from `md:OrganizationDisplayName` if required. The copying process also
+  generates `mdui:Description` elements with the same content.
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 92fcf779..0460215b 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -125,7 +125,7 @@
         odn_to_mdui
 
         Ensure that all UKf-registered identity providers have
-        mdui:DisplayName elements.
+        mdui:DisplayName and mdui:Description elements.
     -->
     <bean id="odn_to_mdui" parent="mda.SplitMergeStage">
 
@@ -334,6 +334,12 @@
     <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
                 -->
@@ -394,6 +400,12 @@
                 -->
                 <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
                 -->
@@ -509,12 +521,6 @@
     <bean id="CDSAllPipeline" 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
                 -->
@@ -632,12 +638,6 @@
     <bean id="uk_testPipeline" parent="mda.CompositeStage">
         <property name="composedStages">
             <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
                 -->
@@ -762,6 +762,12 @@
                     </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
                 -->
@@ -879,7 +885,7 @@
 
                 <!--
                     Ensure that all UKf-registered identity providers have
-                    mdui:DisplayName elements.
+                    mdui:DisplayName and mdui:Description elements.
                 -->
                 <ref bean="odn_to_mdui"/>
 
@@ -1111,6 +1117,12 @@
                     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.
                 -->