Enable Sirtfi metadata in production and export aggregates.

Also hoist remd namespace prefix declaration in production, export and export preview aggregates.
InCommon · Dec 14, 2016 · 752f6cb · 752f6cb
1 parent 3189412
commit 752f6cb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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"