From f731de3e1c044598f0043e00182b90bccb616097 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 18 Jun 2010 15:10:24 +0000
Subject: [PATCH] Bugzilla 743: hoist ukfedlabel namespace prefix definition to
 the document level by rebuilding the document element with appropriate
 namespace definitions in scope.

---
 build/uk_master_test.xsl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/uk_master_test.xsl b/build/uk_master_test.xsl
index 75704549..49574d0f 100644
--- a/build/uk_master_test.xsl
+++ b/build/uk_master_test.xsl
@@ -16,6 +16,7 @@
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
@@ -26,7 +27,7 @@
 	extension-element-prefixes="date exsl mdxDates"
 	
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-	exclude-result-prefixes="wayf">
+	exclude-result-prefixes="md wayf">
 
 	<!--Force UTF-8 encoding for the output.-->
 	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
@@ -68,7 +69,7 @@
 		Document element.
 	-->
 	<xsl:template match="/md:EntitiesDescriptor">
-		<xsl:copy>
+		<EntitiesDescriptor>
 			<xsl:attribute name="validUntil">
 				<xsl:value-of select="$validUntil"/>
 			</xsl:attribute>
@@ -78,7 +79,7 @@
 			<xsl:apply-templates select="@*"/>
 			<xsl:call-template name="document.comment"/>
 			<xsl:apply-templates select="node()"/>
-		</xsl:copy>
+		</EntitiesDescriptor>
 	</xsl:template>
 
 	<!--