From f31d88838c5e4d440a7103fdead548167495ea3e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 2 Jul 2013 14:11:13 +0000
Subject: [PATCH] Bugzilla 1013: add a new flow.uk.verify target and associated
 flow to verify UK-registered metadata.

---
 build.xml        | 12 ++++++++++++
 mdx/uk/verbs.xml | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/build.xml b/build.xml
index 2a24ebca..4b3bd543 100644
--- a/build.xml
+++ b/build.xml
@@ -354,6 +354,18 @@
     <target name="flow.uk.collect">
         <CHANNEL.do channel="uk" verb="collect"/>
     </target>
+	
+	<!--
+	    flow.uk.verify
+	    
+	    Runs the MDA on the uk channel's verify verb to verify that the UK-registered
+	    metadata passes all the checks that would be imposed during a signing run.
+	    
+	    No output files are produced by this operation.
+	-->
+	<target name="flow.uk.verify">
+        <CHANNEL.do channel="uk" verb="verify"/>
+	</target>
     
     <!--
         Unsigned metadata generation for the UK Federation.
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 84f5264b..e3f0b1de 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -79,6 +79,38 @@
         </property>
     </bean>
 
+    <!--
+        ***********************
+        ***                 ***
+        ***   V E R I F Y   ***
+        ***                 ***
+        ***********************
+    -->
+    
+    <bean id="verify" parent="SimplePipeline"
+        p:id="verify">
+        <property name="stages">
+            <list>
+                <!--
+                    uk_registeredEntities performs all
+                    per-entity checks and terminates if
+                    any of them fail.
+                -->
+                <ref bean="uk_registeredEntities"/>
+                
+                <!--
+                    Now build an aggregate so that we can perform
+                    checks across the whole aggregate, such as
+                    OrganizationDisplayName uniqueness.
+                -->
+                <ref bean="uk_assemble"/>
+                <ref bean="checkSchemas"/>
+                <ref bean="check_aggregate"/>
+                <ref bean="errorTerminatingFilter"/>
+            </list>
+        </property>
+    </bean>
+    
     <!--
         *********************************
         ***                           ***