From 758b901d6694414736fdc8cd421ab37f0ce1da57 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 2 Mar 2012 18:28:30 +0000
Subject: [PATCH] Reimplement check.ports using the aggregator framework.
 Remove the (now unused) mdcheck tool, and all references to it.

---
 build.xml                              |  61 +------------------------
 mdx/uk/verbs.xml                       |  32 +++++++++++++
 tools/mdcheck/lib/sdss-mdcheck-1.3.jar | Bin 6812 -> 0 bytes
 3 files changed, 34 insertions(+), 59 deletions(-)
 delete mode 100644 tools/mdcheck/lib/sdss-mdcheck-1.3.jar

diff --git a/build.xml b/build.xml
index 884af7f9..54f6609e 100644
--- a/build.xml
+++ b/build.xml
@@ -51,7 +51,6 @@
 	<property name="tools.dir" value="tools"/>
 	<property name="tools.ant" value="${tools.dir}/ant"/>
 	<property name="tools.mda" value="${tools.dir}/mda"/>
-	<property name="tools.mdcheck" value="${tools.dir}/mdcheck"/>
     <property name="tools.mdnorm" value="${tools.dir}/mdnorm"/>
 	<property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
 	<property name="tools.xmlsectool" value="${tools.dir}/xmlsectool"/>
@@ -776,62 +775,6 @@
 		<echo>Checked.</echo>
 	</target>
 	
-	<!--
-		*****************************************
-		***                                   ***
-		***   M E T A D A T A   C H E C K S   ***
-		***                                   ***
-		*****************************************
-	-->
-
-	<!--
-	    Check a metadata document against a set of conventions.
-	    
-        Parameter 'i' is the file to be checked; no assumption is made
-        about its location so this must contain a full path.
-        
-	    Additional arguments are normally ruleset file names.
-	-->
-	<macrodef name="CHECK.base">
-        <attribute name="i"/>
-        <element name="base.args" implicit="yes"/>
-        <sequential>
-            <java classname="uk.ac.sdss.mdcheck.MetadataCheck"
-                fork="true" failonerror="true" maxmemory="${java.max.memory}">
-                <classpath>
-                    <fileset dir="${tools.mdcheck}/lib">
-                        <include name="*.jar"/>
-                    </fileset>
-                    <fileset dir="${tools.xalan}/lib">
-                        <include name="*.jar"/>
-                    </fileset>
-                </classpath>
-                <jvmarg value="-Djava.endorsed.dirs=${tools.xalan}/endorsed"/>
-                <arg value="@{i}"/>
-            	<base.args/>
-            </java>
-        </sequential>
-	</macrodef>
-	
-    <!--
-        Check a metadata document against a single ruleset file.
-        
-        Parameter 'i' is the file to be checked; no assumption is made
-        about its location so this must contain a full path.
-        
-        Parameter 's' is the checking stylesheet to use; assumed to be
-        present in the build.dir.
-    -->
-	<macrodef name="CHECK.one">
-        <attribute name="i"/>
-		<attribute name="s"/>
-        <sequential>
-            <CHECK.base i="@{i}">
-                <arg value="${build.dir}/@{s}"/>
-            </CHECK.base>
-        </sequential>
-	</macrodef>
-
     <!--
         *********************************************
         ***                                       ***
@@ -1171,9 +1114,9 @@
 	<!--
 	   Check for IdPs using the single-port configuration.
 	-->
-	<target name="check.ports" depends="flow.uk.collect">
+	<target name="check.ports">
 		<echo>Checking vhost use</echo>
-        <CHECK.one i="${uk.collected}" s="check_vhosts.xsl"/>
+        <CHANNEL.do verb="checkPorts" channel="uk"/>
         <echo>Checked.</echo>
 	</target>
 
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 4964b14d..e21c801b 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -82,6 +82,38 @@
         </property>
     </bean>
 
+    <!--
+        *********************************
+        ***                           ***
+        ***   C H E C K   P O R T S   ***
+        ***                           ***
+        *********************************
+    -->
+    
+    <bean id="checkPorts" p:id="checkPorts" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+        init-method="initialize" lazy-init="true">
+        <property name="stages">
+            <list>
+                <ref bean="uk_registeredEntities"/>
+                
+                <!--
+                    The next four stages ensure that any errors are reported
+                    in entity ID order, even on systems where the native order
+                    (which tends to reflect the file enumeration ordering)
+                    is arbitrary.  Ideally this should be handled by an optional
+                    ordering strategy on the announcing filter.
+                -->
+                <ref bean="uk_assemble"/>
+                <ref bean="disassemble"/>
+                <ref bean="populateItemIds"/>
+                <ref bean="uk_populateIds"/>
+                
+                <ref bean="check_vhosts"/>
+                <ref bean="errorAnnouncingFilter"/>
+            </list>
+        </property>
+    </bean>
+    
     <!--
         ***********************************
         ***                             ***
diff --git a/tools/mdcheck/lib/sdss-mdcheck-1.3.jar b/tools/mdcheck/lib/sdss-mdcheck-1.3.jar
deleted file mode 100644
index 3553e0451f47a7982c5d4d1af33d434fe399e42a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6812
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
UVEs`+7XcRmSf?rDLvcp>ALzLd_W%F@