From a1a1e7debd5d3f40578ee1c1d686db437b4f8be5 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 17 Apr 2013 11:22:07 +0000
Subject: [PATCH] Remove entity-level Scope elements from the export aggregate,
 leaving only the ones associated with role descriptors.

---
 mdx/uk/entity_scopes.xsl | 38 ++++++++++++++++++++++++++++++++++++++
 mdx/uk/generate.xml      | 25 +++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 mdx/uk/entity_scopes.xsl

diff --git a/mdx/uk/entity_scopes.xsl b/mdx/uk/entity_scopes.xsl
new file mode 100644
index 00000000..66c3548f
--- /dev/null
+++ b/mdx/uk/entity_scopes.xsl
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	entity_scopes.xsl
+
+	Remove entity-level Scope elements, leaving only the ones associated
+	with role descriptors.
+
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	exclude-result-prefixes="md">
+
+	<!--Force UTF-8 encoding for the output.-->
+	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
+
+	<xsl:template match="md:EntityDescriptor/md:Extensions/shibmd:Scope">
+		<!-- remove entirely -->
+	</xsl:template>
+	
+	<!--By default, copy text blocks, comments and attributes unchanged.-->
+	<xsl:template match="text()|comment()|@*">
+		<xsl:copy/>
+	</xsl:template>
+	
+	<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
+	<xsl:template match="*">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+	
+</xsl:stylesheet>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index ed275b98..7baff3c2 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -28,6 +28,30 @@
     <import resource="../us_incommon/beans.xml"/>
 
 
+    <!--
+        *****************************
+        ***                       ***
+        ***   U T I L I T I E S   ***
+        ***                       ***
+        *****************************
+    -->
+    
+    <!--
+        stripEntityScopes
+    
+        Remove entity-level Scope elements, leaving only the ones associated
+        with role descriptors.    
+    -->
+    <bean id="stripEntityScopes" parent="xslt_parent"
+        p:id="stripEntityScopes">
+        <property name="xslResource">
+            <bean parent="file_parent">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/entity_scopes.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    
     <!--
         ***********************
         ***                 ***
@@ -504,6 +528,7 @@
                 <ref bean="stripWayfNamespace"/>
                 <ref bean="stripKeyNames"/>
                 <ref bean="uk_assemble"/>
+                <ref bean="stripEntityScopes"/>
                 <ref bean="removeEmptyExtensions"/>
                 <ref bean="uk_finaliseExport"/>
                 <ref bean="uk_normaliseExport"/>