From b275aeb6745ffbc71a76f3c10d82bf96bd307889 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 18 Jun 2010 15:25:27 +0000
Subject: [PATCH] Bugzilla 747: normalise ukfedlabel elements, or at least
 those that remain at this stage in the pipeline, so that they all use the
 ukfedlabel prefix rather than defining the namespace themselves.

---
 build/uk_master_test.xsl | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/uk_master_test.xsl b/build/uk_master_test.xsl
index 49574d0f..bce00351 100644
--- a/build/uk_master_test.xsl
+++ b/build/uk_master_test.xsl
@@ -128,13 +128,19 @@
 	</xsl:template>
 	
 	<!--
-		Pass through certain ukfedlabel namespace elements.
+		Normalise and pass through certain ukfedlabel namespace elements.
 	-->
-	<xsl:template match="ukfedlabel:UKFederationMember |
-		ukfedlabel:AccountableUsers">
-		<xsl:copy>
+	
+	<xsl:template match="ukfedlabel:UKFederationMember">
+		<xsl:element name="ukfedlabel:UKFederationMember">
 			<xsl:apply-templates select="node()|@*"/>
-		</xsl:copy>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="ukfedlabel:AccountableUsers">
+		<xsl:element name="ukfedlabel:AccountableUsers">
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:element>
 	</xsl:template>
 	
 	<!--