Fatal error if any signature checks fail.

Fatal error if any other checks fail on the collection flow.
Requires a ukf-mda artifact bump to bring in the updated filter definition required.

mdx/aaf/aaf-import.xml

@@ -21,7 +21,10 @@
             <list>
                 <ref bean="fetchAafExportAggregate"/>
                 <ref bean="checkAafSignature"/>
-                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="disassemble"/>
 
                 <ref bean="standardImportActions"/>

mdx/arnes/arnes-import.xml

@@ -21,7 +21,10 @@
             <list>
                 <ref bean="fetchArnesExportAggregate"/>
                 <ref bean="checkArnesSignature"/>
-                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="disassemble"/>
 
                 <ref bean="standardImportActions"/>

mdx/caf/caf-import.xml

@@ -21,7 +21,10 @@
             <list>
                 <ref bean="fetchCafExportAggregate"/>
                 <ref bean="checkCafSignature"/>
-                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="disassemble"/>
 
                 <ref bean="standardImportActions"/>

mdx/common-beans.xml

@@ -124,6 +124,18 @@
         <property name="id" value="errorAnnouncingFilter"/>
     </bean>
 
+    <!--
+        errorTerminatingFilter
+        
+        A pipeline stage that checks for any errors, and then announces
+        and filters any encountered.
+    -->
+    <bean id="errorTerminatingFilter" class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="errorTerminatingFilter"/>
+        <property name="terminating" value="true"/>
+    </bean>
+
     <!--
         cleanImport
         

mdx/edugain/edugain-import.xml

@@ -25,7 +25,10 @@
             <list>
                 <ref bean="fetchEduGainAggregate"/>
                 <ref bean="checkEdugainSignature"/>
-                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="disassemble"/>
 
                 <ref bean="standardImportActions"/>

mdx/edugain/edugain-test-import.xml

@@ -25,7 +25,10 @@
             <list>
                 <ref bean="fetchEduGainTestAggregate"/>
                 <ref bean="checkEdugainSignature"/>
-                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="disassemble"/>
 
                 <ref bean="standardImportActions"/>

mdx/edugate/edugate-import.xml

@@ -21,7 +21,10 @@
             <list>
                 <ref bean="fetchEdugateExportAggregate"/>
                 <ref bean="checkEdugateSignature"/>
-                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="disassemble"/>
 
                 <ref bean="standardImportActions"/>

mdx/incommon/incommon-import.xml

@@ -21,7 +21,10 @@
             <list>
                 <ref bean="fetchInCommonExportAggregate"/>
                 <ref bean="checkInCommonSignature"/>
-                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="disassemble"/>
 
                 <ref bean="standardImportActions"/>

mdx/swamid/swamid-import.xml

@@ -21,7 +21,10 @@
             <list>
                 <ref bean="fetchSwamidExportAggregate"/>
                 <ref bean="checkSwamidSignature"/>
-                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="disassemble"/>
 
                 <ref bean="standardImportActions"/>

mdx/switch/switch-import.xml

@@ -21,7 +21,10 @@
             <list>
                 <ref bean="fetchSwitchExportAggregate"/>
                 <ref bean="checkSwitchSignature"/>
-                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="disassemble"/>
 
                 <ref bean="standardImportActions"/>

mdx/uk/uk-collect.xml

@@ -99,7 +99,10 @@
                 <ref bean="populateItemIds"/>
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK.std"/>
-                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+
+                <!-- failure of any check on registered metadata is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="assemble.uk"/>
 
                 <!--
@@ -124,7 +127,9 @@
                     fixed to use a parameter.
                 -->
                 <ref bean="check_check"/>
-                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+
+                <!-- failure of any check on registered metadata is fatal -->
+                <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="normaliseNamespaces"/>
             </list>