From 752837d38731c48688c823d7e161f7c6976d30cd Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 25 Jun 2014 17:07:42 +0000
Subject: [PATCH] Remove now-redundant check for no KeyName in exported
 entities.

---
 mdx/uk/beans.xml               | 14 ------------
 mdx/uk/check_uk_expkeyname.xsl | 41 ----------------------------------
 2 files changed, 55 deletions(-)
 delete mode 100644 mdx/uk/check_uk_expkeyname.xsl

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index e159b7e6..bd9cfab4 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -252,19 +252,6 @@
     </bean>
     
     
-    <!--
-        check_uk_expkeyname
-    -->
-    <bean id="check_uk_expkeyname" parent="XSLValidationStage"
-        p:id="check_uk_expkeyname">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_expkeyname.xsl"/>
-            </bean>
-        </property>
-    </bean>
-    
-    
     <!--
         check_uk_keydesc_key
     -->
@@ -439,7 +426,6 @@
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK_std"/>
                 <ref bean="check_ukreg"/>
-                <ref bean="check_uk_expkeyname"/>
                 <ref bean="check_uk_keydesc_key"/>
                 <ref bean="check_uk_mdattr"/>
                 <ref bean="check_uk_mdrps"/>
diff --git a/mdx/uk/check_uk_expkeyname.xsl b/mdx/uk/check_uk_expkeyname.xsl
deleted file mode 100644
index ad9258d1..00000000
--- a/mdx/uk/check_uk_expkeyname.xsl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-	check_uk_expkeyname.xsl
-	
-    UKf-specific check that no KeyName elements appear in entities opted
-    in for inter-federation metadata exchange.
-	
-	Author: Ian A. Young <ian@iay.org.uk>
-
--->
-<xsl:stylesheet version="1.0"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
-	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-
-	<!--
-		Common support functions.
-	-->
-	<xsl:import href="../_rules/check_framework.xsl"/>
-
-
-	<!--
-		If a UK-registered entity is opted in to the export aggregate, it MUST
-		NOT have any KeyName elements.
-	-->
-	<xsl:template match="md:EntityDescriptor
-		[descendant::mdrpi:RegistrationInfo[@registrationAuthority='http://ukfederation.org.uk']]
-		[md:Extensions/ukfedlabel:ExportOptIn]
-		[descendant::ds:KeyName]">
-		<xsl:call-template name="error">
-			<xsl:with-param name="m">
-				<xsl:text>exported entity must not have a KeyName</xsl:text>
-			</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>
-	
-</xsl:stylesheet>