From 868a852de7744c282176332e78baa6a17b240b04 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 13 Jun 2011 15:11:53 +0000
Subject: [PATCH] Rework edugate channel according to latest set of
 conventions.

---
 build.xml                                     |  4 +-
 mdx/edugate/beans.xml                         | 34 -----------
 mdx/ie-edugate/beans.xml                      | 61 +++++++++++++++++++
 mdx/{edugate => ie-edugate}/import.xml        | 18 ++----
 .../metadata-signer.crt                       |  0
 5 files changed, 68 insertions(+), 49 deletions(-)
 delete mode 100644 mdx/edugate/beans.xml
 create mode 100644 mdx/ie-edugate/beans.xml
 rename mdx/{edugate => ie-edugate}/import.xml (60%)
 rename mdx/{edugate => ie-edugate}/metadata-signer.crt (100%)

diff --git a/build.xml b/build.xml
index af030137..dbfc0226 100644
--- a/build.xml
+++ b/build.xml
@@ -1093,8 +1093,8 @@
 		<CHANNEL.import channel="cz-eduid"/>
 	</target>
 
-	<target name="flow.edugate.import">
-        <CHANNEL.import channel="edugate"/>
+	<target name="flow.ie-edugate.import">
+        <CHANNEL.import channel="ie-edugate"/>
     </target>
     
     <target name="flow.incommon.import">
diff --git a/mdx/edugate/beans.xml b/mdx/edugate/beans.xml
deleted file mode 100644
index 133ae9ba..00000000
--- a/mdx/edugate/beans.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Common beans for Edugate operations.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> 
-
-    <!--
-        Fetch the Edugate metadata aggregate.  For the moment, use the production aggregate in lieu
-        of a designated export aggregate.
-    -->
-    <bean id="fetchEdugateExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
-        <property name="id" value="fetchEdugateExportAggregate"/>
-        <property name="parserPool" ref="parserPool"/>
-        <property name="sourceUrl" value="https://edugate.heanet.ie/edugate-metadata-signed.xml"/>        
-    </bean>
-    
-    <!--
-        Edugate federation signing certificate.
-    -->
-    <bean id="edugateSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
-        <property name="certificateFile">
-            <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/edugate/metadata-signer.crt"/>
-            </bean>
-        </property>
-    </bean>
-    
-    <bean id="checkEdugateSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage">
-        <property name="id" value="checkEdugateSignature"/>
-        <property name="verificationCertificate" ref="edugateSigningCertificate"/>
-    </bean>
-    
-</beans>
diff --git a/mdx/ie-edugate/beans.xml b/mdx/ie-edugate/beans.xml
new file mode 100644
index 00000000..aaa7a31c
--- /dev/null
+++ b/mdx/ie-edugate/beans.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Common beans for this channel.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> 
+
+    <!--
+        Fetch the export metadata aggregate.
+        
+        For the moment, use the production aggregate in lieu of a designated export aggregate.
+    -->
+    <bean id="ie-edugate.fetchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="ie-edugate.fetchExportAggregate"/>
+        <property name="parserPool" ref="parserPool"/>
+        <property name="sourceUrl" value="https://edugate.heanet.ie/edugate-metadata-signed.xml"/>        
+    </bean>
+    
+    <!--
+        Metadata signing certificate.
+    -->
+    <bean id="ie-edugate.signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+        <property name="certificateFile">
+            <bean class="java.io.File">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ie-edugate/metadata-signer.crt"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        Check the signature on a document.
+    -->
+    <bean id="ie-edugate.checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="ie-edugate.checkSignature"/>
+        <property name="verificationCertificate" ref="ie-edugate.signingCertificate"/>
+    </bean>
+    
+    <!--
+        Fetch and process the exported entities as a collection.
+    -->
+    <bean id="ie-edugate.exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="ie-edugate.exportedEntities"/>
+        <property name="composedStages">
+            <list>
+                <ref bean="ie-edugate.fetchExportAggregate"/>
+                <ref bean="ie-edugate.checkSignature"/>
+                
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+                
+                <ref bean="disassemble"/>
+                
+                <ref bean="standardImportActions"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
diff --git a/mdx/edugate/import.xml b/mdx/ie-edugate/import.xml
similarity index 60%
rename from mdx/edugate/import.xml
rename to mdx/ie-edugate/import.xml
index cdfbde0f..f232fbfa 100644
--- a/mdx/edugate/import.xml
+++ b/mdx/ie-edugate/import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Import pipeline for metadata from Edugate.
+    Import pipeline for this channel.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> 
@@ -11,24 +11,16 @@
     <import resource="../common-beans.xml"/>
         
     <!--
-        Import Edugate-specific beans.
+        Import channel-specific beans.
     -->
     <import resource="beans.xml"/>
     
-    <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
+    <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+        init-method="initialize" lazy-init="true">
         <property name="id" value="pipeline"/>
         <property name="stages">
             <list>
-                <ref bean="fetchEdugateExportAggregate"/>
-                <ref bean="checkEdugateSignature"/>
-                
-                <!-- failure to validate signature is fatal -->
-                <ref bean="errorTerminatingFilter"/>
-                
-                <ref bean="disassemble"/>
-                
-                <ref bean="standardImportActions"/>
-                
+                <ref bean="ie-edugate.exportedEntities"/>
                 <ref bean="standardImportTail"/>
             </list>
         </property>
diff --git a/mdx/edugate/metadata-signer.crt b/mdx/ie-edugate/metadata-signer.crt
similarity index 100%
rename from mdx/edugate/metadata-signer.crt
rename to mdx/ie-edugate/metadata-signer.crt