From cb6022536d5a7cef37a61244f3068b39f610deba Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 10 Jun 2011 13:50:51 +0000
Subject: [PATCH] Support both production and test aggregates from eduGAIN.

---
 build.xml                           |  6 +++++
 mdx/edugain/edugain-beans.xml       | 20 +++++++++++++--
 mdx/edugain/edugain-import.xml      |  2 +-
 mdx/edugain/edugain-test-import.xml | 38 +++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 mdx/edugain/edugain-test-import.xml

diff --git a/build.xml b/build.xml
index 1b8ece86..9b724fba 100644
--- a/build.xml
+++ b/build.xml
@@ -1133,6 +1133,12 @@
         <echo>Completed eduGAIN import flow.</echo>
     </target>
     
+    <target name="flow.edugain.test.import">
+        <echo>Running eduGAIN test import flow.</echo>
+        <MDA config="${edugain.dir}/edugain-test-import.xml" out="${edugain.dir}/test-imported.xml"/>
+        <echo>Completed eduGAIN test import flow.</echo>
+    </target>
+    
     <!--
         *********************************
         ***                           ***
diff --git a/mdx/edugain/edugain-beans.xml b/mdx/edugain/edugain-beans.xml
index f80f154f..e9d6086e 100644
--- a/mdx/edugain/edugain-beans.xml
+++ b/mdx/edugain/edugain-beans.xml
@@ -9,8 +9,24 @@
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
     
-    <bean id="fetchEduGainExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
-        <property name="id" value="fetchEduGainExportAggregate"/>
+    <!--
+        fetchEduGainTestAggregate
+        
+        Fetches the eduGAIN test aggregate.
+    -->
+    <bean id="fetchEduGainTestAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
+        <property name="id" value="fetchEduGainTestAggregate"/>
+        <property name="parserPool" ref="parserPool"/>
+        <property name="sourceUrl" value="http://mds-test.edugain.org"/>
+    </bean>
+
+    <!--
+        fetchEduGainAggregate
+        
+        Fetches the eduGAIN production aggregate.
+    -->
+    <bean id="fetchEduGainAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
+        <property name="id" value="fetchEduGainAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="http://mds.edugain.org"/>
     </bean>
diff --git a/mdx/edugain/edugain-import.xml b/mdx/edugain/edugain-import.xml
index f882f64b..ac489743 100644
--- a/mdx/edugain/edugain-import.xml
+++ b/mdx/edugain/edugain-import.xml
@@ -23,7 +23,7 @@
         <property name="id" value="pipeline"/>
         <property name="stages">
             <list>
-                <ref bean="fetchEduGainExportAggregate"/>
+                <ref bean="fetchEduGainAggregate"/>
                 <ref bean="checkEdugainSignature"/>
                 <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
                 <ref bean="disassemble"/>
diff --git a/mdx/edugain/edugain-test-import.xml b/mdx/edugain/edugain-test-import.xml
new file mode 100644
index 00000000..5700560a
--- /dev/null
+++ b/mdx/edugain/edugain-test-import.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Import pipeline for test metadata from eduGAIN.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+    
+    <!--
+        Import commonly used beans.
+    -->
+    <import resource="../common-beans.xml"/>
+    
+    <!--
+        Import eduGAIN-specific beans.
+    -->
+    <import resource="edugain-beans.xml"/>
+    
+    <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
+        <property name="id" value="pipeline"/>
+        <property name="stages">
+            <list>
+                <ref bean="fetchEduGainTestAggregate"/>
+                <ref bean="checkEdugainSignature"/>
+                <ref bean="errorAnnouncingFilter"/><!-- should be fatal -->
+                <ref bean="disassemble"/>
+                
+                <ref bean="standardImportActions"/>
+                
+                <ref bean="standardImportTail"/>
+            </list>
+        </property>
+    </bean>
+
+</beans>