From 9945332f57ad08c45dcf47f75f8c7add16107d92 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 24 Jul 2018 15:47:03 +0100
Subject: [PATCH] Allow for multiple MDQ configurations

See incommon/inc-meta#91.
---
 build.xml                                      | 18 ++++++++++++++----
 ...ultisign.xml => mdq-multisign-localkey.xml} |  4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)
 rename mdx/incommon/{mdq-multisign.xml => mdq-multisign-localkey.xml} (96%)

diff --git a/build.xml b/build.xml
index 6e5b93fd..4b6a12d3 100644
--- a/build.xml
+++ b/build.xml
@@ -2641,21 +2641,31 @@
     </target>
 
     <!--
-        inc.generate.mdq
+        inc.mdq.generate.localkey
 
-        Generate per-entity metadata for the InCommon federation.
+        Generate per-entity metadata for the InCommon federation
+        using the localkey configuration.
     -->
-    <target name="inc.generate.mdq" depends="get.sign.uk.keyPassword">
+    <target name="inc.mdq.generate.localkey" depends="get.sign.uk.keyPassword">
         <property name="mda.mdq.input" value="${mda.inc.imported.xml}"/>
         <property name="mda.sign.keyPassword" value="${sign.uk.keyPassword}"/>
         <echo>Generating per-entity metadata in ${mda.mdq.output}</echo>
         <echo>    from unsigned aggregate in ${mda.mdq.input}</echo>
         <delete dir="${mdq.output.dir}" quiet="true"/>
         <mkdir dir="${mdq.output.dir}"/>
-        <CHANNEL.do channel="incommon" verb="mdq-multisign"/>
+        <CHANNEL.do channel="incommon" verb="mdq-multisign-localkey"/>
         <echo>Generation complete.</echo>
     </target>
 
+    <!--
+        inc.generate.mdq
+
+        Generate per-entity metadata for the InCommon federation.
+    -->
+    <target name="inc.generate.mdq" depends="inc.mdq.generate.localkey">
+        <!-- temporary alias for inc.mdq.generate.localkey -->
+    </target>
+
     <!--
         inc.edugain.report
 
diff --git a/mdx/incommon/mdq-multisign.xml b/mdx/incommon/mdq-multisign-localkey.xml
similarity index 96%
rename from mdx/incommon/mdq-multisign.xml
rename to mdx/incommon/mdq-multisign-localkey.xml
index 558ba5f8..49bac301 100644
--- a/mdx/incommon/mdq-multisign.xml
+++ b/mdx/incommon/mdq-multisign-localkey.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Generate and sign per-entity metadata.
+    Generate and sign per-entity metadata using a local private key resource.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
     default-lazy-init="true"
@@ -38,7 +38,7 @@
     <!--
         Generate per-entity metadata.
     -->
-    <bean id="mdq-multisign" parent="mda.SimplePipeline">
+    <bean id="mdq-multisign-localkey" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <!--