From 9041716304c480e0e1e7408a6cc662b45214e87b Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 1 Sep 2011 09:15:55 +0000
Subject: [PATCH] Promote check_reqattr to be performed as one of the standard
 checks, now that our own metadata passes.

---
 build.xml                | 3 +--
 mdx/validation-beans.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index f40873ae..9b0441cd 100644
--- a/build.xml
+++ b/build.xml
@@ -774,7 +774,6 @@
 		<echo>Imported metadata to ${entities.dir}/imported.xml</echo>
         <CHECK.std i="${entities.dir}/imported.xml">
             <arg value="${build.dir}/check_imported.xsl"/>
-        	<arg value="${build.dir}/check_reqattr.xsl"/>
             <arg value="${build.dir}/check_vhosts.xsl"/>
         </CHECK.std>
 		<echo>Checked.</echo>
@@ -849,6 +848,7 @@
                 <arg value="${build.dir}/check_mdui.xsl"/>
                 <arg value="${build.dir}/check_misc.xsl"/>
                 <arg value="${build.dir}/check_namespaces.xsl"/>
+				<arg value="${build.dir}/check_reqattr.xsl"/>
 				<arg value="${build.dir}/check_saml2.xsl"/>
 				<arg value="${build.dir}/check_saml2meta.xsl"/>
                 <arg value="${build.dir}/check_shibboleth.xsl"/>
@@ -1158,7 +1158,6 @@
         <echo>Checking against future rulesets.</echo>
         <CHECK.base i="${uk.collected}">
             <arg value="${build.dir}/check_future.xsl"/>
-        	<arg value="${build.dir}/check_reqattr.xsl"/>
             <arg value="${build.dir}/check_saml2int.xsl"/>
         </CHECK.base>
     </target>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index d8b6ae7b..56fd22f6 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -291,6 +291,7 @@
                 <ref bean="check_mdui"/>
                 <ref bean="check_misc"/>
                 <ref bean="check_namespaces"/>
+                <ref bean="check_reqattr"/>
                 <ref bean="check_saml2"/>
                 <ref bean="check_saml2meta"/>
                 <ref bean="check_shibboleth"/>
@@ -308,7 +309,6 @@
             <list>
                 <ref bean="CHECK_std"/>
                 <ref bean="check_future"/>
-                <ref bean="check_reqattr"/>
                 <ref bean="check_saml2int"/>
             </list>
         </property>