Refactor mdx channels to move responsibility for most checking and re…

…porting/termination out of the beans.xml into verbs.xml or other callers.
InCommon · Aug 12, 2013 · b59fa1c · b59fa1c
1 parent 32a0358
commit b59fa1c
Showing 70 changed files with 151 additions and 481 deletions.
diff --git a/build.xml b/build.xml
@@ -970,6 +970,7 @@
         <CHANNEL.do verb="importProduction" channel="fr_renater"/>
     	<CHANNEL.do verb="importProduction" channel="gr_grnet"/>
     	<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="it_idem"/>
     	<CHANNEL.do verb="importProduction" channel="lv_laife"/>
@@ -1011,7 +1012,7 @@
         
         Verify the eduGAIN entities from a particular channel.
         
-        The intention is that this be called from the command line
+        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
@@ -1027,6 +1028,7 @@
         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>
 

diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
@@ -122,7 +122,7 @@
     </bean>
 
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="at_aconet_productionEntities" parent="CompositeStage"
         p:id="at_aconet_productionEntities">
@@ -140,18 +140,12 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="disassemble"/>
-
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
             </list>
         </property>
     </bean>
 
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="at_aconet_edugainEntities" parent="CompositeStage"
         p:id="at_aconet_edugainEntities">
@@ -170,46 +164,8 @@
 
                 <ref bean="disassemble"/>
 
-                <ref bean="at_aconet_default_regauth"/>
-                <ref bean="at_aconet_check_regauth"/>
-
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
-            </list>
-        </property>
-    </bean>
-
-    <!--
-        Verify the entities in the eduGAIN export aggregate.
-    -->
-    <bean id="at_aconet_verifyEdugain" parent="CompositeStage"
-        p:id="at_aconet_verifyEdugain">
-        <property name="composedStages">
-            <list>
-                <ref bean="at_aconet_edugainAggregate"/>
-
-                <!--
-                    Check for fatal errors at the aggregate level:
-                        missing or expired validUntil attribute
-                        invalid signature
-                -->
-                <ref bean="check_validUntil"/>
-                <ref bean="at_aconet_checkSignature"/>
-                <ref bean="errorTerminatingFilter"/>
-
-                <ref bean="disassemble"/>
-
-                <ref bean="at_aconet_default_regauth"/>
+                <ref bean="check_hasreginfo"/>
                 <ref bean="at_aconet_check_regauth"/>
-
-                <ref bean="standardVerifyActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
             </list>
         </property>
     </bean>

diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="at_aconet_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -77,7 +79,8 @@
         p:id="verifyEdugain">
         <property name="stages">
             <list>
-                <ref bean="at_aconet_verifyEdugain"/>
+                <ref bean="at_aconet_edugainEntities"/>
+                <ref bean="standardVerifyActions"/>
             </list>
         </property>
     </bean>

diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
@@ -46,7 +46,7 @@
     </bean>
 
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch the exported entities as a collection.
     -->
     <bean id="au_aaf_exportedEntities" parent="CompositeStage"
         p:id="au_aaf_exportedEntities">
@@ -65,12 +65,6 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="disassemble"/>
-
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
             </list>
         </property>
     </bean>

diff --git a/mdx/au_aaf/verbs.xml b/mdx/au_aaf/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="au_aaf_exportedEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>

diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
@@ -69,7 +69,7 @@
     </bean>
 
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="be_belnet_productionEntities" parent="CompositeStage"
         p:id="be_belnet_productionEntities">
@@ -87,18 +87,12 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="disassemble"/>
-
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
             </list>
         </property>
     </bean>
 
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="be_belnet_edugainEntities" parent="CompositeStage"
         p:id="be_belnet_edugainEntities">
@@ -116,12 +110,6 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="disassemble"/>
-
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
             </list>
         </property>
     </bean>

diff --git a/mdx/be_belnet/verbs.xml b/mdx/be_belnet/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="be_belnet_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="be_belnet_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>

diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
@@ -69,7 +69,7 @@
     </bean>
 
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="br_cafe_productionEntities" parent="CompositeStage"
         p:id="br_cafe_productionEntities">
@@ -86,18 +86,12 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="disassemble"/>
-
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
             </list>
         </property>
     </bean>
 
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="br_cafe_edugainEntities" parent="CompositeStage"
         p:id="br_cafe_edugainEntities">
@@ -115,12 +109,6 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="disassemble"/>
-
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
             </list>
         </property>
     </bean>

diff --git a/mdx/br_cafe/verbs.xml b/mdx/br_cafe/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="br_cafe_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="br_cafe_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>

diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
@@ -93,7 +93,7 @@
     </bean>
 
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="ca_caf_productionEntities" parent="CompositeStage"
         p:id="ca_caf_productionEntities">
@@ -111,18 +111,12 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="disassemble"/>
-
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
             </list>
         </property>
     </bean>
 
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="ca_caf_edugainEntities" parent="CompositeStage"
         p:id="ca_caf_edugainEntities">
@@ -140,12 +134,6 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="disassemble"/>
-
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
             </list>
         </property>
     </bean>

diff --git a/mdx/ca_caf/verbs.xml b/mdx/ca_caf/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="ca_caf_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="ca_caf_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>

diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
@@ -89,7 +89,7 @@
     </bean>
 
     <!--
-        Fetch and process the production entities as a collection.
+        Fetch the production entities as a collection.
     -->
     <bean id="ch_switchaai_productionEntities" parent="CompositeStage"
         p:id="ch_switchaai_productionEntities">
@@ -107,18 +107,12 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="disassemble"/>
-
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
             </list>
         </property>
     </bean>
 
     <!--
-        Fetch and process the eduGAIN export entities as a collection.
+        Fetch the eduGAIN export entities as a collection.
     -->
     <bean id="ch_switchaai_edugainEntities" parent="CompositeStage"
         p:id="ch_switchaai_edugainEntities">
@@ -136,12 +130,6 @@
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="disassemble"/>
-
-                <ref bean="standardImportActions"/>
-
-                <!-- Strip all entity attributes from this source. -->
-                <ref bean="stripMdattrNamespace"/>
-
             </list>
         </property>
     </bean>

diff --git a/mdx/ch_switchaai/verbs.xml b/mdx/ch_switchaai/verbs.xml
@@ -36,6 +36,7 @@
         <property name="stages">
             <list>
                 <ref bean="ch_switchaai_productionEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
@@ -57,6 +58,7 @@
         <property name="stages">
             <list>
                 <ref bean="ch_switchaai_edugainEntities"/>
+                <ref bean="standardImportActions"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>