From be4cf52f1aa026a3ab9c7de2e3becb399eefb95f Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 20 Mar 2014 10:24:35 +0000
Subject: [PATCH] Make it more obvious that when we merge entities from other
 federations, we are discarding those with duplicate entityIDs.

---
 mdx/common-beans.xml | 18 +++++++-----------
 mdx/uk/generate.xml  |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index f144275a..2a1f2e2f 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -50,7 +50,7 @@
     <!--
         component_parent
         
-        Parent for anything based on the component system.
+        Parent for anything based on the Shibboleth component system.
         These all require initialization before use.
     -->
     <bean id="component_parent" abstract="true" init-method="initialize"/>
@@ -199,16 +199,6 @@
         <property name="serializer" ref="serializer"/>
     </bean>
     
-    <!--
-        PipelineMergeStage
-        
-        Parent for merge stages.  Defaults strategy to deduplication.
-    -->
-    <bean id="PipelineMergeStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.PipelineMergeStage">
-        <property name="collectionMergeStrategy" ref="deduplicateMergeStrategy"/>
-    </bean>
-    
     <!--
         PipelineDemultiplexerStage
         
@@ -233,6 +223,12 @@
     <bean id="EntityFilterStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.saml.EntityFilterStage"/>
 
+    <bean id="PipelineMergeStage" abstract="true" parent="stage_parent"
+        class="net.shibboleth.metadata.pipeline.PipelineMergeStage"/>
+
+    <bean id="PipelineMergeStage.deduplicate" abstract="true" parent="PipelineMergeStage"
+        p:collectionMergeStrategy-ref="deduplicateMergeStrategy"/>
+    
     <!-- *** Parent beans for ukf-mda. *** -->
     
     <bean id="ElementWhitespaceTrimmingStage" abstract="true" parent="stage_parent"
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index ba660e82..3857096a 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -897,7 +897,7 @@
                     Merge in entities from production metadata exchange sources.
                 -->
                 
-                <bean id="mergeProductionMDXEntities" parent="PipelineMergeStage"
+                <bean id="mergeProductionMDXEntities" parent="PipelineMergeStage.deduplicate"
                     p:id="mergeProductionMDXortedEntities">
                     <property name="mergedPipelines">
                         <list>
@@ -954,7 +954,7 @@
                     Merge in entities from pre-production metadata exchange sources.
                 -->
 
-                <bean id="mergePreproductionMDXEntities" parent="PipelineMergeStage"
+                <bean id="mergePreproductionMDXEntities" parent="PipelineMergeStage.deduplicate"
                     p:id="mergePreproductionMDXEntities">
                     <property name="mergedPipelines">
                         <list>