From 14ba0684aa4c4f9f21b0d84516f516f864cb6005 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 3 Feb 2010 10:48:01 +0000
Subject: [PATCH] Remove the SDSSPolicy label from the test metadata stream. 
 Include addional processing to prevent this from introducing non-schema-valid
 Extensions elements when no extensions are present (the Extensions element is
 wholly suppressed in this case).

---
 build/uk_master_test.xsl | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/build/uk_master_test.xsl b/build/uk_master_test.xsl
index 1addd6bd..b230dd45 100644
--- a/build/uk_master_test.xsl
+++ b/build/uk_master_test.xsl
@@ -22,8 +22,9 @@
 	xmlns:uklabel="http://ukfederation.org.uk/2006/11/label"
 	
 	xmlns:date="http://exslt.org/dates-and-times"
+	xmlns:exsl="http://exslt.org/common"
 	xmlns:mdxDates="xalan://uk.ac.sdss.xalan.md.Dates"
-	extension-element-prefixes="date mdxDates"
+	extension-element-prefixes="date exsl mdxDates"
 	
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
 	exclude-result-prefixes="wayf">
@@ -87,11 +88,32 @@
 		<xsl:text>&#10;</xsl:text>
 	</xsl:template>
 	
+	<!--
+		Handle <md:Extensions> elements.
+		
+		In general, at this stage in the flow we pass through any Extensions unaltered.
+		However, certain changes (such as the filtering we perform on extensions in the
+		uklabel namespace) may cause the Extensions element to become empty, which is not
+		permitted by the schema.  We therefore precompute the resulting Extensions element
+		and suppress it entirely if it would have no child elements.
+	-->
+	<xsl:template match="md:Extensions">
+		<!-- compute result -->
+		<xsl:variable name="ext">
+			<xsl:copy>
+				<xsl:apply-templates select="node()|@*"/>
+			</xsl:copy>
+		</xsl:variable>
+		<!-- copy through only if schema-valid -->
+		<xsl:if test="count(exsl:node-set($ext)/md:Extensions/*) != 0">
+			<xsl:copy-of select="$ext"/>
+		</xsl:if>
+	</xsl:template>
+	
 	<!--
 		Pass through certain uklabel namespace elements.
 	-->
 	<xsl:template match="uklabel:UKFederationMember |
-		uklabel:SDSSPolicy |
 		uklabel:AccountableUsers">
 		<xsl:copy>
 			<xsl:apply-templates select="node()|@*"/>