Implement new checking for duplicate IdP display names via a new stag…

…e defined in ukf-mda 0.7.2.

This fixes the problem we were having with multi-language IdPs which didn't really have translations, adds ignoring of leading and trailing whitespace in comparisons, and clears bugzilla 803 (take mdui:DisplayName into account) and bugzilla 933 (perform case-insensitive comparisons) as well.

mdx/uk/beans.xml

@@ -376,6 +376,7 @@
                 <ref bean="check_ukreg"/>
                 <ref bean="mdui_dn_en_present"/>
                 <ref bean="mdui_dn_en_match"/>
+                <ref bean="check_dup_display"/>
 
                 <!-- failure of any check on registered metadata is fatal -->
                 <ref bean="errorTerminatingFilter"/>

mdx/uk/generate.xml

@@ -351,6 +351,12 @@
         p:id="uk_productionPipeline">
         <property name="stages">
             <list>
+                <!--
+                    Enforce IdP display name uniqueness before assembling aggregate
+                -->
+                <ref bean="check_dup_display"/>
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="uk_assemble"/>
                 <ref bean="stripElabNamespace"/>                
                 <ref bean="fixup_EncryptionMethod"/>
@@ -395,6 +401,12 @@
         p:id="uk_wayfPipeline">
         <property name="stages">
             <list>
+                <!--
+                    Enforce IdP display name uniqueness before assembling aggregate
+                -->
+                <ref bean="check_dup_display"/>
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="uk_assemble"/>
                 <ref bean="stripElabNamespace"/>                
                 <ref bean="fixup_EncryptionMethod"/>
@@ -547,6 +559,12 @@
         p:id="CDSAllPipeline">
         <property name="stages">
             <list>
+                <!--
+                    Enforce IdP display name uniqueness before assembling aggregate
+                -->
+                <ref bean="check_dup_display"/>
+                <ref bean="errorTerminatingFilter"/>
+
                 <!-- make an aggregate first so that we're only traversing one item -->
                 <ref bean="uk_assemble"/>
 
@@ -605,6 +623,12 @@
         p:id="uk_fallbackPipeline">
         <property name="stages">
             <list>
+                <!--
+                    Enforce IdP display name uniqueness before assembling aggregate
+                -->
+                <ref bean="check_dup_display"/>
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="uk_assemble"/>
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
@@ -663,6 +687,12 @@
         p:id="uk_testPipeline">
         <property name="composedStages">
             <list>
+                <!--
+                    Enforce IdP display name uniqueness before assembling aggregate
+                -->
+                <ref bean="check_dup_display"/>
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="uk_assemble"/>
                 <ref bean="stripElabNamespace"/>                
                 <ref bean="fixup_EncryptionMethod"/>
@@ -726,6 +756,12 @@
         p:id="uk_exportPipeline">
         <property name="stages">
             <list>
+                <!--
+                    Enforce IdP display name uniqueness before assembling aggregate
+                -->
+                <ref bean="check_dup_display"/>
+                <ref bean="errorTerminatingFilter"/>
+
                 <ref bean="stripUkfedlabelNamespace"/>
                 <ref bean="stripWayfNamespace"/>
                 <ref bean="stripKeyNames"/>

mdx/validation-beans.xml

@@ -219,18 +219,6 @@
         </property>
     </bean>
 
-    <!--
-        check_aggregate
-    -->
-    <bean id="check_aggregate" parent="XSLValidationStage"
-        p:id="check_aggregate">
-        <property name="xslResource">
-            <bean parent="FilesystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_aggregate.xsl"/>
-            </bean>
-        </property>
-    </bean>
-
     <!--
         check_bindings
     -->
@@ -664,6 +652,47 @@
         </property>
     </bean>
 
+    <!--
+        *******************************************************
+        ***                                                 ***
+        ***   C O L L E C T I O N   C O N S I S T E N C Y   ***
+        ***                                                 ***
+        *******************************************************
+    -->
+
+    <!--
+        These checks are for consistency across a collection of entities
+        rather than on each entity independently.
+    -->
+
+    <!--
+        check_aggregate
+        
+        Checks for duplicate entityID values across a set of entities.
+        
+        It is assumed that the entities are wrapped in a single EntitiesDescriptor.
+    -->
+    <bean id="check_aggregate" parent="XSLValidationStage"
+        p:id="check_aggregate">
+        <property name="xslResource">
+            <bean parent="FilesystemResource">
+                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_aggregate.xsl"/>
+            </bean>
+        </property>
+    </bean>
+
+    <!--
+        check_dup_display
+        
+        Checks for duplicate identity provider display names across a set of entities.
+        
+        It is assumed that the entities are independently represented as EntityDescriptor
+        items in the item collection.
+    -->
+    <bean id="check_dup_display" parent="stage_parent"
+        p:id="check_dup_display"
+        class="uk.org.ukfederation.mda.IdPDisplayNameDuplicateDetectingStage"/>
+
     <!--
         *********************************************
         ***                                       ***