From 63dc303d6bb0990ed03d711b8c78ab1ae8859d97 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 24 Aug 2011 15:47:14 +0000
Subject: [PATCH] Provide checking-level access to the full Edugate production
 aggregate as well as the export one.

---
 build.xml                |  1 +
 mdx/ie_edugate/beans.xml | 26 ++++++++++++++++++++++++++
 mdx/ie_edugate/verbs.xml | 12 ++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/build.xml b/build.xml
index 48b09fc6..97c6806d 100644
--- a/build.xml
+++ b/build.xml
@@ -964,6 +964,7 @@
         <CHANNEL.import channel="gr_grnet"/>
         <CHANNEL.import channel="hu_eduid"/>
         <CHANNEL.import channel="ie_edugate"/>
+		<CHANNEL.do channel="ie_edugate" verb="importAll"/>
         <CHANNEL.import channel="int_edugain"/>
 		<CHANNEL.do channel="int_edugain" verb="testImport"/>
         <CHANNEL.import channel="it_idem"/>
diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
index 68c12302..abde8c2e 100644
--- a/mdx/ie_edugate/beans.xml
+++ b/mdx/ie_edugate/beans.xml
@@ -65,6 +65,32 @@
         <property name="maxValidityInterval" value="#{ 1000L * 60 * 60 * 24 * 14 }"/>
     </bean>
     
+    <!--
+        Fetch and process all entities as a collection.
+    -->
+    <bean id="ie_edugate_allEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="ie_edugate_allEntities"/>
+        <property name="composedStages">
+            <list>
+                <ref bean="ie_edugate_productionAggregate"/>
+                
+                <!--
+                    Check for fatal errors at the aggregate level:
+                        missing or expired validUntil attribute
+                        invalid signature
+                -->
+                <ref bean="ie_edugate_validUntil"/>
+                <ref bean="ie_edugate_checkSignature"/>
+                <ref bean="errorTerminatingFilter"/>
+                
+                <ref bean="disassemble"/>
+                
+                <ref bean="standardImportActions"/>
+            </list>
+        </property>
+    </bean>
+    
     <!--
         Fetch and process the exported entities as a collection.
     -->
diff --git a/mdx/ie_edugate/verbs.xml b/mdx/ie_edugate/verbs.xml
index 6d5cd72b..37c3fb8f 100644
--- a/mdx/ie_edugate/verbs.xml
+++ b/mdx/ie_edugate/verbs.xml
@@ -38,6 +38,18 @@
         </property>
     </bean>
     
+    <bean id="importAll" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="importAll"/>
+        <property name="stages">
+            <list>
+                <ref bean="ie_edugate_allEntities"/>
+                <ref bean="standardImportTail"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
     <bean id="importRaw" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
         <property name="id" value="importRaw"/>