From 3663d68df2ee12504e9c029286c677a226e68c64 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 18 Jan 2010 15:26:15 +0000
Subject: [PATCH] Sign the ukfederation-test aggregate using xmltool instead of
 metadatatool.

---
 build.xml                | 2 +-
 build/uk_master_test.xsl | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index a4958663..48dc835e 100644
--- a/build.xml
+++ b/build.xml
@@ -638,7 +638,7 @@
 
 		<echo>Signing UK test metadata.</echo>
 		<!-- [28] -->
-		<SIGN.uk i="${md.test.unsigned}" o="${md.test.signed}"/>
+		<XMLTOOL.SIGN.uk i="${md.test.unsigned}" o="${md.test.signed}"/>
 
 		<echo>Signing UK export metadata.</echo>
 		<!-- [30] -->
diff --git a/build/uk_master_test.xsl b/build/uk_master_test.xsl
index 091dc3c2..1addd6bd 100644
--- a/build/uk_master_test.xsl
+++ b/build/uk_master_test.xsl
@@ -67,7 +67,8 @@
 	<!--
 		Comment to be added to the top of the document, and just inside the document element.
 	-->
-	<xsl:template name="document.comment">
+	<xsl:template name="document.comment">
+		<xsl:text>&#10;</xsl:text>
 		<xsl:comment>
 			<xsl:text>&#10;&#9;U K   F E D E R A T I O N   M E T A D A T A&#10;</xsl:text>
 			<xsl:text>&#10;</xsl:text>
@@ -83,6 +84,7 @@
 			<xsl:value-of select="$validUntil"/>
 			<xsl:text>&#10;</xsl:text>
 		</xsl:comment>
+		<xsl:text>&#10;</xsl:text>
 	</xsl:template>
 	
 	<!--