From f3fbba5e5b7609b3e51d5b2518004bca21cc2fd7 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 2 Sep 2013 12:23:14 +0000
Subject: [PATCH] Bring the eduGAIN channel a little more in line with the
 others.

---
 mdx/int_edugain/beans.xml | 30 +++++++++++++++++++++---------
 mdx/int_edugain/verbs.xml |  2 ++
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 303d374b..5ab9c00b 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -19,27 +19,39 @@
     <import resource="classpath:hu_eduid/beans.xml"/>
     
     <!--
-        Fetch the eduGAIN test aggregate.
+        Location of various resources.
     -->
-    <bean id="int_edugain_testAggregate" parent="DomResourceSourceStage"
-        p:id="int_edugain_testAggregate">
+    <!-- production aggregate -->
+    <bean id="int_edugain_productionAggregate_url" class="java.lang.String">
+        <constructor-arg value="http://mds.edugain.org"/>
+    </bean>
+    <!-- test aggregate -->
+    <bean id="int_edugain_testAggregate_url" class="java.lang.String">
+        <constructor-arg value="http://mds-test.edugain.org"/>
+    </bean>
+
+    <!--
+        Fetches the eduGAIN production aggregate.
+    -->
+    <bean id="int_edugain_productionAggregate" parent="DomResourceSourceStage"
+        p:id="int_edugain_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url" value="http://mds-test.edugain.org"/>
+                <constructor-arg name="url" ref="int_edugain_productionAggregate_url"/>
             </bean>
         </property>
     </bean>
-
+    
     <!--
-        Fetches the eduGAIN production aggregate.
+        Fetch the eduGAIN test aggregate.
     -->
-    <bean id="int_edugain_productionAggregate" parent="DomResourceSourceStage"
-        p:id="int_edugain_productionAggregate">
+    <bean id="int_edugain_testAggregate" parent="DomResourceSourceStage"
+        p:id="int_edugain_testAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url" value="http://mds.edugain.org"/>
+                <constructor-arg name="url" ref="int_edugain_testAggregate_url"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index 5efe1acb..e16d7376 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -65,4 +65,6 @@
         </property>
     </bean>
     
+    <alias alias="import"    name="importProduction"/>
+    <alias alias="importRaw" name="importProductionRaw"/>
 </beans>