From 848b83d0af7df5616ce35a3b7e1e6d2774ffaed3 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sat, 28 Sep 2013 13:10:28 +0000
Subject: [PATCH] Remove remaining code related to the elab namespace.

---
 mdx/_rules/check_namespaces.xsl |  1 -
 mdx/common-beans.xml            | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/mdx/_rules/check_namespaces.xsl b/mdx/_rules/check_namespaces.xsl
index ac939ab1..315d39ca 100644
--- a/mdx/_rules/check_namespaces.xsl
+++ b/mdx/_rules/check_namespaces.xsl
@@ -12,7 +12,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index bed83ddf..4df043ff 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -196,7 +196,6 @@
     <bean id="alg_namespace"        parent="String" c:_0="urn:oasis:names:tc:SAML:metadata:algsupport"/>
     <bean id="ds_namespace"         parent="String" c:_0="http://www.w3.org/2000/09/xmldsig#"/>
     <bean id="dsig11_namespace"     parent="String" c:_0="http://www.w3.org/2009/xmldsig11#"/>
-    <bean id="elab_namespace"       parent="String" c:_0="http://eduserv.org.uk/labels"/>
     <bean id="hoksso_namespace"     parent="String" c:_0="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser"/>
     <bean id="icmd_namespace"       parent="String" c:_0="http://id.incommon.org/metadata"/>
     <bean id="idpdisc_namespace"    parent="String" c:_0="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"/>
@@ -228,7 +227,6 @@
                 <entry key="alg"        value-ref="alg_namespace"/>
                 <entry key="ds"         value-ref="ds_namespace"/>
                 <entry key="dsig11"     value-ref="dsig11_namespace"/>
-                <entry key="elab"       value-ref="elab_namespace"/>
                 <entry key="hoksso"     value-ref="hoksso_namespace"/>
                 <entry key="icmd"       value-ref="icmd_namespace"/>
                 <entry key="idpdisc"    value-ref="idpdisc_namespace"/>
@@ -251,14 +249,6 @@
         </constructor-arg>
     </bean>
     
-    <!--
-        stripElabNamespace
-        
-        Remove the Eduserv label namespace.
-    -->
-    <bean id="stripElabNamespace" parent="NamespaceStrippingStage"
-        p:id="stripElabNamespace" p:namespace-ref="elab_namespace"/>
-
     <!--
         stripMdattrNamespace