From cfd3b9a26068f2b2ff133dd4df8026ca62df647d Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sun, 1 Sep 2013 16:21:30 +0000
Subject: [PATCH] Remove (almost) all reference to the elab:AthensPUIDAuthority
 construct.  It remains in fragment files for OpenAthens virtual IdPs, and in
 the statistics transform which counts them.

---
 mdx/_rules/check_namespaces.xsl |  4 ---
 mdx/ns_norm.xsl                 |  7 ----
 mdx/uk/generate.xml             | 57 ++++++++++++++++++++++++++-------
 mdx/uk/ns_norm_back.xsl         |  1 -
 mdx/uk/ns_norm_cds.xsl          |  3 +-
 mdx/uk/ns_norm_export.xsl       |  3 +-
 mdx/uk/ns_norm_fragment.xsl     |  3 +-
 mdx/uk/ns_norm_test.xsl         |  3 +-
 mdx/uk/ns_norm_uk.xsl           |  3 +-
 mdx/uk/verbs.xml                |  1 -
 mdx/validation-beans.xml        |  2 +-
 11 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/mdx/_rules/check_namespaces.xsl b/mdx/_rules/check_namespaces.xsl
index 2a3f83f4..ac939ab1 100644
--- a/mdx/_rules/check_namespaces.xsl
+++ b/mdx/_rules/check_namespaces.xsl
@@ -47,10 +47,6 @@
 		<xsl:apply-templates/>
 	</xsl:template>
 	
-	<xsl:template match="elab:*">
-		<xsl:apply-templates/>
-	</xsl:template>
-	
 	<xsl:template match="hoksso:*">
 		<xsl:apply-templates/>
 	</xsl:template>
diff --git a/mdx/ns_norm.xsl b/mdx/ns_norm.xsl
index 2ab8cc67..1e71bc9c 100644
--- a/mdx/ns_norm.xsl
+++ b/mdx/ns_norm.xsl
@@ -36,7 +36,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -132,12 +131,6 @@
 		</xsl:element>
 	</xsl:template>
 	
-	<xsl:template match="elab:*">
-		<xsl:element name="elab:{local-name()}">
-			<xsl:apply-templates select="node()|@*"/>
-		</xsl:element>
-	</xsl:template>
-	
 	<xsl:template match="idpdisc:*">
 		<xsl:element name="idpdisc:{local-name()}">
 			<xsl:apply-templates select="node()|@*"/>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index c1acf412..de8ca906 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -183,6 +183,7 @@
                 <ref bean="check_aggregate"/>
                 <ref bean="check_filtered"/>
                 <ref bean="check_fixup_keyuse"/>
+                <ref bean="check_namespaces"/>
             </list>
         </property>
     </bean>
@@ -358,7 +359,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
-                <ref bean="stripElabNamespace"/>                
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_addTrustRoots"/>
@@ -408,7 +408,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
-                <ref bean="stripElabNamespace"/>                
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_finaliseProduction"/>
@@ -445,7 +444,6 @@
             <list>
                 <ref bean="stripComments"/>
                 
-                <ref bean="stripElabNamespace"/>
                 <ref bean="stripMdattrNamespace"/>
                 <ref bean="stripMdrpiNamespace"/>
                 <ref bean="stripUkfedlabelNamespace"/>
@@ -694,7 +692,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
-                <ref bean="stripElabNamespace"/>                
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_addTrustRoots"/>
@@ -771,8 +768,15 @@
                 <ref bean="uk_finaliseExport"/>
                 <ref bean="uk_normaliseExport"/>
                 
-                <!-- schema validity check MUST pass -->
+                <!--
+                    Schema validity and other checks MUST pass.
+                    
+                    These are a subset of the publishability tests applied to
+                    aggregates published to federation members.
+                -->
                 <ref bean="checkSchemas"/>
+                <ref bean="check_aggregate"/>
+                <ref bean="check_namespaces"/>
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="serializeUnsignedExportAggregate"/>
@@ -798,9 +802,41 @@
                 <ref bean="uk_registeredEntities"/>
                 
                 <!--
-                    Remove all "administrative" contacts.
+                    *******************************************************
+                    ***                                                 ***
+                    ***   R A W   R E G I S T R A R   E N T I T I E S   ***
+                    ***                                                 ***
+                    *******************************************************
+                    
+                    At this point, the collection contains only entities
+                    registered by the UK federation registrar.  The minimum
+                    changes possible have been performed, so that the statistics
+                    report can be as comprehensive as possible.
+                -->
+                
+                <!--
+                    Fork a new output pipeline for the registrar statistics.
+                -->
+                <bean id="rawRegistrarDemux" parent="PipelineDemultiplexerStage"
+                    p:id="rawRegistrarDemux">
+                    <property name="pipelineAndSelectionStrategies">
+                        <list>
+                            <bean class="net.shibboleth.utilities.java.support.collection.Pair">
+                                <constructor-arg ref="uk_statisticsPipeline"/>
+                                <constructor-arg ref="everythingSelector"/>
+                            </bean>
+                        </list>
+                    </property>
+                    <property name="waitingForPipelines" value="true"/>
+                </bean>
+                
+                <!--
+                    Remove constructs which we no longer publish to any
+                    external registry clients.
                 -->
                 <ref bean="uk_stripAdminContacts"/>
+                <ref bean="stripElabNamespace"/>                
+                <ref bean="removeEmptyExtensions"/>
                 
                 <!--
                     ***********************************************
@@ -814,8 +850,7 @@
                 -->
                 
                 <!--
-                    Fork into new pipelines for the export aggregate and for
-                    the registrar statistics.
+                    Fork a new output pipeline for the export aggregate.
                     
                     The export aggregate only includes UK-registered entities,
                     so the fork needs to occur before any others are introduced.
@@ -832,10 +867,6 @@
                                 <constructor-arg ref="uk_exportPipeline"/>
                                 <constructor-arg ref="uk_exportSelector"/>
                             </bean>
-                            <bean class="net.shibboleth.utilities.java.support.collection.Pair">
-                                <constructor-arg ref="uk_statisticsPipeline"/>
-                                <constructor-arg ref="everythingSelector"/>
-                            </bean>
                         </list>
                     </property>
                     <property name="waitingForPipelines" value="true"/>
@@ -846,6 +877,8 @@
                     
                     This is performed independently on the export pipeline because
                     selection for that pipeline is based on these same extensions.
+                    A better solution would be to extract the ExportOptIn label into
+                    an item metadata object, and move this section before the export fork.
                 -->
                 <ref bean="uk_stripExtensions"/>
                 <ref bean="removeEmptyExtensions"/>
diff --git a/mdx/uk/ns_norm_back.xsl b/mdx/uk/ns_norm_back.xsl
index 0f609631..934d9f74 100644
--- a/mdx/uk/ns_norm_back.xsl
+++ b/mdx/uk/ns_norm_back.xsl
@@ -27,7 +27,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
diff --git a/mdx/uk/ns_norm_cds.xsl b/mdx/uk/ns_norm_cds.xsl
index 77c06d1e..718dba73 100644
--- a/mdx/uk/ns_norm_cds.xsl
+++ b/mdx/uk/ns_norm_cds.xsl
@@ -11,7 +11,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -23,7 +22,7 @@
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	
-	exclude-result-prefixes="alg ds elab init md mdattr saml shibmd ukfedlabel wayf xsi"
+	exclude-result-prefixes="alg ds init md mdattr saml shibmd ukfedlabel wayf xsi"
 	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">
diff --git a/mdx/uk/ns_norm_export.xsl b/mdx/uk/ns_norm_export.xsl
index f7d723dc..64b3f559 100644
--- a/mdx/uk/ns_norm_export.xsl
+++ b/mdx/uk/ns_norm_export.xsl
@@ -27,7 +27,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -39,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 elab saml ukfedlabel wayf"
+	exclude-result-prefixes="alg md mdattr 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">
diff --git a/mdx/uk/ns_norm_fragment.xsl b/mdx/uk/ns_norm_fragment.xsl
index 9c3c1947..0cb99232 100644
--- a/mdx/uk/ns_norm_fragment.xsl
+++ b/mdx/uk/ns_norm_fragment.xsl
@@ -16,7 +16,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -28,7 +27,7 @@
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	
-	exclude-result-prefixes="elab md mdattr saml"
+	exclude-result-prefixes="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">
diff --git a/mdx/uk/ns_norm_test.xsl b/mdx/uk/ns_norm_test.xsl
index 27f5a0f0..a0d6c9ea 100644
--- a/mdx/uk/ns_norm_test.xsl
+++ b/mdx/uk/ns_norm_test.xsl
@@ -27,7 +27,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -39,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 elab md mdattr saml"
+	exclude-result-prefixes="alg 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">
diff --git a/mdx/uk/ns_norm_uk.xsl b/mdx/uk/ns_norm_uk.xsl
index 8246630b..b28c888d 100644
--- a/mdx/uk/ns_norm_uk.xsl
+++ b/mdx/uk/ns_norm_uk.xsl
@@ -27,7 +27,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -39,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 elab md mdattr saml"
+	exclude-result-prefixes="alg 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">
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 527de58a..e42f1c74 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -286,7 +286,6 @@
                 <ref bean="check_mdrpi"/>
                 <ref bean="check_mdui"/>
                 <ref bean="check_misc"/>
-                <ref bean="check_namespaces"/>
                 <ref bean="check_reqattr"/>
                 <ref bean="check_saml1"/>
                 <ref bean="check_saml2"/>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 921ddfd3..527503fe 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -719,7 +719,6 @@
                 <ref bean="check_mdrpi"/>
                 <ref bean="check_mdui"/>
                 <ref bean="check_misc"/>
-                <ref bean="check_namespaces"/>
                 <ref bean="check_reqattr"/>
                 <ref bean="check_saml1"/>
                 <ref bean="check_saml2"/>
@@ -740,6 +739,7 @@
             <list>
                 <ref bean="CHECK_std"/>
                 <ref bean="check_regscope"/>
+                <ref bean="check_namespaces"/>
             </list>
         </property>
     </bean>