From 752f6cb5713d796b232c164488f3ccae23de307c Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 14 Dec 2016 14:58:39 +0000
Subject: [PATCH] Enable Sirtfi metadata in production and export aggregates.

Also hoist remd namespace prefix declaration in production, export and
export preview aggregates.
---
 mdx/uk/generate.xml       | 10 ----------
 mdx/uk/ns_norm_export.xsl |  1 +
 mdx/uk/ns_norm_uk.xsl     |  1 +
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 5190a2a8..c85e322a 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -310,11 +310,6 @@
     <bean id="uk_productionPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
-                <!--
-                    Remove SIRTFI metadata.
-                -->
-                <ref bean="strip.SIRTFI"/>
-
                 <!--
                     Enforce IdP display name uniqueness before assembling aggregate
                 -->
@@ -670,11 +665,6 @@
     <bean id="uk_exportPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
-                <!--
-                    Remove SIRTFI metadata.
-                -->
-                <ref bean="strip.SIRTFI"/>
-
                 <!--
                     Additional rules excluding entities from the aggregate.
                     
diff --git a/mdx/uk/ns_norm_export.xsl b/mdx/uk/ns_norm_export.xsl
index aa2ea419..45f91dd9 100644
--- a/mdx/uk/ns_norm_export.xsl
+++ b/mdx/uk/ns_norm_export.xsl
@@ -33,6 +33,7 @@
 	xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
 	xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
 	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+	xmlns:remd="http://refeds.org/metadata"
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
diff --git a/mdx/uk/ns_norm_uk.xsl b/mdx/uk/ns_norm_uk.xsl
index f481d9bb..e42943f7 100644
--- a/mdx/uk/ns_norm_uk.xsl
+++ b/mdx/uk/ns_norm_uk.xsl
@@ -33,6 +33,7 @@
 	xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
 	xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
 	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+	xmlns:remd="http://refeds.org/metadata"
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"