remove UKFederationMember label from fallback and wayf aggregates

InCommon · Mar 7, 2022 · 170af39 · 170af39
1 parent 2fff433
commit 170af39
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 21 deletions.
diff --git a/mdx/uk/README.md b/mdx/uk/README.md
@@ -75,7 +75,5 @@ Status:
 
 Status:
 
-* The `production` aggregate does not include the `<UKFederationMember>` label (`ukf-meta#34`).
-
 * The `production` aggregate adds `<EncryptionMethod>` elements with AES128-CBC
   to SPs that have no block encryption methods listed
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
@@ -475,13 +475,6 @@
         p:XSLResource="classpath:uk/strip_extensions.xsl"/>
 
 
-    <!--
-        uk_strip_UKFederationMember
-    -->
-    <bean id="uk_strip_UKFederationMember" parent="mda.ElementStrippingStage"
-        p:elementNamespace-ref="ukfedlabel_namespace"
-        p:elementName="UKFederationMember"/>
-
     <!--
         ***********************************************
         ***                                         ***

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
@@ -302,7 +302,6 @@
                 <bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
                     p:flowName="production"/>
 
-                <ref bean="uk_strip_UKFederationMember"/>
                 <ref bean="assembleAggregate"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>
@@ -672,7 +671,6 @@
                 <bean id="flowConstraints" parent="ukf.FlowConstraintApplyingStage"
                     p:flowName="test"/>
 
-                <ref bean="uk_strip_UKFederationMember"/>
                 <ref bean="assembleAggregate"/>
                 <bean parent="mda.SetCacheDurationStage"
                     p:cacheDuration="${cacheDuration.aggregate.duration}"/>

diff --git a/mdx/uk/mdq-multisign.xml b/mdx/uk/mdq-multisign.xml
@@ -51,9 +51,6 @@
                     </property>
                 </bean>
 
-                <!-- Remove UKFederationLabel elements. -->
-                <ref bean="uk_strip_UKFederationMember"/>
-
                 <!--
                     Remove xsi elements and attributes.
 

diff --git a/mdx/uk/statistics-charting.xsl b/mdx/uk/statistics-charting.xsl
@@ -71,9 +71,6 @@
         <xsl:variable name="dualEntities" select="$entities[md:IDPSSODescriptor][md:SPSSODescriptor]"/>
         <xsl:variable name="dualEntityCount" select="count($dualEntities)"/>
 
-        <xsl:variable name="federationMemberEntityCount"
-            select="count($entities[md:Extensions/ukfedlabel:UKFederationMember])"/>
-
         <xsl:variable name="memberEntities"
             select="dyn:closure($members/members:Name, '$entities[md:Organization/md:OrganizationName = current()]')"/>
         <xsl:variable name="memberEntityCount"

diff --git a/mdx/uk/strip_extensions.xsl b/mdx/uk/strip_extensions.xsl
@@ -20,15 +20,12 @@
     <!--
         Pass through certain ukfedlabel namespace elements.
     -->
-    <xsl:template match="ukfedlabel:UKFederationMember | ukfedlabel:AccountableUsers">
+    <xsl:template match="ukfedlabel:AccountableUsers">
         <xsl:copy>
             <!--
                 Copy nested text and comments, but not attributes.
 
                 AccountableUsers does not have any attributes.
-
-                UKFederationMember does not have any attributes intended for
-                publication.
             -->
             <xsl:apply-templates select="text()|comment()"/>
         </xsl:copy>