Provide default UK registration authority for all UK entities in the …

…test aggregate.
InCommon · Aug 3, 2012 · 3f38d2d · 3f38d2d
1 parent 76326d4
commit 3f38d2d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git 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"/>