From c7c0b7480231bdaac952818b63b84b05f5be4d81 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 27 Jun 2012 10:52:22 +0000
Subject: [PATCH] Add eduGAIN handling for es_sir channel.

---
 build.xml            |  3 +-
 mdx/es_sir/beans.xml | 66 ++++++++++++++++++++++++++++++++++++++++----
 mdx/es_sir/verbs.xml | 35 +++++++++++++++++++----
 3 files changed, 92 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index ab68e7b0..e16a5338 100644
--- a/build.xml
+++ b/build.xml
@@ -861,7 +861,6 @@
         <CHANNEL.import channel="au_aaf"/>
         <CHANNEL.import channel="ca_caf"/>
         <CHANNEL.import channel="dk_wayf"/>
-        <CHANNEL.import channel="es_sir"/>
         <CHANNEL.import channel="eu_clarin"/>
         <CHANNEL.import channel="fi_haka"/>
         <CHANNEL.import channel="fr_renater"/>
@@ -895,6 +894,7 @@
     	<CHANNEL.do verb="importProduction" channel="ch_switchaai"/>
         <CHANNEL.do verb="importProduction" channel="cz_eduid"/>
     	<CHANNEL.do verb="importProduction" channel="de_dfnaai"/>
+    	<CHANNEL.do verb="importProduction" channel="es_sir"/>
     </target>
     
     <!--
@@ -908,6 +908,7 @@
         <CHANNEL.do verb="importEdugain" channel="ch_switchaai"/>
         <CHANNEL.do verb="importEdugain" channel="cz_eduid"/>
         <CHANNEL.do verb="importEdugain" channel="de_dfnaai"/>
+    	<CHANNEL.do verb="importEdugain" channel="es_sir"/>
     	<CHANNEL.do verb="importEdugain" channel="hr_eduhr"/>
     </target>
     
diff --git a/mdx/es_sir/beans.xml b/mdx/es_sir/beans.xml
index 1361de65..853af867 100644
--- a/mdx/es_sir/beans.xml
+++ b/mdx/es_sir/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="es_sir_productionAggregate_url" class="java.lang.String">
+        <constructor-arg value="https://www.rediris.es/sir/shib1metadata.xml"/>
+    </bean>
+    <bean id="es_sir_edugainAggregate_url" class="java.lang.String">
+        <constructor-arg value="https://www.rediris.es/sir/edugain-sir-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.rediris.es/sir/shib1metadata.xml"/>
+                <constructor-arg name="url"    ref="es_sir_productionAggregate_url"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        Fetch the eduGAIN export aggregate.
+    -->
+    <bean id="es_sir_edugainAggregate" parent="domResourceStage_parent"
+        p:id="es_sir_edugainAggregate">
+        <property name="domResource">
+            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url"    ref="es_sir_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="es_sir_exportedEntities" parent="composite_parent"
-        p:id="es_sir_exportedEntities">
+    <bean id="es_sir_productionEntities" parent="composite_parent"
+        p:id="es_sir_productionEntities">
         <property name="composedStages">
             <list>
-                <!-- no export aggregate; use the production one instead -->
                 <ref bean="es_sir_productionAggregate"/>
 
                 <!--
@@ -70,4 +92,38 @@
         </property>
     </bean>
     
+    <!--
+        Fetch and process the eduGAIN export entities as a collection.
+    -->
+    <bean id="es_sir_edugainEntities" parent="composite_parent"
+        p:id="es_sir_edugainEntities">
+        <property name="composedStages">
+            <list>
+                <ref bean="es_sir_edugainAggregate"/>
+                
+                <!--
+                    Check for fatal errors at the aggregate level:
+                        missing or expired validUntil attribute
+                        invalid signature
+                -->
+                <!--
+                    Aggregate does not include validUntil
+                    
+                    <ref bean="check_validUntil"/>
+                -->
+                <ref bean="es_sir_checkSignature"/>
+                <ref bean="errorTerminatingFilter"/>
+                
+                <ref bean="disassemble"/>
+                
+                <ref bean="standardImportActions"/>
+            </list>
+        </property>
+    </bean>
+    
+    <!--
+        Select primary export aggregate.
+    -->
+    <alias alias="es_sir_exportedAggregate" name="es_sir_edugainAggregate"/>
+    <alias alias="es_sir_exportedEntities"  name="es_sir_edugainEntities"/>
 </beans>
diff --git a/mdx/es_sir/verbs.xml b/mdx/es_sir/verbs.xml
index 52757fb9..bbd2cec5 100644
--- a/mdx/es_sir/verbs.xml
+++ b/mdx/es_sir/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="es_sir_exportedEntities"/>
+                <ref bean="es_sir_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="es_sir_productionAggregate"/>
@@ -51,4 +51,27 @@
         </property>
     </bean>
     
+    <bean id="importEdugain" parent="pipeline_parent"
+        p:id="importEdugain">
+        <property name="stages">
+            <list>
+                <ref bean="es_sir_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="es_sir_edugainAggregate"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
+    <alias alias="import"    name="importEdugain"/>
+    <alias alias="importRaw" name="importEdugainRaw"/>
 </beans>