Bring the eduGAIN channel a little more in line with the others.

InCommon · Sep 2, 2013 · f3fbba5 · f3fbba5
1 parent fd74df8
commit f3fbba5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git 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
@@ -65,4 +65,6 @@
         </property>
     </bean>
 
+    <alias alias="import"    name="importProduction"/>
+    <alias alias="importRaw" name="importProductionRaw"/>
 </beans>