From ced373d7072b3cd79f1ff31860df1ba2211375a6 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 22 Feb 2012 14:53:43 +0000
Subject: [PATCH] Move mda version of the UK registrar checking ruleset into
 the mdx tree.

---
 mdx/uk/beans.xml                                    | 2 +-
 build/check_ukreg_mda.xsl => mdx/uk/check_ukreg.xsl | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename build/check_ukreg_mda.xsl => mdx/uk/check_ukreg.xsl (93%)

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 1ed2b323..0fd9b760 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -109,7 +109,7 @@
         <property name="id" value="check_ukreg"/>
         <property name="xslResource">
             <bean class="org.opensaml.util.resource.FilesystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/build/check_ukreg_mda.xsl"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_ukreg.xsl"/>
             </bean>
         </property>
         <property name="transformParameters">
diff --git a/build/check_ukreg_mda.xsl b/mdx/uk/check_ukreg.xsl
similarity index 93%
rename from build/check_ukreg_mda.xsl
rename to mdx/uk/check_ukreg.xsl
index 9ae3a58a..f065dd59 100644
--- a/build/check_ukreg_mda.xsl
+++ b/mdx/uk/check_ukreg.xsl
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-	check_ukreg_mda.xsl
+	check_ukreg.xsl
 	
 	Checking ruleset containing rules that only apply to metadata registered
 	by the UK federation's registrar function.
 	
-	Identical to check_ukreg except that it assumes a members bean passed
-	as parameter rather than loading one itself.
-	
 	Author: Ian A. Young <ian@iay.org.uk>
 
 -->
@@ -25,7 +22,7 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="check_framework.xsl"/>
+	<xsl:import href="../../build/check_framework.xsl"/>
 
 	
 	<!--