From ef6bbaa87a0c0d1621a9d9a48f37f0ac26d20ee5 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 27 Jun 2012 13:53:54 +0000
Subject: [PATCH] Add eduGAIN handling for it_idem channel.

---
 build.xml             |  3 ++-
 mdx/it_idem/beans.xml | 62 +++++++++++++++++++++++++++++++++++++++----
 mdx/it_idem/verbs.xml | 35 +++++++++++++++++++-----
 3 files changed, 88 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index c45580c6..6e1bc25a 100644
--- a/build.xml
+++ b/build.xml
@@ -867,7 +867,6 @@
 		<CHANNEL.do channel="ie_edugate" verb="importAll"/>
         <CHANNEL.import channel="int_edugain"/>
 		<CHANNEL.do channel="int_edugain" verb="testImport"/>
-        <CHANNEL.import channel="it_idem"/>
         <CHANNEL.import channel="jp_gakunin"/>
         <CHANNEL.import channel="lv_laife"/>
 		<CHANNEL.import channel="nl_surfconext"/>
@@ -894,6 +893,7 @@
     	<CHANNEL.do verb="importProduction" channel="fi_haka"/>
     	<CHANNEL.do verb="importProduction" channel="gr_grnet"/>
     	<CHANNEL.do verb="importProduction" channel="hu_eduid"/>
+    	<CHANNEL.do verb="importProduction" channel="it_idem"/>
     	<CHANNEL.do verb="importProduction" channel="nl_surfnet"/>
     </target>
     
@@ -913,6 +913,7 @@
     	<CHANNEL.do verb="importEdugain" channel="gr_grnet"/>
     	<CHANNEL.do verb="importEdugain" channel="hr_eduhr"/>
     	<CHANNEL.do verb="importEdugain" channel="hu_eduid"/>
+    	<CHANNEL.do verb="importEdugain" channel="it_idem"/>
     	<CHANNEL.do verb="importEdugain" channel="nl_surfnet"/>
     </target>
     
diff --git a/mdx/it_idem/beans.xml b/mdx/it_idem/beans.xml
index 9f64385f..185d1d8c 100644
--- a/mdx/it_idem/beans.xml
+++ b/mdx/it_idem/beans.xml
@@ -11,6 +11,16 @@
         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">
     
+    <!--
+        Location of various resources.
+    -->
+    <bean id="it_idem_productionAggregate_url" class="java.lang.String">
+        <constructor-arg value="https://www.idem.garr.it/docs/conf/signed-metadata.xml"/>
+    </bean>
+    <bean id="it_idem_edugainAggregate_url" class="java.lang.String">
+        <constructor-arg value="https://www.idem.garr.it/docs/conf/signed-edugain.metadata.xml"/>
+    </bean>
+    
     <!--
         Fetch the production aggregate.
     -->
@@ -19,7 +29,20 @@
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url" value="https://www.idem.garr.it/docs/conf/signed-metadata.xml"/>
+                <constructor-arg name="url"    ref="it_idem_productionAggregate_url"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        Fetch the eduGAIN export aggregate.
+    -->
+    <bean id="it_idem_edugainAggregate" parent="domResourceStage_parent"
+        p:id="it_idem_edugainAggregate">
+        <property name="domResource">
+            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url"    ref="it_idem_edugainAggregate_url"/>
             </bean>
         </property>
     </bean>
@@ -45,13 +68,12 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch and process the production entities as a collection.
     -->
-    <bean id="it_idem_exportedEntities" parent="composite_parent"
-        p:id="it_idem_exportedEntities">
+    <bean id="it_idem_productionEntities" parent="composite_parent"
+        p:id="it_idem_productionEntities">
         <property name="composedStages">
             <list>
-                <!-- no export aggregate; use the production one instead -->
                 <ref bean="it_idem_productionAggregate"/>
 
                 <!--
@@ -70,4 +92,34 @@
         </property>
     </bean>
     
+    <!--
+        Fetch and process the eduGAIN export entities as a collection.
+    -->
+    <bean id="it_idem_edugainEntities" parent="composite_parent"
+        p:id="it_idem_edugainEntities">
+        <property name="composedStages">
+            <list>
+                <ref bean="it_idem_edugainAggregate"/>
+                
+                <!--
+                    Check for fatal errors at the aggregate level:
+                        missing or expired validUntil attribute
+                        invalid signature
+                -->
+                <ref bean="check_validUntil"/>
+                <ref bean="it_idem_checkSignature"/>
+                <ref bean="errorTerminatingFilter"/>
+                
+                <ref bean="disassemble"/>
+                
+                <ref bean="standardImportActions"/>
+            </list>
+        </property>
+    </bean>
+    
+    <!--
+        Select primary export aggregate.
+    -->
+    <alias alias="it_idem_exportedAggregate" name="it_idem_edugainAggregate"/>
+    <alias alias="it_idem_exportedEntities"  name="it_idem_edugainEntities"/>
 </beans>
diff --git a/mdx/it_idem/verbs.xml b/mdx/it_idem/verbs.xml
index 068657a8..f0e1b24d 100644
--- a/mdx/it_idem/verbs.xml
+++ b/mdx/it_idem/verbs.xml
@@ -30,19 +30,19 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
-        p:id="import">
+    <bean id="importProduction" parent="pipeline_parent"
+        p:id="importProduction">
         <property name="stages">
             <list>
-                <ref bean="it_idem_exportedEntities"/>
+                <ref bean="it_idem_productionEntities"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
         </property>
     </bean>
-
-    <bean id="importRaw" parent="pipeline_parent"
-        p:id="importRaw">
+    
+    <bean id="importProductionRaw" parent="pipeline_parent"
+        p:id="importProductionRaw">
         <property name="stages">
             <list>
                 <ref bean="it_idem_productionAggregate"/>
@@ -51,4 +51,27 @@
         </property>
     </bean>
     
+    <bean id="importEdugain" parent="pipeline_parent"
+        p:id="importEdugain">
+        <property name="stages">
+            <list>
+                <ref bean="it_idem_edugainEntities"/>
+                <ref bean="standardImportTail"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="importEdugainRaw" parent="pipeline_parent"
+        p:id="importEdugainRaw">
+        <property name="stages">
+            <list>
+                <ref bean="it_idem_edugainAggregate"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
+    <alias alias="import"    name="importEdugain"/>
+    <alias alias="importRaw" name="importEdugainRaw"/>
 </beans>