From 79b53ba0349fdd13f674736ffb8efca753f60b10 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 17 Jun 2013 11:13:12 +0000
Subject: [PATCH] Add a verifyEdugain verb to the se_swamid channel, so that we
 can monitor things in Jenkins.

---
 build.xml               | 11 ++++++++++-
 mdx/common-beans.xml    | 35 +++++++++++++++++++++++++++++++++++
 mdx/se_swamid/beans.xml | 32 ++++++++++++++++++++++++++++++++
 mdx/se_swamid/verbs.xml |  9 +++++++++
 4 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 2c311e04..836891f7 100644
--- a/build.xml
+++ b/build.xml
@@ -992,7 +992,16 @@
     	<CHANNEL.do verb="importEdugain" channel="no_feide"/>
     	<CHANNEL.do verb="importEdugain" channel="se_swamid"/>
     </target>
-    
+
+    <!--
+        flow.verifyEdugain.all
+        
+        Verify the eduGAIN entities from all channels with this ability.
+    -->
+	<target name="flow.verifyEdugain.all">
+		<CHANNEL.do verb="verifyEdugain" channel="se_swamid"/>
+	</target>
+	
     <!--
         flow.importEdugainRaw.all
         
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index c3dd15e0..45dac399 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -644,6 +644,41 @@
         </property>
     </bean>
     
+    <!--
+        standardVerifyActions
+        
+        Standard actions performed on any metadata import channel when verifying the
+        entities instead of importing them.  The only difference between this and
+        standardImportActions is that an errorTerminatingFilter is used at the end
+        instead of an errorAnnouncingFilter.
+        
+        Assumes that the collection has been acquired, had its signature validated, and
+        disassembled into individual entities.
+    -->
+    <bean id="standardVerifyActions" parent="CompositeStage"
+        p:id="standardVerifyActions">
+        <property name="composedStages">
+            <list>
+                <ref bean="populateItemIds"/>
+                
+                <!--
+                    The following three namespaces are always stripped because they are
+                    specific to the UK registrar and can't be valid when imported from
+                    some other source.
+                -->
+                <ref bean="stripElabNamespace"/>
+                <ref bean="stripUkfedlabelNamespace"/>
+                <ref bean="stripWayfNamespace"/>
+                
+                <ref bean="cleanImport"/>
+                <ref bean="removeEmptyExtensions"/>
+                <ref bean="checkSchemas"/>
+                <ref bean="CHECK_imported"/>
+                <ref bean="errorTerminatingFilter"/>
+            </list>
+        </property>
+    </bean>
+    
     <!--
         Basic EntitiesDescriptor assembler pipeline stage.
     -->
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index 335fcbcc..215bef5a 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -187,6 +187,38 @@
         </property>
     </bean>
     
+    <!--
+        Verify the entities in the eduGAIN export aggregate.
+    -->
+    <bean id="se_swamid_verifyEdugain" parent="CompositeStage"
+        p:id="se_swamid_verifyEdugain">
+        <property name="composedStages">
+            <list>
+                <ref bean="se_swamid_edugainAggregate"/>
+                
+                <!--
+                    Check for fatal errors at the aggregate level:
+                        missing or expired validUntil attribute
+                        invalid signature
+                -->
+                <ref bean="check_validUntil"/>
+                <ref bean="se_swamid_checkSignature"/>
+                <ref bean="errorTerminatingFilter"/>
+                
+                <ref bean="disassemble"/>
+                
+                <ref bean="se_swamid_default_regauth"/>
+                <ref bean="se_swamid_check_regauth"/>
+                
+                <ref bean="standardVerifyActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
+            </list>
+        </property>
+    </bean>
+    
     <!--
         Select primary export aggregate.
     -->
diff --git a/mdx/se_swamid/verbs.xml b/mdx/se_swamid/verbs.xml
index f046e023..735be33b 100644
--- a/mdx/se_swamid/verbs.xml
+++ b/mdx/se_swamid/verbs.xml
@@ -73,6 +73,15 @@
         </property>
     </bean>
     
+    <bean id="verifyEdugain" parent="SimplePipeline"
+        p:id="verifyEdugain">
+        <property name="stages">
+            <list>
+                <ref bean="se_swamid_verifyEdugain"/>
+            </list>
+        </property>
+    </bean>
+    
     <alias alias="import"    name="importEdugain"/>
     <alias alias="importRaw" name="importEdugainRaw"/>
 </beans>