Separate out definitions of MDA beans

All Shibboleth MDA abstract beans are now defined in mda-beans.xml, which is a first cut of a resource planned for inclusion in MDA 0.10.0.
internet2 · May 1, 2017 · 1350294 · 1350294
1 parent d0785b4
commit 1350294
Show file tree

Hide file tree

Showing 18 changed files with 529 additions and 411 deletions.
diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
@@ -95,7 +95,7 @@
     <!--
         Fetch the production entities as a collection.
     -->
-    <bean id="at_aconet_productionEntities" parent="CompositeStage">
+    <bean id="at_aconet_productionEntities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="at_aconet_productionAggregate"/>
@@ -117,7 +117,7 @@
     <!--
         Fetch the eduGAIN export entities as a collection.
     -->
-    <bean id="at_aconet_edugainEntities" parent="CompositeStage">
+    <bean id="at_aconet_edugainEntities" parent="mda.CompositeStage">
         <property name="composedStages">
             <list>
                 <ref bean="at_aconet_edugainAggregate"/>

diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
@@ -30,7 +30,7 @@
         </property>
     </bean>
 
-    <bean id="importProduction" parent="SimplePipeline">
+    <bean id="importProduction" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_productionEntities"/>
@@ -41,7 +41,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="SimplePipeline">
+    <bean id="importProductionRaw" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_productionAggregate"/>
@@ -50,7 +50,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugain" parent="SimplePipeline">
+    <bean id="importEdugain" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
@@ -61,7 +61,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugainRaw" parent="SimplePipeline">
+    <bean id="importEdugainRaw" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainAggregate"/>
@@ -70,17 +70,17 @@
         </property>
     </bean>
 
-    <bean id="verifyEdugain" parent="SimplePipeline">
+    <bean id="verifyEdugain" parent="mda.SimplePipeline">
         <property name="stages">
             <list>
                 <ref bean="at_aconet_edugainEntities"/>
                 <ref bean="standardImportActions"/>
 
-                <bean id="checkCertificates" parent="X509ValidationStage">
+                <bean id="checkCertificates" parent="mda.X509ValidationStage">
                     <property name="validators">
                         <list>
                             <!-- Error on RSA key length less than 2048 bits. -->
-                            <bean parent="X509RSAKeyLengthValidator"
+                            <bean parent="mda.X509RSAKeyLengthValidator"
                                 p:warningBoundary="0" p:errorBoundary="2048"/>
                         </list>
                     </property>
@@ -90,8 +90,7 @@
                     Remove a specific entity we know has a problem that it will take
                     a while to resolve.
                 -->
-                <bean id="filterEntities" parent="stage_parent"
-                    class="net.shibboleth.metadata.dom.saml.EntityFilterStage"
+                <bean id="filterEntities" parent="mda.EntityFilterStage"
                     p:whitelistingEntities="false">
                     <property name="designatedEntities">
                         <set>