From caa39fa2e0b69e5052b0deed0b0e3ad304df77a9 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 7 Nov 2017 10:55:48 +0000
Subject: [PATCH] Move two UKf-only checks into the uk directory

---
 mdx/uk/beans.xml                              | 26 +++++++++++++++++--
 .../check_uk_mdui_dn_en_match.xsl}            |  4 +--
 .../check_uk_mdui_dn_en_present.xsl}          |  4 +--
 mdx/validation-beans.xml                      | 26 -------------------
 4 files changed, 28 insertions(+), 32 deletions(-)
 rename mdx/{_rules/mdui_dn_en_match.xsl => uk/check_uk_mdui_dn_en_match.xsl} (93%)
 rename mdx/{_rules/mdui_dn_en_present.xsl => uk/check_uk_mdui_dn_en_present.xsl} (90%)

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 66ed49e0..38cb1cfa 100644
--- 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 b/mdx/uk/check_uk_mdui_dn_en_match.xsl
similarity index 93%
rename from mdx/_rules/mdui_dn_en_match.xsl
rename to mdx/uk/check_uk_mdui_dn_en_match.xsl
index 7ecb8015..c2ad96d2 100644
--- a/mdx/_rules/mdui_dn_en_match.xsl
+++ b/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 b/mdx/uk/check_uk_mdui_dn_en_present.xsl
similarity index 90%
rename from mdx/_rules/mdui_dn_en_present.xsl
rename to mdx/uk/check_uk_mdui_dn_en_present.xsl
index e5364e11..b8d11d36 100644
--- a/mdx/_rules/mdui_dn_en_present.xsl
+++ b/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
index f7ed527f..980bd328 100644
--- 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">