From 4a3dd845d1b89fe556bcdf051a7d561d52abbb46 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 18 Jun 2010 10:20:01 +0000
Subject: [PATCH] Bugzilla 694: change prefix used for Shibboleth metadata. 
 Doesn't affect the output, which is plain text.

---
 build/extract_authorities.xsl | 6 +++---
 build/extract_scopes.xsl      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/extract_authorities.xsl b/build/extract_authorities.xsl
index 9eab19e7..cba4a198 100644
--- a/build/extract_authorities.xsl
+++ b/build/extract_authorities.xsl
@@ -13,7 +13,7 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
@@ -21,12 +21,12 @@
     xmlns:mdxTextUtils="xalan://uk.ac.sdss.xalan.md.TextUtils"
 	extension-element-prefixes="mdxTextUtils"
 
-	exclude-result-prefixes="shibmeta md ds wayf">
+	exclude-result-prefixes="shibmd md ds wayf">
 
 	<!-- Output is plain text -->
 	<xsl:output method="text"/>
 
-	<xsl:template match="//md:EntitiesDescriptor/md:Extensions/shibmeta:KeyAuthority//ds:X509Certificate">
+	<xsl:template match="//md:EntitiesDescriptor/md:Extensions/shibmd:KeyAuthority//ds:X509Certificate">
 		<xsl:text>-----BEGIN CERTIFICATE-----&#x0a;</xsl:text>
 		<xsl:value-of select="mdxTextUtils:wrapBase64(.)"/>
 		<xsl:text>&#x0a;-----END CERTIFICATE-----&#x0a;</xsl:text>
diff --git a/build/extract_scopes.xsl b/build/extract_scopes.xsl
index 7d4fd015..221a1d2d 100644
--- a/build/extract_scopes.xsl
+++ b/build/extract_scopes.xsl
@@ -12,20 +12,20 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	exclude-result-prefixes="shibmeta md ds wayf">
+	exclude-result-prefixes="shibmd md ds wayf">
 
 	<!-- Output is plain text -->
 	<xsl:output method="text"/>
 
-	<xsl:template match="//shibmeta:Scope[@regex = 'true']">
+	<xsl:template match="//shibmd:Scope[@regex = 'true']">
 		<!-- do nothing -->
 	</xsl:template>
 	
-	<xsl:template match="//shibmeta:Scope">
+	<xsl:template match="//shibmd:Scope">
 		<xsl:value-of select="."/>
 		<xsl:text>&#x0a;</xsl:text>
 	</xsl:template>