Consistently apply the newer convention that template beans which dir…

…ectly instantiate classes are named after the class.
InCommon · Jun 7, 2013 · 76c4b7b · 76c4b7b
1 parent 8148054
commit 76c4b7b
Show file tree

Hide file tree

Showing 70 changed files with 474 additions and 474 deletions.
diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
@@ -15,7 +15,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="at_aconet_productionAggregate" parent="domResourceStage_parent"
+    <bean id="at_aconet_productionAggregate" parent="DomResourceSourceStage"
         p:id="at_aconet_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -48,7 +48,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="at_aconet_exportedEntities" parent="composite_parent"
+    <bean id="at_aconet_exportedEntities" parent="CompositeStage"
         p:id="at_aconet_exportedEntities">
         <property name="composedStages">
             <list>

diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:at_aconet/beans.xml"/>
 
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
 
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>

diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
@@ -15,7 +15,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="au_aaf_productionAggregate" parent="domResourceStage_parent"
+    <bean id="au_aaf_productionAggregate" parent="DomResourceSourceStage"
         p:id="au_aaf_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -48,7 +48,7 @@
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="au_aaf_exportedEntities" parent="composite_parent"
+    <bean id="au_aaf_exportedEntities" parent="CompositeStage"
         p:id="au_aaf_exportedEntities">
         <property name="composedStages">
             <list>

diff --git a/mdx/au_aaf/verbs.xml b/mdx/au_aaf/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:au_aaf/beans.xml"/>
 
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
 
-    <bean id="import" parent="pipeline_parent"
+    <bean id="import" parent="SimplePipeline"
         p:id="import">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
+    <bean id="importRaw" parent="SimplePipeline"
         p:id="importRaw">
         <property name="stages">
             <list>

diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="be_belnet_productionAggregate" parent="domResourceStage_parent"
+    <bean id="be_belnet_productionAggregate" parent="DomResourceSourceStage"
         p:id="be_belnet_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="be_belnet_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="be_belnet_edugainAggregate" parent="DomResourceSourceStage"
         p:id="be_belnet_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -71,7 +71,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="be_belnet_productionEntities" parent="composite_parent"
+    <bean id="be_belnet_productionEntities" parent="CompositeStage"
         p:id="be_belnet_productionEntities">
         <property name="composedStages">
             <list>
@@ -100,7 +100,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="be_belnet_edugainEntities" parent="composite_parent"
+    <bean id="be_belnet_edugainEntities" parent="CompositeStage"
         p:id="be_belnet_edugainEntities">
         <property name="composedStages">
             <list>

diff --git a/mdx/be_belnet/verbs.xml b/mdx/be_belnet/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:be_belnet/beans.xml"/>
 
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
 
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>

diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="br_cafe_productionAggregate" parent="domResourceStage_parent"
+    <bean id="br_cafe_productionAggregate" parent="DomResourceSourceStage"
         p:id="br_cafe_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="br_cafe_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="br_cafe_edugainAggregate" parent="DomResourceSourceStage"
         p:id="br_cafe_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -71,7 +71,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="br_cafe_productionEntities" parent="composite_parent"
+    <bean id="br_cafe_productionEntities" parent="CompositeStage"
         p:id="br_cafe_productionEntities">
         <property name="composedStages">
             <list>
@@ -99,7 +99,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="br_cafe_edugainEntities" parent="composite_parent"
+    <bean id="br_cafe_edugainEntities" parent="CompositeStage"
         p:id="br_cafe_edugainEntities">
         <property name="composedStages">
             <list>

diff --git a/mdx/br_cafe/verbs.xml b/mdx/br_cafe/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:br_cafe/beans.xml"/>
 
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
 
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>

diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="ca_caf_productionAggregate" parent="domResourceStage_parent"
+    <bean id="ca_caf_productionAggregate" parent="DomResourceSourceStage"
         p:id="ca_caf_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="ca_caf_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="ca_caf_edugainAggregate" parent="DomResourceSourceStage"
         p:id="ca_caf_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -95,7 +95,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="ca_caf_productionEntities" parent="composite_parent"
+    <bean id="ca_caf_productionEntities" parent="CompositeStage"
         p:id="ca_caf_productionEntities">
         <property name="composedStages">
             <list>
@@ -124,7 +124,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="ca_caf_edugainEntities" parent="composite_parent"
+    <bean id="ca_caf_edugainEntities" parent="CompositeStage"
         p:id="ca_caf_edugainEntities">
         <property name="composedStages">
             <list>

diff --git a/mdx/ca_caf/verbs.xml b/mdx/ca_caf/verbs.xml
@@ -22,7 +22,7 @@
     -->
     <import resource="classpath:ca_caf/beans.xml"/>
 
-    <bean id="serializeImported" parent="serialize_parent"
+    <bean id="serializeImported" parent="SerializationStage"
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
@@ -31,7 +31,7 @@
         </property>
     </bean>
 
-    <bean id="importProduction" parent="pipeline_parent"
+    <bean id="importProduction" parent="SimplePipeline"
         p:id="importProduction">
         <property name="stages">
             <list>
@@ -42,7 +42,7 @@
         </property>
     </bean>
 
-    <bean id="importProductionRaw" parent="pipeline_parent"
+    <bean id="importProductionRaw" parent="SimplePipeline"
         p:id="importProductionRaw">
         <property name="stages">
             <list>
@@ -52,7 +52,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugain" parent="pipeline_parent"
+    <bean id="importEdugain" parent="SimplePipeline"
         p:id="importEdugain">
         <property name="stages">
             <list>
@@ -63,7 +63,7 @@
         </property>
     </bean>
 
-    <bean id="importEdugainRaw" parent="pipeline_parent"
+    <bean id="importEdugainRaw" parent="SimplePipeline"
         p:id="importEdugainRaw">
         <property name="stages">
             <list>

diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
@@ -25,7 +25,7 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="ch_switchaai_productionAggregate" parent="domResourceStage_parent"
+    <bean id="ch_switchaai_productionAggregate" parent="DomResourceSourceStage"
         p:id="ch_switchaai_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -38,7 +38,7 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="ch_switchaai_edugainAggregate" parent="domResourceStage_parent"
+    <bean id="ch_switchaai_edugainAggregate" parent="DomResourceSourceStage"
         p:id="ch_switchaai_edugainAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
@@ -91,7 +91,7 @@
     <!--
         Fetch and process the production entities as a collection.
     -->
-    <bean id="ch_switchaai_productionEntities" parent="composite_parent"
+    <bean id="ch_switchaai_productionEntities" parent="CompositeStage"
         p:id="ch_switchaai_productionEntities">
         <property name="composedStages">
             <list>
@@ -120,7 +120,7 @@
     <!--
         Fetch and process the eduGAIN export entities as a collection.
     -->
-    <bean id="ch_switchaai_edugainEntities" parent="composite_parent"
+    <bean id="ch_switchaai_edugainEntities" parent="CompositeStage"
         p:id="ch_switchaai_edugainEntities">
         <property name="composedStages">
             <list>