From 2ad711f9150c34f95b4d24a1a690d3256291dd1f Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 17 May 2011 14:32:33 +0000
Subject: [PATCH] Apply new namespace normalisation process to the production,
 WAYF and export aggregates.

---
 build.xml                    | 22 ++++++++++++---
 build/uk_master_export.xsl   | 50 +++-------------------------------
 build/uk_master_unsigned.xsl | 52 ++++--------------------------------
 3 files changed, 27 insertions(+), 97 deletions(-)

diff --git a/build.xml b/build.xml
index 92bbbc1e..60ee5751 100644
--- a/build.xml
+++ b/build.xml
@@ -446,8 +446,15 @@
 		
 		<!-- [19] -->
 		<echo>   Production aggregate...</echo>
-		<XALAN.xmldir x="uk_master_unsigned.xsl" i="${uk.master.file}"
-			o="${md.prod.unsigned}" />
+		<XALAN
+			x="${build.dir}/uk_master_unsigned.xsl"
+			i="${xml.dir}/${uk.master.file}"
+			o="${temp.xml}"/>
+        <echo>      normalising namespaces...</echo>
+        <XALAN
+            x="${build.dir}/ns_norm_uk.xsl"
+            i="${temp.xml}"
+            o="${xml.dir}/${md.prod.unsigned}" />
 		<MDNORM i="${md.prod.unsigned}"/>
         <CHECK.publishable i="${xml.dir}/${md.prod.unsigned}"/>
         <!-- [25] -->
@@ -472,8 +479,15 @@
 		
 		<!-- [29] -->
 		<echo>   Export aggregate...</echo>
-		<XALAN.xmldir x="uk_master_export.xsl" i="${uk.master.file}"
-			o="${md.export.unsigned}" />
+		<XALAN
+			x="${build.dir}/uk_master_export.xsl"
+			i="${xml.dir}/${uk.master.file}"
+			o="${temp.xml}"/>
+        <echo>      normalising namespaces...</echo>
+        <XALAN
+            x="${build.dir}/ns_norm_uk.xsl"
+            i="${temp.xml}"
+            o="${xml.dir}/${md.export.unsigned}" />
 		<MDNORM i="${md.export.unsigned}"/>
 		
 		<!-- [31] -->
diff --git a/build/uk_master_export.xsl b/build/uk_master_export.xsl
index 81eab331..a0a21bfc 100644
--- a/build/uk_master_export.xsl
+++ b/build/uk_master_export.xsl
@@ -163,19 +163,13 @@
 	</xsl:template>
 	
 	<!--
-		Normalise and pass through certain ukfedlabel namespace elements.
+		Pass through certain ukfedlabel namespace elements.
 	-->
 	
-	<xsl:template match="ukfedlabel:UKFederationMember">
-		<xsl:element name="ukfedlabel:UKFederationMember">
-			<xsl:apply-templates select="node()|@*"/>
-		</xsl:element>
-	</xsl:template>
-
-	<xsl:template match="ukfedlabel:AccountableUsers">
-		<xsl:element name="ukfedlabel:AccountableUsers">
+	<xsl:template match="ukfedlabel:UKFederationMember | ukfedlabel:AccountableUsers">
+		<xsl:copy>
 			<xsl:apply-templates select="node()|@*"/>
-		</xsl:element>
+		</xsl:copy>
 	</xsl:template>
 	
 	<!--
@@ -185,42 +179,6 @@
 		<!-- do nothing -->
 	</xsl:template>
 	
-	<!--
-		Normalise namespace on IdP discovery elements.
-	-->
-	
-	<xsl:template match="idpdisc:DiscoveryResponse">
-		<idpdisc:DiscoveryResponse>
-			<xsl:apply-templates select="node()|@*"/>
-		</idpdisc:DiscoveryResponse>
-	</xsl:template>
-	
-	<!--
-		Normalise namespace on Athens PUID elements.
-	-->
-	
-	<xsl:template match="elab:AthensPUIDAuthority">
-		<elab:AthensPUIDAuthority>
-			<xsl:apply-templates select="node()|@*"/>
-		</elab:AthensPUIDAuthority>
-	</xsl:template>
-	
-	<!--
-		Normalise namespace on Shibboleth metadata elements.
-	-->
-	
-	<xsl:template match="shibmd:Scope">
-		<shibmd:Scope>
-			<xsl:apply-templates select="node()|@*"/>
-		</shibmd:Scope>
-	</xsl:template>
-	
-	<xsl:template match="shibmd:KeyAuthority">
-		<shibmd:KeyAuthority>
-			<xsl:apply-templates select="node()|@*"/>
-		</shibmd:KeyAuthority>
-	</xsl:template>
-	
 	<!--
 		Remove administrative contacts.
 	-->
diff --git a/build/uk_master_unsigned.xsl b/build/uk_master_unsigned.xsl
index 547b1ca5..45cd1f8f 100644
--- a/build/uk_master_unsigned.xsl
+++ b/build/uk_master_unsigned.xsl
@@ -150,21 +150,15 @@
 	
 	
 	<!--
-		Normalise and pass through certain ukfedlabel namespace elements.
+		Pass through certain ukfedlabel namespace elements.
 	-->
 	
-	<xsl:template match="ukfedlabel:UKFederationMember">
-		<xsl:element name="ukfedlabel:UKFederationMember">
-			<xsl:apply-templates select="node()|@*"/>
-		</xsl:element>
-	</xsl:template>
-
-	<xsl:template match="ukfedlabel:AccountableUsers">
-		<xsl:element name="ukfedlabel:AccountableUsers">
+	<xsl:template match="ukfedlabel:UKFederationMember | ukfedlabel:AccountableUsers">
+		<xsl:copy>
 			<xsl:apply-templates select="node()|@*"/>
-		</xsl:element>
+		</xsl:copy>
 	</xsl:template>
-	
+		
 	<!--
 		Strip all other ukfedlabel namespace elements entirely.
 	-->
@@ -172,42 +166,6 @@
 		<!-- do nothing -->
 	</xsl:template>
 	
-	<!--
-		Normalise namespace on IdP discovery elements.
-	-->
-	
-	<xsl:template match="idpdisc:DiscoveryResponse">
-		<idpdisc:DiscoveryResponse>
-			<xsl:apply-templates select="node()|@*"/>
-		</idpdisc:DiscoveryResponse>
-	</xsl:template>
-	
-	<!--
-		Normalise namespace on Athens PUID elements.
-	-->
-	
-	<xsl:template match="elab:AthensPUIDAuthority">
-		<elab:AthensPUIDAuthority>
-			<xsl:apply-templates select="node()|@*"/>
-		</elab:AthensPUIDAuthority>
-	</xsl:template>
-	
-	<!--
-		Normalise namespace on Shibboleth metadata elements.
-	-->
-	
-	<xsl:template match="shibmd:Scope">
-		<shibmd:Scope>
-			<xsl:apply-templates select="node()|@*"/>
-		</shibmd:Scope>
-	</xsl:template>
-	
-	<xsl:template match="shibmd:KeyAuthority">
-		<shibmd:KeyAuthority>
-			<xsl:apply-templates select="node()|@*"/>
-		</shibmd:KeyAuthority>
-	</xsl:template>
-	
 	<!--
 		Remove administrative contacts.
 	-->