From 0a8e63d70ad613e9b4e30bf1f606b97c024c56d3 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 27 May 2015 16:52:35 +0100
Subject: [PATCH] Normalise namespaces in import aggregate.

In particular, exclude the ukf-specific namespaces, which will never
occur here.
---
 mdx/incommon/import.xml         |  9 +++-
 mdx/incommon/ns_norm_import.xsl | 76 +++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 mdx/incommon/ns_norm_import.xsl

diff --git a/mdx/incommon/import.xml b/mdx/incommon/import.xml
index fd618261..21d66799 100644
--- a/mdx/incommon/import.xml
+++ b/mdx/incommon/import.xml
@@ -147,7 +147,14 @@
                 </bean>
 
                 <!-- Normalise the use of namespace prefixes in the resulting XML document. -->
-                <ref bean="normaliseNamespaces"/>
+                <bean id="normalise" parent="XSLTransformationStage"
+                    p:id="normalise">
+                    <property name="XSLResource">
+                        <bean parent="FileSystemResource">
+                            <constructor-arg value="${incdir}/ns_norm_import.xsl"/>
+                        </bean>
+                    </property>
+                </bean>
 
                 <!-- Write the resulting aggregate out to a file. -->
                 <ref bean="serializeImported"/>
diff --git a/mdx/incommon/ns_norm_import.xsl b/mdx/incommon/ns_norm_import.xsl
new file mode 100644
index 00000000..42a57b75
--- /dev/null
+++ b/mdx/incommon/ns_norm_import.xsl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	ns_norm_import.xsl
+
+	Normalise the namespaces in a metadata file for import.
+
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
+	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	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: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"
+	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
+
+	exclude-result-prefixes="md mdattr saml ukfedlabel 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">
+
+
+	<!--
+		Import templates for basic normalisation.
+	-->
+	<xsl:import href="../ns_norm.xsl"/>
+
+
+	<!--
+		Force UTF-8 encoding for the output.
+	-->
+	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8"/>
+
+
+	<!--
+		*******************************************
+		***                                     ***
+		***   D O C U M E N T   E L E M E N T   ***
+		***                                     ***
+		*******************************************
+	-->
+
+
+	<!--
+		We need to handle the document element specially in order to arrange
+		for all appropriate namespace prefix definitions to appear on it.
+
+		There are only two possible document elements in SAML metadata.
+	-->
+
+
+	<!--
+		Document element is <EntityDescriptor>.
+	-->
+	<xsl:template match="/md:EntityDescriptor">
+		<EntityDescriptor>
+			<xsl:apply-templates select="node()|@*"/>
+		</EntityDescriptor>
+	</xsl:template>
+
+	<!--
+		Document element is <EntitiesDescriptor>.
+	-->
+	<xsl:template match="/md:EntitiesDescriptor">
+		<EntitiesDescriptor>
+			<xsl:apply-templates select="node()|@*"/>
+		</EntitiesDescriptor>
+	</xsl:template>
+
+</xsl:stylesheet>