From e06bd2de4bec01e80f29237ba614bfc0b897b0f4 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 1 Aug 2016 15:38:00 +0100
Subject: [PATCH] Factor out a common temporary file location.

---
 build.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/build.xml b/build.xml
index 92bb2e89..fe375d63 100644
--- a/build.xml
+++ b/build.xml
@@ -213,6 +213,11 @@
         </classpath>
     </taskdef>
 
+    <!--
+        Full path to a commonly used temporary file.
+    -->
+    <property name="temp.xml" value="${temp.dir}/temp.xml"/>
+
     <!--
         There are many separate processing "streams":  production, test, export,
         fallback, "wayf", and "cdsall".
@@ -259,11 +264,6 @@
     -->
     <property name="java.max.memory" value="1024m"/>
 
-    <!--
-        Full paths to a couple of temporary file locations.
-    -->
-    <property name="temp.xml" value="${temp.dir}/temp.xml"/>
-
 
     <!--
         *************************************************
@@ -293,18 +293,18 @@
         <attribute name="i"/>
         <sequential>
             <echo>Verifying @{i}...</echo>
-            <delete file="${temp.dir}/temp.xml" quiet="true" verbose="false"/>
-            <get src="@{i}" dest="${temp.dir}/temp.xml"/>
+            <delete file="${temp.xml}" quiet="true" verbose="false"/>
+            <get src="@{i}" dest="${temp.xml}"/>
 
             <!--
                 Verify using xmlsectool.
             -->
-            <XMLSECTOOL.VFY.uk i="${temp.dir}/temp.xml"/>
+            <XMLSECTOOL.VFY.uk i="${temp.xml}"/>
 
             <!--
                 Delete the temporary file.
             -->
-            <delete file="${temp.dir}/temp.xml" quiet="true" verbose="false"/>
+            <delete file="${temp.xml}" quiet="true" verbose="false"/>
         </sequential>
     </macrodef>
 
@@ -319,23 +319,23 @@
         <attribute name="i"/>
         <sequential>
             <echo>Verifying @{i}...</echo>
-            <delete file="${temp.dir}/temp.xml" quiet="true" verbose="false"/>
-            <get src="@{i}" dest="${temp.dir}/temp.xml"/>
+            <delete file="${temp.xml}" quiet="true" verbose="false"/>
+            <get src="@{i}" dest="${temp.xml}"/>
 
             <!--
                 Verify using metadatatool.
             -->
-            <MDT.VFY.uk i="${temp.dir}/temp.xml"/>
+            <MDT.VFY.uk i="${temp.xml}"/>
 
             <!--
                 Verify using xmlsectool.
             -->
-            <XMLSECTOOL.VFY.uk i="${temp.dir}/temp.xml"/>
+            <XMLSECTOOL.VFY.uk i="${temp.xml}"/>
 
             <!--
                 Delete the temporary file.
             -->
-            <delete file="${temp.dir}/temp.xml" quiet="true" verbose="false"/>
+            <delete file="${temp.xml}" quiet="true" verbose="false"/>
         </sequential>
     </macrodef>
 
@@ -685,7 +685,7 @@
         <attribute name="digest"/><!-- digest function to use -->
         <sequential>
             <!-- delete the temporary file to be sure we don't use old data -->
-            <delete file="${temp.dir}/temp.xml" quiet="true" verbose="false"/>
+            <delete file="${temp.xml}" quiet="true" verbose="false"/>
 
             <echo>Signing @{i} using digest @{digest}.</echo>