Change criteria for hierarchical metadata aggregate: only present in …

…the inner aggregate if marked as being owned by a UK federation member.

The only entity for which this makes a difference is the Internet2 Spaces Wiki, which now appears in the outer aggregate.

mdx/uk/generate.xml

@@ -54,6 +54,18 @@
     -->
 
 
+    <!--
+        uk_memberEntitySelector
+        
+        Selection strategy which is true for entities owned by UK federation
+        members.
+    -->
+    <bean id="uk_memberEntitySelector" class="net.shibboleth.metadata.dom.XPathItemSelectionStrategy"
+        lazy-init="true">
+        <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.
@@ -70,7 +82,7 @@
                     init-method="initialize" lazy-init="true">
                     <property name="id" value="uk_buildNestedEntitiesDescriptor"/>
                     <property name="selectionStrategy">
-                        <bean class="uk.org.ukfederation.mda.UKEntitySelectionStrategy"/>
+                        <ref bean="uk_memberEntitySelector"/>
                     </property>
                     <property name="selectedItemPipeline">
                         <bean name="uk_assemblePipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline"