From 302063e7de002ab850832e3f3718c20fa0bc8a2a Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sun, 12 Jun 2011 11:25:31 +0000
Subject: [PATCH] Add UK federation URI to the EntitiesDescriptor in the
 collect flow. Requires a bug-fix bump to the aggregator-pipeline artifact.

---
 mdx/uk/uk-beans.xml   | 10 ++++++++++
 mdx/uk/uk-collect.xml |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mdx/uk/uk-beans.xml b/mdx/uk/uk-beans.xml
index e9785144..821655b1 100644
--- a/mdx/uk/uk-beans.xml
+++ b/mdx/uk/uk-beans.xml
@@ -93,4 +93,14 @@
     </bean>
     
     
+    <!--
+        UK federation EntitiesDescriptor assembler pipeline stage.
+    -->
+    <bean id="assemble.uk" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="assemble.uk"/>
+        <property name="descriptorName" value="http://ukfederation.org.uk"/>
+    </bean>
+    
+
 </beans>
diff --git a/mdx/uk/uk-collect.xml b/mdx/uk/uk-collect.xml
index e87a78f4..bb44ebde 100644
--- a/mdx/uk/uk-collect.xml
+++ b/mdx/uk/uk-collect.xml
@@ -100,7 +100,7 @@
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK.std"/>
                 <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
-                <ref bean="assemble"/>
+                <ref bean="assemble.uk"/>
 
                 <!--
                     Process scopes on the entities.  Because the transform performs