Move two UKf-only checks into the uk directory

InCommon · Nov 7, 2017 · caa39fa · caa39fa
1 parent 4e49454
commit caa39fa
Showing 4 changed files with 28 additions and 32 deletions.
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
@@ -261,6 +261,28 @@
         p:XSLResource="classpath:uk/check_uk_urlenc.xsl"/>
 
 
+    <!--
+        check_uk_mdui_dn_en_match
+
+        If an IdP has both an OrganizationDisplayName in English, and an
+        mdui:DisplayName in English, they must be identical.
+
+        UKFTS 1.4 section 3.3
+    -->
+    <bean id="check_uk_mdui_dn_en_match" parent="mda.XSLValidationStage"
+        p:XSLResource="classpath:uk/check_uk_mdui_dn_en_match.xsl"/>
+
+
+    <!--
+        check_uk_mdui_dn_en_present
+
+        If an entity has mdui:UIInfo, then that must include at least an
+        mdui:DisplayName with an English name.
+    -->
+    <bean id="check_uk_mdui_dn_en_present" parent="mda.XSLValidationStage"
+        p:XSLResource="classpath:uk/check_uk_mdui_dn_en_present.xsl"/>
+
+
     <!--
         ***************************************
         ***                                 ***
@@ -339,8 +361,8 @@
                 <ref bean="check_uk_mdattr"/>
                 <ref bean="check_uk_mdrps"/>
                 <ref bean="check_uk_urlenc"/>
-                <ref bean="mdui_dn_en_present"/>
-                <ref bean="mdui_dn_en_match"/>
+                <ref bean="check_uk_mdui_dn_en_present"/>
+                <ref bean="check_uk_mdui_dn_en_match"/>
                 <ref bean="check_dup_display"/>
 
                 <bean id="checkCertificates" parent="mda.X509ValidationStage">

diff --git a/mdx/_rules/mdui_dn_en_match.xsl → mdx/uk/check_uk_mdui_dn_en_match.xsl b/mdx/_rules/mdui_dn_en_match.xsl → mdx/uk/check_uk_mdui_dn_en_match.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    mdui_dn_en_match.xsl
+    check_uk_mdui_dn_en_match.xsl
 
     If an IdP has both an OrganizationDisplayName in English, and an
     mdui:DisplayName in English, they must be identical.
@@ -20,7 +20,7 @@
     <!--
         Common support functions.
     -->
-    <xsl:import href="check_framework.xsl"/>
+    <xsl:import href="../_rules/check_framework.xsl"/>
 
     <xsl:template match="md:EntityDescriptor[md:IDPSSODescriptor]">
         <xsl:variable name="mdui" select="md:IDPSSODescriptor/md:Extensions/mdui:UIInfo/mdui:DisplayName[@xml:lang='en']"/>

diff --git a/mdx/_rules/mdui_dn_en_present.xsl → mdx/uk/check_uk_mdui_dn_en_present.xsl b/mdx/_rules/mdui_dn_en_present.xsl → mdx/uk/check_uk_mdui_dn_en_present.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    mdui_dn_en_present.xsl
+    check_uk_mdui_dn_en_present.xsl
 
     If an entity has mdui:UIInfo, then that must include at least an
     mdui:DisplayName with an English name.
@@ -18,7 +18,7 @@
     <!--
         Common support functions.
     -->
-    <xsl:import href="check_framework.xsl"/>
+    <xsl:import href="../_rules/check_framework.xsl"/>
 
     <xsl:template match="mdui:UIInfo[not(mdui:DisplayName[@xml:lang='en'])]">
         <xsl:call-template name="error">

diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
@@ -220,36 +220,10 @@
     <bean id="check_mdui_xslt" parent="mda.XSLValidationStage"
         p:XSLResource="classpath:_rules/check_mdui.xsl"/>
 
-    <!--
-        mdui_dn_en_match
-
-        If an IdP has both an OrganizationDisplayName in English, and an
-        mdui:DisplayName in English, they must be identical.
-
-        UKFTS 1.4 section 3.3
-    -->
-    <bean id="mdui_dn_en_match" parent="mda.XSLValidationStage"
-        p:XSLResource="classpath:_rules/mdui_dn_en_match.xsl"/>
-
-    <!--
-        mdui_dn_en_present
-
-        If an entity has mdui:UIInfo, then that must include at least an
-        mdui:DisplayName with an English name.
-    -->
-    <bean id="mdui_dn_en_present" parent="mda.XSLValidationStage"
-        p:XSLResource="classpath:_rules/mdui_dn_en_present.xsl"/>
-
     <!--
         check_mdui
 
         Composite check for the MDUI specification.
-
-        Omitted the following, which are only applied to
-        UK-registered metadata:
-
-            mdui_dn_en_present
-            mdui_dn_en_match
     -->
     <bean id="check_mdui" parent="mda.CompositeStage">
         <property name="composedStages">