From 3ec876a85811810ecebd7dabaa5c9832f9ef9e1c Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 21 Jun 2010 15:52:25 +0000
Subject: [PATCH] Bugzilla 750: hoist "xml" namespace This turns out to be
 caused by a issue in one of the libraries underlying xmlsectool.  Work around
 this for now by passing the output from xmlsectool through Xalan again using
 an identity transform.  This strips the problematic declarations without
 affecting the signature.

---
 build.xml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index c864113a..e1171227 100644
--- a/build.xml
+++ b/build.xml
@@ -574,6 +574,10 @@
 		<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
 		<attribute name="o"/><!-- output file, assumed to be in the XML directory -->
 		<sequential>
+			<!-- delete the temporary file to be sure we don't use old data -->
+			<delete file="${xml.dir}/temp.xml" quiet="true" verbose="false"/>
+			
+			<!-- perform signing operation into temporary file -->
 			<XMLSECTOOL i="@{i}">
 				<args>
 					<arg value="--sign"/>
@@ -586,7 +590,7 @@
 					<arg value="--keyPassword"/>
 					<arg value="${keystore.pass}"/>
 					<arg value="--outFile"/>
-					<arg value="${xml.dir}/@{o}"/>
+					<arg value="${xml.dir}/temp.xml"/>
 					<arg value="--referenceIdAttributeName"/>
 					<arg value="ID"/>
 					<!--
@@ -594,6 +598,20 @@
 					-->
 				</args>
 			</XMLSECTOOL>
+			
+			<!--
+				Perform identity transform, into the real output file.
+				
+				This will remove some problematic "xml" namespace prefix
+				declarations without affecting the signature.
+			-->
+			<XALAN
+				i="temp.xml"
+				o="@{o}"
+				x="identity.xsl"/>
+			
+			<!-- delete the temporary file now that we're finished with it -->
+			<delete file="${xml.dir}/temp.xml" quiet="true" verbose="false"/>
 		</sequential>
 	</macrodef>