From 3ce55358f76d643e67f3481f42cd0b3b0bfa9b6b Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 28 Aug 2009 16:23:14 +0000
Subject: [PATCH] Move the Xalan tool definition so that it's with the other
 tool definitions.  No functional change.

---
 build.xml | 60 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/build.xml b/build.xml
index a313aad8..413c3e9e 100644
--- a/build.xml
+++ b/build.xml
@@ -311,32 +311,6 @@
 		<echo>Generated unsigned metadata.</echo>
 	</target>
 	
-	<!--
-		Macro to run the Xalan XSLT engine, taking files from pre-defined
-		locations.
-	-->
-	<macrodef name="XALAN">
-		<attribute name="i"/>
-		<attribute name="o"/>
-		<attribute name="x"/>
-		<sequential>
-			<java fork="true" maxmemory="384m" failonerror="true" classname="org.apache.xalan.xslt.Process">
-				<classpath>
-					<fileset dir="${tools.xalan}/lib">
-						<include name="**/*.jar"/>
-					</fileset>
-				</classpath>
-				<jvmarg value="-Djava.endorsed.dirs=${tools.xalan}/endorsed"/>
-				<arg value="-IN"/>
-				<arg value="${xml.dir}/@{i}"/>
-				<arg value="-OUT"/>
-				<arg value="${xml.dir}/@{o}"/>
-				<arg value="-XSL"/>
-				<arg value="${build.dir}/@{x}"/>
-			</java>
-		</sequential>
-	</macrodef>
-
 	<!--
 		gen.entities
 		
@@ -535,6 +509,40 @@
 		</sequential>
 	</macrodef>
 	
+	<!--
+		*******************************
+		***                         ***
+		***   X A L A N   T O O L   ***
+		***                         ***
+		*******************************
+	-->
+	
+	<!--
+		Macro to run the Xalan XSLT engine, taking files from pre-defined
+		locations.
+	-->
+	<macrodef name="XALAN">
+		<attribute name="i"/>
+		<attribute name="o"/>
+		<attribute name="x"/>
+		<sequential>
+			<java fork="true" maxmemory="384m" failonerror="true" classname="org.apache.xalan.xslt.Process">
+				<classpath>
+					<fileset dir="${tools.xalan}/lib">
+						<include name="**/*.jar"/>
+					</fileset>
+				</classpath>
+				<jvmarg value="-Djava.endorsed.dirs=${tools.xalan}/endorsed"/>
+				<arg value="-IN"/>
+				<arg value="${xml.dir}/@{i}"/>
+				<arg value="-OUT"/>
+				<arg value="${xml.dir}/@{o}"/>
+				<arg value="-XSL"/>
+				<arg value="${build.dir}/@{x}"/>
+			</java>
+		</sequential>
+	</macrodef>
+
 	<!--
 		*******************************************
 		***                                     ***