From ce4601dc81c3635387ccfdb2c4cd32f1d454fe17 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 3 Nov 2015 11:43:22 +0000
Subject: [PATCH] Retire HideFromWAYF extension from production aggregate.

Because they share namespace normalisation rules, this also removes the xmlns:wayf prefix declaration from the WAYF aggregate.
---
 mdx/uk/generate.xml   | 1 +
 mdx/uk/ns_norm_uk.xsl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 3f49a505..faafcb6b 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -335,6 +335,7 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
+                <ref bean="stripWayfNamespace"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_finaliseProduction"/>
                 <ref bean="uk_normaliseNamespaces"/>
diff --git a/mdx/uk/ns_norm_uk.xsl b/mdx/uk/ns_norm_uk.xsl
index b28c888d..f481d9bb 100644
--- a/mdx/uk/ns_norm_uk.xsl
+++ b/mdx/uk/ns_norm_uk.xsl
@@ -38,7 +38,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 saml"
+	exclude-result-prefixes="alg md mdattr saml 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">