Hoist "alg" namespace in preview aggregates

See ukf/ukf-meta#98.
InCommon · Jul 21, 2020 · 51bb5a0 · 51bb5a0
1 parent 0470d58
commit 51bb5a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 47 deletions.
diff --git a/mdx/uk/README.md b/mdx/uk/README.md
@@ -28,9 +28,10 @@ before being included in the `export` version consumed by interfederation partne
 
 ### Export Preview Aggregate vs. Export Aggregate
 
-Status (2020-07-01):
+Status (2020-07-21):
 
-* These aggregates are currently identical.
+* The `export-preview` aggregate declares the `alg` namespace on the document element,
+  rather than on each `<DigestMethod>` or `<SigningMethod>` element.
 
 ## Production Maturity Pipeline
 
@@ -59,13 +60,16 @@ when it appeared in the fallback aggregate, which would be too late to take corr
 
 ### Test Aggregate vs. Production Aggregate
 
-Status (2020-07-01):
+Status (2020-07-21):
 
 * The `test` aggregate does not include the `<UKFederationMember>` label (`ukf-meta#34`).
 
 * The `test` aggregate does not include the entity-level copy of the scopes for an
   identity provider (`ukf-meta#49`).
 
+* The `test` aggregate declares the `alg` namespace on the document element,
+  rather than on each `<DigestMethod>` or `<SigningMethod>` element.
+
 
 ### `cds-all` Aggregate vs. Production Aggregate
 

diff --git a/mdx/uk/ns_norm_export_preview.xsl b/mdx/uk/ns_norm_export_preview.xsl
@@ -33,7 +33,7 @@
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
     xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 
-    exclude-result-prefixes="alg md ukfedlabel xenc"
+    exclude-result-prefixes="md ukfedlabel xenc"
     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">
@@ -87,27 +87,6 @@
     </xsl:template>
 
 
-    <!--
-        *************************************
-        ***                               ***
-        ***   A L G   N A M E S P A C E   ***
-        ***                               ***
-        *************************************
-    -->
-
-
-    <!--
-        alg:*
-
-        Normalise namespace to not use a prefix.
-    -->
-    <xsl:template match="alg:*">
-        <xsl:element name="{local-name()}" namespace="urn:oasis:names:tc:SAML:metadata:algsupport">
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:element>
-    </xsl:template>
-
-
     <!--
         ***************************************
         ***                                 ***

diff --git a/mdx/uk/ns_norm_test.xsl b/mdx/uk/ns_norm_test.xsl
@@ -39,7 +39,7 @@
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
     xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 
-    exclude-result-prefixes="alg md xenc"
+    exclude-result-prefixes="md xenc"
     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">
@@ -93,27 +93,6 @@
     </xsl:template>
 
 
-    <!--
-        *************************************
-        ***                               ***
-        ***   A L G   N A M E S P A C E   ***
-        ***                               ***
-        *************************************
-    -->
-
-
-    <!--
-        alg:*
-
-        Normalise namespace to not use a prefix.
-    -->
-    <xsl:template match="alg:*">
-        <xsl:element name="{local-name()}" namespace="urn:oasis:names:tc:SAML:metadata:algsupport">
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:element>
-    </xsl:template>
-
-
     <!--
         ***************************************
         ***                                 ***