From f313cdacf175c3deac3b350d72b643eec9a6e5c9 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 10 Apr 2013 15:27:51 +0000
Subject: [PATCH] Remove wayf and all ukfedlabel extensions (not just the ones
 we regard as unpublishable for all aggregates) from the export aggregate, to
 correspond with the current draft of FTS 1.4.  I have confirmed with Glenn
 Wearen at Edugate that this will not cause issues for them. This means that
 everything in the export aggregate is standardised rather than UK-defined. 
 If we need any of this functionality in the future, we'd reintroduce it using
 entity attributes in some form.

---
 mdx/uk/generate.xml       | 3 ++-
 mdx/uk/ns_norm_export.xsl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 67296377..ed275b98 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -500,7 +500,8 @@
         p:id="uk_exportPipeline">
         <property name="stages">
             <list>
-                <ref bean="uk_stripExtensions"/>
+                <ref bean="stripUkfedlabelNamespace"/>
+                <ref bean="stripWayfNamespace"/>
                 <ref bean="stripKeyNames"/>
                 <ref bean="uk_assemble"/>
                 <ref bean="removeEmptyExtensions"/>
diff --git a/mdx/uk/ns_norm_export.xsl b/mdx/uk/ns_norm_export.xsl
index 1e1cbcdb..f7d723dc 100644
--- a/mdx/uk/ns_norm_export.xsl
+++ b/mdx/uk/ns_norm_export.xsl
@@ -39,7 +39,7 @@
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	
-	exclude-result-prefixes="alg md mdattr elab saml"
+	exclude-result-prefixes="alg md mdattr elab saml ukfedlabel wayf"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">