From d38a4fc0bb353e3770fce8c383828db902e3d11f Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 4 Dec 2013 13:44:16 +0000
Subject: [PATCH] Drop unused hierarchical aggregate builder code.

---
 mdx/uk/generate.xml | 59 ---------------------------------------------
 1 file changed, 59 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 9aab089c..2d17ab59 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -272,65 +272,6 @@
     </bean>
     
     
-    <!--
-        ***********************************************************************
-        ***                                                                 ***
-        ***   H I E R A R C H I C A L   A G G R E G A T E   B U I L D E R   ***
-        ***                                                                 ***
-        ***********************************************************************
-    -->
-    
-    
-    <!--
-        uk_memberEntitySelector
-        
-        Selection strategy which is true for entities owned by UK federation
-        members.
-    -->
-    <bean id="uk_memberEntitySelector" class="net.shibboleth.metadata.dom.XPathItemSelectionStrategy">
-        <constructor-arg value="/md:EntityDescriptor[md:Extensions/ukfedlabel:UKFederationMember]"/>
-        <constructor-arg ref="commonNamespaces"/>
-    </bean>
-    
-    <!--
-        Assemble a nested EntitiesDescriptor structure with the
-        UK federation entities inside an inner element.
-    -->
-    <bean id="uk_assembleHierarchicalAggregate" parent="CompositeStage"
-        p:id="uk_assembleHierarchicalAggregate">
-        <property name="composedStages">
-            <list>
-                <!--
-                    Step 1: put all UK entities inside a UK-named EntitiesDescriptor
-                -->
-                <bean id="uk_buildNestedEntitiesDescriptor" parent="stage_parent"
-                    class="net.shibboleth.metadata.pipeline.SplitMergeStage"
-                    p:id="uk_buildNestedEntitiesDescriptor">
-                    <property name="selectionStrategy">
-                        <ref bean="uk_memberEntitySelector"/>
-                    </property>
-                    <property name="selectedItemPipeline">
-                        <bean name="uk_assemblePipeline" parent="SimplePipeline"
-                            p:id="uk_assemblePipeline">
-                            <property name="stages">
-                                <list>
-                                    <ref bean="uk_assemble"/>
-                                </list>
-                            </property>
-                        </bean>
-                    </property>
-                </bean>
-                
-                <!--
-                    Step 2: put that EntitiesDescriptor plus all remaining entities inside an
-                    anonymous outer EntitiesDescriptor.
-                -->
-                <ref bean="uk_assembleUnnamed"/>
-            </list>
-        </property>
-    </bean>
-
-
     <!--
         ***************************************************
         ***                                             ***