From 6011b24382163571012c3379e33a36f44b441169 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 23 May 2016 11:01:57 +0000
Subject: [PATCH] Rename check_regscope to check_shib_regscope.

---
 .../{check_regscope.xsl => check_shib_regscope.xsl}      | 2 +-
 mdx/common-beans.xml                                     | 2 +-
 mdx/validation-beans.xml                                 | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename mdx/_rules/{check_regscope.xsl => check_shib_regscope.xsl} (97%)

diff --git a/mdx/_rules/check_regscope.xsl b/mdx/_rules/check_shib_regscope.xsl
similarity index 97%
rename from mdx/_rules/check_regscope.xsl
rename to mdx/_rules/check_shib_regscope.xsl
index fcae4300..b20fa7d3 100644
--- a/mdx/_rules/check_regscope.xsl
+++ b/mdx/_rules/check_shib_regscope.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-	check_regscope.xsl
+	check_shib_regscope.xsl
 
 	Check for the presence of Shibboleth Scope elements containing regular expressions.
 	
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 0a8b7dba..ed66d538 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -1173,7 +1173,7 @@
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK_std"/>
                 <ref bean="check_dup_display"/>
-                <ref bean="check_regscope"/>
+                <ref bean="check_shib_regscope"/>
                 <ref bean="check_namespaces"/>
 
                 <bean id="checkCertificates" parent="X509ValidationStage">
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 1d9a2d55..5736b9d5 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -286,12 +286,13 @@
     -->
 
     <!--
-        check_regscope
+        check_shib_regscope
         
-        Check for regular expressions in Shibboleth Scope elements.  Applied very selectively.
+        Check for regular expressions in Shibboleth Scope elements.  Applied very selectively,
+        because we do permit this in certain circumstances.
     -->
-    <bean id="check_regscope" parent="XSLValidationStage"
-        p:XSLResource="classpath:_rules/check_regscope.xsl"/>
+    <bean id="check_shib_regscope" parent="XSLValidationStage"
+        p:XSLResource="classpath:_rules/check_shib_regscope.xsl"/>
 
 
     <!--