From f82b9699447eec58f2ac0ee86eae00cec7d03d69 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 26 Nov 2019 13:55:36 +0000
Subject: [PATCH] Remove handling of old-style eduGAIN test aggregate

See ukf/ukf-meta#201.
---
 build.xml                 |  4 ----
 mdx/int_edugain/beans.xml | 47 ---------------------------------------
 mdx/int_edugain/verbs.xml | 12 ----------
 3 files changed, 63 deletions(-)

diff --git a/build.xml b/build.xml
index d49bd7c1..9acd1e74 100644
--- a/build.xml
+++ b/build.xml
@@ -2328,10 +2328,6 @@
         <CHANNEL.import channel="${channel}"/>
     </target>
 
-    <target name="flow.int_edugain.testImport">
-        <CHANNEL.do channel="int_edugain" verb="importTest"/>
-    </target>
-
     <!--
         flow.verify.cobweb
 
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index e8e2e62c..7a6e3c6a 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -25,10 +25,6 @@
     <bean id="int_edugain_productionAggregate_url" parent="String">
         <constructor-arg value="https://mds.edugain.org/edugain-v1.xml"/>
     </bean>
-    <!-- test aggregate -->
-    <bean id="int_edugain_testAggregate_url" parent="String">
-        <constructor-arg value="http://mds-test.edugain.org"/>
-    </bean>
 
     <!--
         Fetches the eduGAIN production aggregate.
@@ -43,19 +39,6 @@
         </property>
     </bean>
 
-    <!--
-        Fetch the eduGAIN test aggregate.
-    -->
-    <bean id="int_edugain_testAggregate" parent="mda.DOMResourceSourceStage">
-        <property name="parserPool" ref="parserPool"/>
-        <property name="DOMResource">
-            <bean parent="HTTPResource">
-                <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url" ref="int_edugain_testAggregate_url"/>
-            </bean>
-        </property>
-    </bean>
-
     <!--
         eduGAIN signing certificate.
     -->
@@ -106,34 +89,4 @@
         </property>
     </bean>
 
-    <!--
-        Fetch the test entities as a collection.
-    -->
-    <bean id="int_edugain_testEntities" parent="mda.CompositeStage">
-        <property name="composedStages">
-            <list>
-                <ref bean="int_edugain_testAggregate"/>
-
-                <!--
-                    Check for fatal errors at the aggregate level:
-                        missing or expired validUntil attribute
-                        invalid signature
-                -->
-                <ref bean="check_validUntil"/>
-                <ref bean="int_edugain_checkSignature"/>
-                <ref bean="errorTerminatingFilter"/>
-
-                <ref bean="disassemble"/>
-
-                <ref bean="int_edugain_removeBlacklistedEntities"/>
-
-                <!--
-                    All eduGAIN entities should have mdrpi:RegistrationInfo elements, but
-                    we can't check the actual values.
-                -->
-                <ref bean="check_hasreginfo"/>
-            </list>
-        </property>
-    </bean>
-
 </beans>
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index 015037a1..d73af754 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -81,18 +81,6 @@
         </property>
     </bean>
 
-    <bean id="importTest" parent="mda.SimplePipeline">
-        <property name="stages">
-            <list>
-                <ref bean="int_edugain_testEntities"/>
-                <ref bean="standardImportActions"/>
-                <ref bean="edugainPolicy"/>
-                <ref bean="standardImportTail"/>
-                <ref bean="serializeImported"/>
-            </list>
-        </property>
-    </bean>
-
     <!--
         verify