Synthesise mdrpi metadata for all UK federation registered entities w…

…hile 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).
InCommon · Aug 11, 2012 · f48e11f · f48e11f
1 parent 8c0fde5
commit f48e11f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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"/>
-
                 <!--
                     ***********************************************************
                     ***                                                     ***