From d81d1f0796d58d5311b0bbd293ff7e326d6fa3a2 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 12 Aug 2013 15:51:27 +0000
Subject: [PATCH] Corrections to int_edugain channel.

---
 build.xml                 | 54 +++++++++++++++++++--------------------
 mdx/int_edugain/beans.xml |  6 ++---
 mdx/int_edugain/verbs.xml | 14 +++++-----
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/build.xml b/build.xml
index a340382c..c984d78a 100644
--- a/build.xml
+++ b/build.xml
@@ -931,7 +931,7 @@
     </target>
     
     <target name="flow.int_edugain.testImport">
-        <CHANNEL.do channel="int_edugain" verb="testImport"/>
+        <CHANNEL.do channel="int_edugain" verb="importTest"/>
     </target>
 	
 	<target name="flow.test.all"
@@ -939,7 +939,6 @@
         <CHANNEL.import channel="au_aaf"/>
         <CHANNEL.import channel="eu_clarin"/>
         <CHANNEL.import channel="ie_edugate"/>
-        <CHANNEL.import channel="int_edugain"/>
 		<CHANNEL.import channel="nl_surfconext"/>
         <CHANNEL.import channel="uk_eduserv"/>
 		<CHANNEL.import channel="us_incommon"/>
@@ -968,6 +967,7 @@
     	<CHANNEL.do verb="importProduction" channel="hu_eduid"/>
     	<CHANNEL.do verb="importProduction" channel="ie_edugate"/>
     	<CHANNEL.do verb="importProduction" channel="in_infed"/>
+    	<CHANNEL.do verb="importProduction" channel="int_edugain"/>
     	<CHANNEL.do verb="importProduction" channel="it_idem"/>
     	<CHANNEL.do verb="importProduction" channel="jp_gakunin"/>
     	<CHANNEL.do verb="importProduction" channel="lv_laife"/>
@@ -1006,31 +1006,6 @@
     	<CHANNEL.do verb="importEdugain" channel="se_swamid"/>
     </target>
 
-    <!--
-        flow.verifyEdugain
-        
-        Verify the eduGAIN entities from a particular channel.
-        
-        The intention is that this be called within Jenkins
-        with the channel name passed as a property, e.g.:
-        
-            ant flow.verifyEdugain -Dchannel=se_swamid
-            
-    -->
-	<target name="flow.verifyEdugain">
-		<CHANNEL.do verb="verifyEdugain" channel="${channel}"/>
-	</target>
-	
-    <!--
-        flow.verifyEdugain.all
-        
-        Verify the eduGAIN entities from all channels with this ability.
-    -->
-	<target name="flow.verifyEdugain.all">
-        <CHANNEL.do verb="verifyEdugain" channel="at_aconet"/>
-		<CHANNEL.do verb="verifyEdugain" channel="se_swamid"/>
-	</target>
-	
     <!--
         flow.importEdugainRaw.all
         
@@ -1058,6 +1033,31 @@
         <CHANNEL.do verb="importEdugainRaw" channel="se_swamid"/>
     </target>
     
+    <!--
+        flow.verifyEdugain
+        
+        Verify the eduGAIN entities from a particular channel.
+        
+        The intention is that this be called within Jenkins
+        with the channel name passed as a property, e.g.:
+        
+            ant flow.verifyEdugain -Dchannel=se_swamid
+            
+    -->
+    <target name="flow.verifyEdugain">
+        <CHANNEL.do verb="verifyEdugain" channel="${channel}"/>
+    </target>
+    
+    <!--
+        flow.verifyEdugain.all
+        
+        Verify the eduGAIN entities from all channels with this ability.
+    -->
+    <target name="flow.verifyEdugain.all">
+        <CHANNEL.do verb="verifyEdugain" channel="at_aconet"/>
+        <CHANNEL.do verb="verifyEdugain" channel="se_swamid"/>
+    </target>
+    
 	<!--
 	    flow.importRaw.all
 	    
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index d8228aef..303d374b 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -65,10 +65,10 @@
     </bean>
     
     <!--
-        Fetch the exported entities as a collection.
+        Fetch the production entities as a collection.
     -->
-    <bean id="int_edugain_exportedEntities" parent="CompositeStage"
-        p:id="int_edugain_exportedEntities">
+    <bean id="int_edugain_productionEntities" parent="CompositeStage"
+        p:id="int_edugain_productionEntities">
         <property name="composedStages">
             <list>
                 <ref bean="int_edugain_productionAggregate"/>
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index 8a753215..5efe1acb 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -31,11 +31,11 @@
         </property>
     </bean>
     
-    <bean id="import" parent="SimplePipeline"
-        p:id="import">
+    <bean id="importProduction" parent="SimplePipeline"
+        p:id="importProduction">
         <property name="stages">
             <list>
-                <ref bean="int_edugain_exportedEntities"/>
+                <ref bean="int_edugain_productionEntities"/>
                 <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
@@ -43,8 +43,8 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="SimplePipeline"
-        p:id="importRaw">
+    <bean id="importProductionRaw" parent="SimplePipeline"
+        p:id="importProductionRaw">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_productionAggregate"/>
@@ -53,8 +53,8 @@
         </property>
     </bean>
     
-    <bean id="testImport" parent="SimplePipeline"
-        p:id="testImport">
+    <bean id="importTest" parent="SimplePipeline"
+        p:id="importTest">
         <property name="stages">
             <list>
                 <ref bean="int_edugain_testEntities"/>