From 558d08f9b6353cff35518fa16e6c433427f596b9 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 27 Jun 2012 07:36:41 +0000
Subject: [PATCH] Add eduGAIN handling for cz_eduid.

---
 build.xml              |  3 ++
 mdx/cz_eduid/beans.xml | 62 ++++++++++++++++++++++++++++++++++++++----
 mdx/cz_eduid/verbs.xml | 35 ++++++++++++++++++++----
 3 files changed, 89 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index cf31cf6a..be3c088f 100644
--- a/build.xml
+++ b/build.xml
@@ -865,6 +865,7 @@
         <CHANNEL.import channel="ca_caf"/>
         <CHANNEL.import channel="ch_switchaai"/>
         <CHANNEL.import channel="cz_eduid"/>
+        <CHANNEL.do channel="cz_eduid" verb="importProduction"/>
         <CHANNEL.import channel="de_dfnaai"/>
         <CHANNEL.import channel="dk_wayf"/>
         <CHANNEL.import channel="es_sir"/>
@@ -936,6 +937,7 @@
 	<target name="flow.importProduction.all">
         <CHANNEL.do verb="importProduction" channel="be_belnet"/>
 		<CHANNEL.do verb="importProduction" channel="br_cafe"/>
+        <CHANNEL.do verb="importProduction" channel="cz_eduid"/>
 	</target>
 	
 	<!--
@@ -946,6 +948,7 @@
 	<target name="flow.importEdugain.all">
 		<CHANNEL.do verb="importEdugain" channel="be_belnet"/>
 		<CHANNEL.do verb="importEdugain" channel="br_cafe"/>
+        <CHANNEL.do verb="importEdugain" channel="cz_eduid"/>
 	</target>
 	
     <!--
diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
index d8e2462e..8579a63f 100644
--- a/mdx/cz_eduid/beans.xml
+++ b/mdx/cz_eduid/beans.xml
@@ -21,6 +21,16 @@
         See: http://www.eduid.cz/wiki/en/eduid/tech/details/index
     -->
     
+    <!--
+        Location of various resources.
+    -->
+    <bean id="cz_eduid_productionAggregate_url" class="java.lang.String">
+        <constructor-arg value="https://metadata.eduid.cz/entities/eduid"/>
+    </bean>
+    <bean id="cz_eduid_edugainAggregate_url" class="java.lang.String">
+        <constructor-arg value="https://metadata.eduid.cz/entities/eduid2edugain"/>
+    </bean>
+    
     <!--
         Fetch the production aggregate.
     -->
@@ -29,7 +39,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://metadata.eduid.cz/entities/eduid"/>
+                <constructor-arg name="url"    ref="cz_eduid_productionAggregate_url"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        Fetch the eduGAIN export aggregate.
+    -->
+    <bean id="cz_eduid_edugainAggregate" parent="domResourceStage_parent"
+        p:id="cz_eduid_edugainAggregate">
+        <property name="domResource">
+            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url"    ref="cz_eduid_edugainAggregate_url"/>
             </bean>
         </property>
     </bean>
@@ -55,13 +78,12 @@
     </bean>
     
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch and process the production entities as a collection.
     -->
-    <bean id="cz_eduid_exportedEntities" parent="composite_parent"
-        p:id="cz_eduid_exportedEntities">
+    <bean id="cz_eduid_productionEntities" parent="composite_parent"
+        p:id="cz_eduid_productionEntities">
         <property name="composedStages">
             <list>
-                <!-- no export aggregate; use the production one instead -->
                 <ref bean="cz_eduid_productionAggregate"/>
 
                 <!--
@@ -80,4 +102,34 @@
         </property>
     </bean>
     
+    <!--
+        Fetch and process the eduGAIN export entities as a collection.
+    -->
+    <bean id="cz_eduid_edugainEntities" parent="composite_parent"
+        p:id="cz_eduid_edugainEntities">
+        <property name="composedStages">
+            <list>
+                <ref bean="cz_eduid_edugainAggregate"/>
+                
+                <!--
+                    Check for fatal errors at the aggregate level:
+                        missing or expired validUntil attribute
+                        invalid signature
+                -->
+                <ref bean="check_validUntil"/>
+                <ref bean="cz_eduid_checkSignature"/>
+                <ref bean="errorTerminatingFilter"/>
+                
+                <ref bean="disassemble"/>
+                
+                <ref bean="standardImportActions"/>
+            </list>
+        </property>
+    </bean>
+
+    <!--
+        Select primary export aggregate.
+    -->
+    <alias alias="cz_eduid_exportedAggregate" name="cz_eduid_edugainAggregate"/>
+    <alias alias="cz_eduid_exportedEntities"  name="cz_eduid_edugainEntities"/>
 </beans>
diff --git a/mdx/cz_eduid/verbs.xml b/mdx/cz_eduid/verbs.xml
index 6c4f3e69..9d4699fc 100644
--- a/mdx/cz_eduid/verbs.xml
+++ b/mdx/cz_eduid/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="cz_eduid_exportedEntities"/>
+            <list>
+                <ref bean="cz_eduid_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="cz_eduid_productionAggregate"/>
@@ -51,4 +51,27 @@
         </property>
     </bean>
     
+    <bean id="importEdugain" parent="pipeline_parent"
+        p:id="importEdugain">
+        <property name="stages">
+            <list>
+                <ref bean="cz_eduid_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="cz_eduid_edugainAggregate"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
+    <alias alias="import"    name="importEdugain"/>
+    <alias alias="importRaw" name="importEdugainRaw"/>
 </beans>