From 00807359f5d971f9e45c5b1cc002d0bdf7b96f90 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sat, 29 Jun 2013 16:17:33 +0000
Subject: [PATCH] Remove elab namespace and elab:AthensPUIDAuthority from test
 aggregate. Convert the test aggregate back into a non-hierarchical aggregate
 to avoid members getting false positives when testing the new RSA+SHA-256
 signature profile.

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

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 7d811ec6..4fb146b0 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -627,7 +627,8 @@
         p:id="uk_testPipeline">
         <property name="composedStages">
             <list>
-                <ref bean="uk_assembleHierarchicalAggregate"/>
+                <ref bean="uk_assemble"/>
+                <ref bean="stripElabNamespace"/>                
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_addTrustRoots"/>
diff --git a/mdx/uk/ns_norm_test.xsl b/mdx/uk/ns_norm_test.xsl
index 292ee901..27f5a0f0 100644
--- a/mdx/uk/ns_norm_test.xsl
+++ b/mdx/uk/ns_norm_test.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">