From 60013162475314f8210e87bf16e0a87aab63260b Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 27 Oct 2016 15:23:36 +0100
Subject: [PATCH] Revert "Split out setting the mda keyPassword property into a
 separate target"

This reverts commit 653948fd7ed89b9ff4e96113d1e4510f3f3841ac.
---
 build.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index eca51db1..b5149b14 100644
--- a/build.xml
+++ b/build.xml
@@ -1739,9 +1739,6 @@
         <input addproperty="sign.uk.keyPassword">
             Please enter the password for the keystores:
         </input>
-    </target>
-    
-    <target name="set.mda.sign.uk.keyPassword">
         <property name="mda.sign.keyPassword" value="${sign.uk.keyPassword}"/>
     </target>
 
@@ -1760,7 +1757,7 @@
     <!--
       Signs the unsigned aggregates
     -->
-    <target name="samlmd.aggregates.sign" depends="get.sign.uk.keyPassword, set.mda.sign.uk.keyPassword">
+    <target name="samlmd.aggregates.sign" depends="get.sign.uk.keyPassword">
         <echo>Signing unsigned aggregates.</echo>
 
         <echo>Signing UKfed prod metadata.</echo>
@@ -1819,7 +1816,7 @@
         individual documents and write them as individual files into a
         destination directory.
     -->
-    <target name="samlmd.mdq.sign" depends="get.sign.uk.keyPassword, set.mda.sign.uk.keyPassword">
+    <target name="samlmd.mdq.sign" depends="get.sign.uk.keyPassword">
         <property name="mda.mdq.input" value="${output.dir}/${mdaggr.prod.unsigned}"/>
         <echo>Generating per-entity metadata in ${mda.mdq.output}</echo>
         <echo>    from production aggregate in ${mda.mdq.input}</echo>
@@ -1834,7 +1831,7 @@
         entity rather than the whole production aggregate, because dev environment
         PKCS#11 tokens are not fast enough to sign everything.
     -->
-    <target name="samlmd.mdq.sign.test" depends="get.sign.uk.keyPassword, set.mda.sign.uk.keyPassword">
+    <target name="samlmd.mdq.sign.test" depends="get.sign.uk.keyPassword">
         <property name="mda.mdq.input" value="${entities.dir}/uk000006.xml"/>
         <echo>Generating per-entity metadata in ${mda.mdq.output}</echo>
         <echo>    from test metadata in ${mda.mdq.input}</echo>