From f581f7a968cb09a9b6469f5f1cead02a13749588 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 17 Jun 2010 14:58:14 +0000
Subject: [PATCH] Bugzilla 742: remove redundant prefixes in synthesised
 Extensions elements. This affects all unsigned intermediate files, but only
 the signed aggregate that changes is the test aggregate.

---
 build/master_ukfederation.xsl | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/build/master_ukfederation.xsl b/build/master_ukfederation.xsl
index b51e2d77..3335b0f4 100644
--- a/build/master_ukfederation.xsl
+++ b/build/master_ukfederation.xsl
@@ -78,18 +78,23 @@
 		<xsl:copy>
 		    <xsl:variable name="entityID" select="ancestor::md:EntityDescriptor/@entityID"/>
 		    <xsl:apply-templates select="@*"/>
-			<xsl:text>&#10;        </xsl:text><Extensions>
-			    <!-- copy scopes from EntityDescriptor extensions -->
+			<xsl:text>&#10;        </xsl:text>
+			<xsl:element name="Extensions" namespace="urn:oasis:names:tc:SAML:2.0:metadata">
+				<!-- copy scopes from EntityDescriptor extensions -->
 			    <xsl:for-each select="ancestor::md:EntityDescriptor/md:Extensions/shibmeta:Scope">
 					<xsl:text>&#10;            </xsl:text>
 					<xsl:copy-of select="."/>
 				</xsl:for-each>
 			    <!-- copy scopes from member outsource records -->
 			    <xsl:for-each select="$outsourcedScopes[members:Entity = $entityID]/members:Scope">
-			        <xsl:text>&#10;            </xsl:text>
-			        <shibmeta:Scope regexp="false"><xsl:value-of select="."/></shibmeta:Scope>
+			        <xsl:text>&#10;            </xsl:text>
+			    	<xsl:element name="shibmeta:Scope">
+			    		<xsl:attribute name="regexp">false</xsl:attribute>
+			    		<xsl:value-of select="."/>
+			    	</xsl:element>
 			    </xsl:for-each>
-			    <xsl:text>&#10;        </xsl:text></Extensions>
+			    <xsl:text>&#10;        </xsl:text>
+			</xsl:element>
 			<xsl:apply-templates select="node()"/>
 		</xsl:copy>
 	</xsl:template>