From c53ecb17a44aac30fed8a1a80ceddd6508e1ad6e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 26 Feb 2014 16:28:01 +0000
Subject: [PATCH] Remove gateway KeyName from all entity fragment files; remove
 filtering steps as they are no longer required.

---
 mdx/uk/beans.xml             | 16 ----------------
 mdx/uk/generate.xml          |  4 ----
 mdx/uk/remove_gw_keyname.xsl | 37 ------------------------------------
 3 files changed, 57 deletions(-)
 delete mode 100644 mdx/uk/remove_gw_keyname.xsl

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 0475ddd7..12688727 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -354,21 +354,6 @@
     </bean>
     
     
-    <!--
-        uk_removeGatewayKeyName
-        
-        Remove the Athens gateway's KeyName wherever it appears.
-    -->
-    <bean id="uk_removeGatewayKeyName" parent="XSLTransformationStage"
-        p:id="uk_removeGatewayKeyName">
-        <property name="XSLResource">
-            <bean parent="ClasspathResource">
-                <constructor-arg value="uk/remove_gw_keyname.xsl"/>
-            </bean>
-        </property>
-    </bean>
-    
-    
     <!--
         uk_stripAdminContacts
         
@@ -618,7 +603,6 @@
         <property name="stages">
             <list>
                 <ref bean="assemble"/>
-                <ref bean="uk_removeGatewayKeyName"/>
                 <ref bean="uk_generateStatistics"/>
                 <ref bean="uk_serializeStatistics"/>
             </list>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 41a61515..3b60b3b5 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -309,7 +309,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
-                <ref bean="uk_removeGatewayKeyName"/>
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_addTrustRoots"/>
@@ -359,7 +358,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
-                <ref bean="uk_removeGatewayKeyName"/>
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_finaliseProduction"/>
@@ -542,7 +540,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
-                <ref bean="uk_removeGatewayKeyName"/>
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="removeEmptyExtensions"/>
@@ -607,7 +604,6 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
-                <ref bean="uk_removeGatewayKeyName"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_addTrustRoots"/>
                 <ref bean="uk_finaliseTest"/>
diff --git a/mdx/uk/remove_gw_keyname.xsl b/mdx/uk/remove_gw_keyname.xsl
deleted file mode 100644
index bf2b745d..00000000
--- a/mdx/uk/remove_gw_keyname.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-	remove_gw_keyname.xsl
-
-	Remove the Athens gateway's KeyName from all entities.
-	
--->
-<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="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	exclude-result-prefixes="md">
-
-	<!--Force UTF-8 encoding for the output.-->
-	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
-
-	<xsl:template match="ds:KeyName[.='gateway.athensams.net']">
-		<!-- do nothing -->
-	</xsl:template>
-	
-	<!--By default, copy text blocks, comments and attributes unchanged.-->
-	<xsl:template match="text()|comment()|@*">
-		<xsl:copy/>
-	</xsl:template>
-	
-	<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
-	<xsl:template match="*">
-		<xsl:copy>
-			<xsl:apply-templates select="node()|@*"/>
-		</xsl:copy>
-	</xsl:template>
-	
-</xsl:stylesheet>