From 39a56a425d4225185d159f69fe95d438b10bb3b0 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 24 Sep 2024 02:59:46 +0100
Subject: [PATCH] Hoist xenc namespace

Resolves ukf/ukf-meta#99.
---
 mdx/uk/ns_norm_back.xsl           | 23 +----------------------
 mdx/uk/ns_norm_export.xsl         | 23 +----------------------
 mdx/uk/ns_norm_export_preview.xsl | 23 +----------------------
 mdx/uk/ns_norm_test.xsl           | 23 +----------------------
 mdx/uk/ns_norm_uk.xsl             | 23 +----------------------
 5 files changed, 5 insertions(+), 110 deletions(-)

diff --git a/mdx/uk/ns_norm_back.xsl b/mdx/uk/ns_norm_back.xsl
index 8cab69cf..34287b95 100644
--- a/mdx/uk/ns_norm_back.xsl
+++ b/mdx/uk/ns_norm_back.xsl
@@ -40,7 +40,7 @@
     xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    exclude-result-prefixes="md xenc"
+    exclude-result-prefixes="md"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
 
@@ -114,25 +114,4 @@
     </xsl:template>
 
 
-    <!--
-        ***************************************
-        ***                                 ***
-        ***   X E N C   N A M E S P A C E   ***
-        ***                                 ***
-        ***************************************
-    -->
-
-
-    <!--
-        xenc:*
-
-        Normalise namespace to not use a prefix.
-    -->
-    <xsl:template match="xenc:*">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/2001/04/xmlenc#">
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:element>
-    </xsl:template>
-
-
 </xsl:stylesheet>
diff --git a/mdx/uk/ns_norm_export.xsl b/mdx/uk/ns_norm_export.xsl
index 9225b2ed..6e8f1094 100644
--- a/mdx/uk/ns_norm_export.xsl
+++ b/mdx/uk/ns_norm_export.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="md ukfedlabel xenc"
+    exclude-result-prefixes="md ukfedlabel"
     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">
@@ -108,25 +108,4 @@
     </xsl:template>
 
 
-    <!--
-        ***************************************
-        ***                                 ***
-        ***   X E N C   N A M E S P A C E   ***
-        ***                                 ***
-        ***************************************
-    -->
-
-
-    <!--
-        xenc:*
-
-        Normalise namespace to not use a prefix.
-    -->
-    <xsl:template match="xenc:*">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/2001/04/xmlenc#">
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:element>
-    </xsl:template>
-
-
 </xsl:stylesheet>
diff --git a/mdx/uk/ns_norm_export_preview.xsl b/mdx/uk/ns_norm_export_preview.xsl
index 9e0d5ff2..8d57852c 100644
--- 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="md ukfedlabel xenc"
+    exclude-result-prefixes="md ukfedlabel"
     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">
@@ -108,25 +108,4 @@
     </xsl:template>
 
 
-    <!--
-        ***************************************
-        ***                                 ***
-        ***   X E N C   N A M E S P A C E   ***
-        ***                                 ***
-        ***************************************
-    -->
-
-
-    <!--
-        xenc:*
-
-        Normalise namespace to not use a prefix.
-    -->
-    <xsl:template match="xenc:*">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/2001/04/xmlenc#">
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:element>
-    </xsl:template>
-
-
 </xsl:stylesheet>
diff --git a/mdx/uk/ns_norm_test.xsl b/mdx/uk/ns_norm_test.xsl
index 2a34c0cd..45ab88cb 100644
--- 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="md xenc"
+    exclude-result-prefixes="md"
     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">
@@ -114,25 +114,4 @@
     </xsl:template>
 
 
-    <!--
-        ***************************************
-        ***                                 ***
-        ***   X E N C   N A M E S P A C E   ***
-        ***                                 ***
-        ***************************************
-    -->
-
-
-    <!--
-        xenc:*
-
-        Normalise namespace to not use a prefix.
-    -->
-    <xsl:template match="xenc:*">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/2001/04/xmlenc#">
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:element>
-    </xsl:template>
-
-
 </xsl:stylesheet>
diff --git a/mdx/uk/ns_norm_uk.xsl b/mdx/uk/ns_norm_uk.xsl
index b4100d47..dec59bcb 100644
--- a/mdx/uk/ns_norm_uk.xsl
+++ b/mdx/uk/ns_norm_uk.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="md xenc"
+    exclude-result-prefixes="md"
     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">
@@ -114,25 +114,4 @@
     </xsl:template>
 
 
-    <!--
-        ***************************************
-        ***                                 ***
-        ***   X E N C   N A M E S P A C E   ***
-        ***                                 ***
-        ***************************************
-    -->
-
-
-    <!--
-        xenc:*
-
-        Normalise namespace to not use a prefix.
-    -->
-    <xsl:template match="xenc:*">
-        <xsl:element name="{local-name()}" namespace="http://www.w3.org/2001/04/xmlenc#">
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:element>
-    </xsl:template>
-
-
 </xsl:stylesheet>