From ec52f133c8eca57828b27daa7ff9babf2709fb9e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 12 Jul 2011 15:10:09 +0000
Subject: [PATCH] Merge in exported entities from ie_edugate channel.

---
 mdx/common-beans.xml |  7 +++++++
 mdx/uk/beans.xml     | 16 +++++++++++++++
 mdx/uk/generate.xml  | 49 +++++++++++++++++++++++++++++++++++---------
 3 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 1bae7682..7b0bce7b 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -236,6 +236,13 @@
         </property>
     </bean>
     
+    <!--
+        everythingSelector
+        
+        An item selection strategy that selects all items.
+    -->
+    <bean id="everythingSelector" class="net.shibboleth.metadata.AlwaysItemSelectionStrategy"/>
+    
     <!--
         Standard serializer.
     -->
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index d06d3c67..990e2ef8 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -269,4 +269,20 @@
     </bean>
     
 
+    <!--
+        uk_stripExtensions
+        
+        Strip those UK federation extensions which we never publish.
+    -->
+    <bean id="uk_stripExtensions" class="net.shibboleth.metadata.dom.XSLTransformationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="uk_stripExtensions"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/strip_extensions.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+
 </beans>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 54510995..a7d371dc 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -18,19 +18,33 @@
         Import channel-specific beans.
     -->
     <import resource="beans.xml"/>
+    
+    <!--
+        Import beans from other channels.
+    -->
+    <import resource="../ie_edugate/beans.xml"/>
+
 
-    <bean id="everythingSelector" class="net.shibboleth.metadata.AlwaysItemSelectionStrategy"/>
+    <!--
+        *******************************************
+        ***                                     ***
+        ***   I M P O R T   P I P E L I N E S   ***
+        ***                                     ***
+        *******************************************
+    -->
     
-    <bean id="uk_stripExtensions" class="net.shibboleth.metadata.dom.XSLTransformationStage"
+    <bean id="uk_ie_edugate_importPipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="uk_stripExtensions"/>
-        <property name="xslResource">
-            <bean class="org.opensaml.util.resource.FilesystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/strip_extensions.xsl"/>
-            </bean>
+        <property name="id" value="uk_ie_edugate_importPipeline"/>
+        <property name="stages">
+            <list>
+                <ref bean="ie_edugate_exportedEntities"/>
+                <ref bean="uk_performFixups"/>
+            </list>
         </property>
     </bean>
     
+
     <!--
         ***************************************************
         ***                                             ***
@@ -323,9 +337,9 @@
                 <!--
                     Fork into new pipelines for the production, fallback and WAYF aggregates.
                 -->
-                <bean id="wayfDemux" class="net.shibboleth.metadata.pipeline.PipelineDemultiplexerStage"
+                <bean id="otherDemux" class="net.shibboleth.metadata.pipeline.PipelineDemultiplexerStage"
                     init-method="initialize" lazy-init="true">
-                    <property name="id" value="wayfDemux"/>
+                    <property name="id" value="otherDemux"/>
                     <property name="pipelineAndSelectionStrategies">
                         <list>
                             <bean class="org.opensaml.util.Pair">
@@ -345,7 +359,22 @@
                     <property name="waitingForPipelines" value="true"/>
                 </bean>
                 
-                <!-- merge in entities from other metadata sources -->
+                <!--
+                    Merge in entities from other metadata sources.
+                -->
+                <bean id="mergeImportedEntities" class="net.shibboleth.metadata.pipeline.PipelineMergeStage"
+                    init-method="initialize" lazy-init="true">
+                    <property name="id" value="mergeImportedEntities"/>
+                    <property name="collectionMergeStrategy">
+                        <bean id="deduplicateMergeStrategy" class="net.shibboleth.metadata.DeduplicatingItemIdMergeStrategy"
+                            lazy-init="true"/>
+                    </property>
+                    <property name="mergedPipelines">
+                        <list>
+                            <ref bean="uk_ie_edugate_importPipeline"/>
+                        </list>
+                    </property>
+                </bean>
                 
                 <!-- pipeline continues to generate test aggregate -->
                 <ref bean="uk_assemble"/>