From 6a7c4578794ab6ab8f323a0ebda6f8d12d0be487 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 3 Sep 2019 15:02:28 +0100
Subject: [PATCH] Simplify rules for export aggregate

Remove from both export aggregates:
* Filter for SAML-1-only IdPs (we no longer have any registered)
* Filter for a specific entity that is no longer registered.
See ukf/ukf-meta#190.
---
 mdx/uk/generate.xml | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index e51c2b06..f701d70d 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -657,13 +657,6 @@
                             <property name="stages">
                                 <list>
 
-                                    <!-- Identity providers lacking support for SAML 2.0 -->
-                                    <bean id="SAML1onlyIdPs" parent="mda.XPathFilteringStage"
-                                        p:namespaceContext-ref="commonNamespaces"
-                                        p:XPathExpression="md:IDPSSODescriptor
-                                        [not(contains(@protocolSupportEnumeration,'urn:oasis:names:tc:SAML:2.0:protocol'))]">
-                                    </bean>
-
                                     <!-- Aggregated schools sector identity providers -->
                                     <!--
                                         Preferred implementation:
@@ -678,14 +671,6 @@
                                     <bean id="syntheticScopes" parent="mda.XPathFilteringStage"
                                         p:namespaceContext-ref="commonNamespaces"
                                         p:XPathExpression="//shibmd:Scope[contains(., '.eng.ukfederation.org.uk')]"/>
-                                    <!-- Specific providers not caught by the previous condition -->
-                                    <bean id="GlowScotland" parent="mda.EntityFilterStage">
-                                        <property name="designatedEntities">
-                                            <set>
-                                                <value>https://idp.glowscotland.org.uk/shibboleth</value>
-                                            </set>
-                                        </property>
-                                    </bean>
 
                                     <!-- Identity providers with regular expression scopes -->
                                     <bean id="regexScopes" parent="mda.XPathFilteringStage"
@@ -772,13 +757,6 @@
                             <property name="stages">
                                 <list>
 
-                                    <!-- Identity providers lacking support for SAML 2.0 -->
-                                    <bean id="SAML1onlyIdPs" parent="mda.XPathFilteringStage"
-                                        p:namespaceContext-ref="commonNamespaces"
-                                        p:XPathExpression="md:IDPSSODescriptor
-                                            [not(contains(@protocolSupportEnumeration,'urn:oasis:names:tc:SAML:2.0:protocol'))]">
-                                    </bean>
-
                                     <!-- Aggregated schools sector identity providers -->
                                     <!--
                                         Preferred implementation:
@@ -793,14 +771,6 @@
                                     <bean id="syntheticScopes" parent="mda.XPathFilteringStage"
                                         p:namespaceContext-ref="commonNamespaces"
                                         p:XPathExpression="//shibmd:Scope[contains(., '.eng.ukfederation.org.uk')]"/>
-                                    <!-- Specific providers not caught by the previous condition -->
-                                    <bean id="GlowScotland" parent="mda.EntityFilterStage">
-                                        <property name="designatedEntities">
-                                            <set>
-                                                <value>https://idp.glowscotland.org.uk/shibboleth</value>
-                                            </set>
-                                        </property>
-                                    </bean>
 
                                     <!-- Identity providers with regular expression scopes -->
                                     <bean id="regexScopes" parent="mda.XPathFilteringStage"