From 3f38d2df39b56ae270444bb42efb09a1b4db6700 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 3 Aug 2012 15:52:17 +0000
Subject: [PATCH] Provide default UK registration authority for all UK entities
 in the test aggregate.

---
 mdx/uk/generate.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 0e4187b9..cd928208 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -432,13 +432,18 @@
                     </property>
                     <property name="waitingForPipelines" value="true"/>
                 </bean>
+
+                <!--
+                    Identify all UK registered entities as such.
+                -->
+                <ref bean="uk_default_regauth"/>
                 
                 <!--
-                    Merge in entities from other metadata sources.
+                    Merge in entities from pre-production metadata exchange sources.
                 -->
-                <bean id="mergeImportedEntities" parent="stage_parent"
+                <bean id="mergePreproductionImportedEntities" parent="stage_parent"
                     class="net.shibboleth.metadata.pipeline.PipelineMergeStage"
-                    p:id="mergeImportedEntities">
+                    p:id="mergePreproductionImportedEntities">
                     <property name="collectionMergeStrategy">
                         <bean id="deduplicateMergeStrategy" class="net.shibboleth.metadata.DeduplicatingItemIdMergeStrategy"
                             lazy-init="true"/>