Retire HideFromWAYF extension from fallback aggregate.

InCommon · Dec 10, 2015 · 2ce644f · 2ce644f
1 parent 4930406
commit 2ce644f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 63 deletions.
diff --git a/mdx/uk/add_hide_element.xsl b/mdx/uk/add_hide_element.xsl
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
@@ -238,18 +238,6 @@
                 <ref bean="removeBlacklistedEntities"/>
                 <ref bean="standardImportActions"/>
 
-                <!--
-                    Add UK federation HideFromWAYF element as an equivalent to membership in
-                    the REFEDS Hide from Discovery category.
-                -->
-                <bean p:id="uk_addHideFromWAYF" parent="XSLTransformationStage">
-                    <property name="XSLResource">
-                        <bean parent="ClassPathResource">
-                            <constructor-arg value="uk/add_hide_element.xsl"/>
-                        </bean>
-                    </property>                    
-                </bean>
-
                 <!--
                     Silently remove entities which are marked as
                     having errors.
@@ -591,6 +579,7 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="uk_assemble"/>
+                <ref bean="stripWayfNamespace"/>
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="stripEmptyExtensions"/>
@@ -1036,6 +1025,12 @@
                 <ref bean="CMSStripUnwanted"/>
 
                 <ref bean="CMSFinalise"/>
+
+                <!--
+                    Normalise namespaces in the most general way. This will leave in a number
+                    of unwanted namespace prefix declarations (e.g., xmlns:wayf) but that's
+                    not really important for an aggregate we don't publish.
+                -->
                 <ref bean="normaliseNamespaces"/>
 
                 <ref bean="serializeCMSAggregate"/>

diff --git a/mdx/uk/ns_norm_back.xsl b/mdx/uk/ns_norm_back.xsl
@@ -38,7 +38,7 @@
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 
-	exclude-result-prefixes="alg md mdattr saml"
+	exclude-result-prefixes="alg md mdattr saml wayf"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">