Refactor CHECK macro so that any file can be checked; caller is now r…

…esponsible for providing the full location.

build.xml

@@ -336,7 +336,7 @@
 		<!-- [2] -->
 		<XALAN x="master_ukfederation.xsl" i="${master.file.name}"
 			o="${uk.master.file}" />
-		<CHECK i="${uk.master.file}"/>
+		<CHECK i="${xml.dir}/${uk.master.file}"/>
 	</target>
 
 	<target name="gen.uk.unsigned" depends="gen.uk.master">
@@ -542,6 +542,12 @@
 		*****************************************
 	-->
 
+	<!--
+		Check a metadata document against our local conventions.
+		
+		Parameter 'i' is the file to be checked; no assumption is made
+		about its location so this must contain a full path.
+	-->
 	<macrodef name="CHECK">
 		<attribute name="i"/>
 		<sequential>
@@ -552,15 +558,15 @@
 					<pathelement path="${bin.dir}"/>
 				</classpath>
 				<jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}"/>
-				<arg value="${xml.dir}/@{i}"/>
+				<arg value="@{i}"/>
 				<arg value="${build.dir}/check.xsl"/>
 			</java>
 		</sequential>
 	</macrodef>
 
 	<target name="err.test" depends="gen.uk.unsigned">
 		<echo>testing UK federation metadata</echo>
-		<CHECK i="${uk.metadata.unsigned}"/>
+		<CHECK i="${xml.dir}/${uk.metadata.unsigned}"/>
 		<echo>tested UK federation metadata</echo>
 	</target>