From f48e11f2d08967d52f406bb577eb15bedabde7e4 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sat, 11 Aug 2012 18:59:40 +0000
Subject: [PATCH] Synthesise mdrpi metadata for all UK federation registered
 entities while collecting that set rather than further down the line. This
 metadata will now appear in full everywhere but the fallback aggregate (which
 will see some blank lines added).

---
 mdx/uk/beans.xml    | 2 ++
 mdx/uk/generate.xml | 7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index f0eb2b65..6c399d13 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -322,6 +322,8 @@
                 <ref bean="uk_processScopes"/>
                 <ref bean="populateItemIds"/>
                 <ref bean="uk_populateIds"/>
+                <ref bean="uk_default_regauth"/>
+                
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK_std"/>
                 <ref bean="check_ukreg"/>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index d5bbddc2..7e445f2c 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -241,6 +241,7 @@
             <list>
                 <ref bean="uk_assemble"/>
                 <ref bean="stripMdrpiNamespace"/>
+                <ref bean="removeEmptyExtensions"/>
                 <ref bean="uk_addTrustRoots"/>
                 <ref bean="uk_finaliseFallback"/>
                 <ref bean="uk_normaliseFallback"/>
@@ -345,7 +346,6 @@
         p:id="uk_exportPipeline">
         <property name="stages">
             <list>
-                <ref bean="uk_default_regauth"/>
                 <ref bean="uk_stripExtensions"/>
                 <ref bean="stripKeyNames"/>
                 <ref bean="uk_assemble"/>
@@ -497,11 +497,6 @@
                     <property name="waitingForPipelines" value="true"/>
                 </bean>
 
-                <!--
-                    Identify all UK registered entities as such.
-                -->
-                <ref bean="uk_default_regauth"/>
-                
                 <!--
                     ***********************************************************
                     ***                                                     ***