From 7aaf03a99ed57afdcbc8e5e931ce7dd6e4dfd25d Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 20 Oct 2016 15:33:11 +0100
Subject: [PATCH] Consolidate parent beans for pipeline package

---
 mdx/common-beans.xml | 81 ++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 48 deletions(-)

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 3a736156..51849a44 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -56,14 +56,6 @@
     <bean id="component_parent" abstract="true"
         init-method="initialize" destroy-method="destroy"/>
     
-    <!--
-        SimplePipeline
-        
-        Parent for pipelines.
-    -->
-    <bean id="SimplePipeline" abstract="true" parent="component_parent"
-        class="net.shibboleth.metadata.pipeline.SimplePipeline"/>
-    
     <!--
         stage_parent
         
@@ -71,14 +63,6 @@
     -->
     <bean id="stage_parent" abstract="true" parent="component_parent"/>
     
-    <!--
-        CompositeStage
-        
-        Parent for composite stages.
-    -->
-    <bean id="CompositeStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.CompositeStage"/>
-
     <bean id="XMLSignatureSigningStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.XMLSignatureSigningStage"/>
 
@@ -197,27 +181,6 @@
         <property name="parserPool" ref="parserPool"/>
     </bean>
 
-    <!--
-        SerializationStage
-        
-        Parent for serialization stages.
-    -->
-    <bean id="SerializationStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.SerializationStage">
-        <property name="serializer" ref="serializer"/>
-    </bean>
-    
-    <!--
-        PipelineDemultiplexerStage
-        
-        Parent for demultiplexer stages.  Defaults to waiting for pipelines
-        to complete.
-    -->
-    <bean id="PipelineDemultiplexerStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.PipelineDemultiplexerStage"
-        p:waitingForPipelines="true"
-    />
-    
     <!--
         EntityRegistrationAuthorityFilterStage
         
@@ -230,6 +193,10 @@
 
     <bean id="DOMDocumentFactoryBean" abstract="true"
         class="net.shibboleth.ext.spring.factory.DOMDocumentFactoryBean"/>
+
+    <!-- PKCS11PrivateKeyFactoryBean is in MDA in V0.9.2. -->
+    <bean id="PKCS11PrivateKeyFactoryBean" abstract="true"
+        class="net.shibboleth.metadata.util.PKCS11PrivateKeyFactoryBean"/>
     
     <bean id="PrivateKeyFactoryBean" abstract="true"
         class="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"/>
@@ -260,25 +227,16 @@
     <bean id="NamespacesStrippingStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.NamespacesStrippingStage"/>
     
-    <bean id="PipelineMergeStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.PipelineMergeStage"/>
-
-    <bean id="PipelineMergeStage.deduplicate" abstract="true" parent="PipelineMergeStage"
-        p:collectionMergeStrategy-ref="deduplicateMergeStrategy"/>
-
     <bean id="SetCacheDurationStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.saml.SetCacheDurationStage"/>
 
     <bean id="SetValidUntilStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.saml.SetValidUntilStage"/>
 
-    <bean id="SplitMergeStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.SplitMergeStage"/>
-
     <bean id="XPathItemSelectionStrategy" abstract="true"
         class="net.shibboleth.metadata.dom.XPathItemSelectionStrategy"/>
     
-    <!-- *** Parent beans for entity attribute handling. -->
+    <!-- *** Parent beans for entity attribute handling. *** -->
     
     <bean id="EntityAttributeFilteringStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage"/>
@@ -295,7 +253,7 @@
     <bean id="RegistrationAuthorityMatcher" abstract="true"
         class="net.shibboleth.metadata.dom.saml.mdattr.RegistrationAuthorityMatcher"/>
     
-    <!-- *** Parent beans for X.509 Certificate validation. -->
+    <!-- *** Parent beans for X.509 Certificate validation. *** -->
 
     <bean id="X509ValidationStage" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.ds.X509ValidationStage"/>
@@ -311,6 +269,33 @@
     <bean id="X509RSAOpenSSLBlacklistValidator" abstract="true" parent="validator_parent"
         class="net.shibboleth.metadata.validate.x509.X509RSAOpenSSLBlacklistValidator"/>
 
+    <!-- *** Parent beans for net.shibboleth.metadata.pipeline package. *** -->
+
+    <bean id="CompositeStage" abstract="true" parent="stage_parent"
+        class="net.shibboleth.metadata.pipeline.CompositeStage"/>
+
+    <bean id="PipelineDemultiplexerStage" abstract="true" parent="stage_parent"
+        class="net.shibboleth.metadata.pipeline.PipelineDemultiplexerStage"
+        p:waitingForPipelines="true"
+    />
+
+    <bean id="PipelineMergeStage" abstract="true" parent="stage_parent"
+        class="net.shibboleth.metadata.pipeline.PipelineMergeStage"/>
+
+    <bean id="PipelineMergeStage.deduplicate" abstract="true" parent="PipelineMergeStage"
+        p:collectionMergeStrategy-ref="deduplicateMergeStrategy"/>
+
+    <bean id="SerializationStage" abstract="true" parent="stage_parent"
+        class="net.shibboleth.metadata.pipeline.SerializationStage">
+        <property name="serializer" ref="serializer"/>
+    </bean>
+
+    <bean id="SimplePipeline" abstract="true" parent="component_parent"
+        class="net.shibboleth.metadata.pipeline.SimplePipeline"/>
+
+    <bean id="SplitMergeStage" abstract="true" parent="stage_parent"
+        class="net.shibboleth.metadata.pipeline.SplitMergeStage"/>
+
     <!-- *** Parent beans for ukf-mda. *** -->
 
     <bean id="EntityAttributeAddingStage" abstract="true" parent="stage_parent"