From e56ea3260a8e99e6863e7555a881be5150adf5f4 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 31 Oct 2016 10:14:06 +0000
Subject: [PATCH] Move active eduGAIN configuration out to ukf-data

Resolves #37.
---
 build.xml                 | 2 ++
 mdx/int_edugain/beans.xml | 3 ++-
 mdx/int_edugain/verbs.xml | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 1347f905..7df0a07f 100644
--- a/build.xml
+++ b/build.xml
@@ -216,6 +216,7 @@
         External specialised directories.
     -->
     <property name="aggregates.dir" value="${shared.ws.dir}/${git.repo.project.products}/aggregates"/>
+    <property name="edugain.dir" value="${shared.ws.dir}/${git.repo.project.data}/edugain"/>
     <property name="entities.dir" value="${shared.ws.dir}/${git.repo.project.data}/entities"/>
     <property name="members.dir" value="${shared.ws.dir}/${git.repo.project.data}/members"/>
     <property name="output.dir" value="${shared.ws.dir}/build"/>
@@ -1399,6 +1400,7 @@
         by properties defined in the external properties files, e.g., build.properties.
     -->
     <property name="mda.java.endorsed.dirs" value="${tools.dir}/endorsed"/>
+    <property name="mda.edugain.dir" value="${edugain.dir}"/>
     <property name="mda.entities.dir" value="${entities.dir}"/>
     <property name="mda.mdx.dir" value="${mdx.dir}"/>
     <property name="mda.members.dir" value="${members.dir}"/>
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 7bf73818..05b7c9b3 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -15,7 +15,8 @@
     <!--
         Import additional channel-local beans.
     -->
-    <import resource="classpath:int_edugain/entity-blacklist.xml"/>
+    <import resource="file:${edugain.dir}/entity-blacklist.xml"/>
+    <import resource="file:${edugain.dir}/verify-blacklist.xml"/>
     
     <!--
         Location of various resources.
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index 538fbdaa..3a640dc5 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -21,7 +21,6 @@
         Import channel-specific beans.
     -->
     <import resource="classpath:int_edugain/beans.xml"/>
-    <import resource="classpath:int_edugain/verify-blacklist.xml"/>
     
     <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">