From 36beb8dea16c2ea1b993f4804a77c7e24d4b4201 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 1 Aug 2013 15:09:29 +0000
Subject: [PATCH] Remove elab namespace and elab:AthensPUIDAuthority from
 production and wayf aggregates.

---
 mdx/uk/generate.xml   | 2 ++
 mdx/uk/ns_norm_uk.xsl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index cef582f5..34b34e6c 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -351,6 +351,7 @@
         <property name="stages">
             <list>
                 <ref bean="uk_assemble"/>
+                <ref bean="stripElabNamespace"/>                
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_addTrustRoots"/>
@@ -394,6 +395,7 @@
         <property name="stages">
             <list>
                 <ref bean="uk_assemble"/>
+                <ref bean="stripElabNamespace"/>                
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_finaliseProduction"/>
diff --git a/mdx/uk/ns_norm_uk.xsl b/mdx/uk/ns_norm_uk.xsl
index 0c036189..8246630b 100644
--- a/mdx/uk/ns_norm_uk.xsl
+++ b/mdx/uk/ns_norm_uk.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 saml"
+	exclude-result-prefixes="alg elab md mdattr saml"
 	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">