From aa012eb0bfe2bc291efb7b908c5c5aa4fd26e6c1 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 10 Jun 2011 16:59:20 +0000
Subject: [PATCH] Add a fragment processing stage to the UK collect flow.  Make
 it remove xsi:schemaLocation attributes.

---
 mdx/uk/fragment.xsl   | 49 +++++++++++++++++++++++++++++++++++++++++++
 mdx/uk/uk-beans.xml   | 17 +++++++++++++++
 mdx/uk/uk-collect.xml |  1 +
 3 files changed, 67 insertions(+)
 create mode 100644 mdx/uk/fragment.xsl

diff --git a/mdx/uk/fragment.xsl b/mdx/uk/fragment.xsl
new file mode 100644
index 00000000..43dbca43
--- /dev/null
+++ b/mdx/uk/fragment.xsl
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	fragment.xsl
+	
+	XSL stylesheet to perform any required clean-up on a UK federation fragment file
+	before it is passed along to other processes.
+	
+-->
+<xsl:stylesheet version="1.0"
+    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+
+	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="xsi xsl">
+
+	<!--Force UTF-8 encoding for the output.-->
+	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
+
+
+	<!--
+		Remove any xsi:schemaLocation attributes.
+	-->
+	<xsl:template match="@xsi:schemaLocation"/>
+
+
+    <!--
+        *********************************************
+        ***                                       ***
+        ***   D E F A U L T   T E M P L A T E S   ***
+        ***                                       ***
+        *********************************************
+    -->
+    
+    
+	<!--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/uk-beans.xml b/mdx/uk/uk-beans.xml
index 2ebf5113..e9785144 100644
--- a/mdx/uk/uk-beans.xml
+++ b/mdx/uk/uk-beans.xml
@@ -76,4 +76,21 @@
         </property>
     </bean>
     
+
+    <!--
+        processFragment
+        
+        This stage performs any standard cleanup required for UK federation fragment files.
+    -->
+    <bean id="processFragment" class="net.shibboleth.metadata.dom.XSLTransformationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="processFragment"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/fragment.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    
 </beans>
diff --git a/mdx/uk/uk-collect.xml b/mdx/uk/uk-collect.xml
index ed061d18..29a1c422 100644
--- a/mdx/uk/uk-collect.xml
+++ b/mdx/uk/uk-collect.xml
@@ -95,6 +95,7 @@
             <list>
                 <ref bean="fetchUkFragmentFiles"/>
                 <ref bean="filterDeletedEntities"/>
+                <ref bean="processFragment"/>
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK.std"/>
                 <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->