From 1d2993271187326d809ffcad25ec1d8198ca5bad Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 22 Jul 2014 09:24:33 +0000
Subject: [PATCH] Add ExportOptOut extension element.

---
 mdx/schema/uk-fed-label.xsd | 11 ++++++++++-
 mdx/uk/check_ukreg.xsl      | 12 ++++++++++++
 xml/uk-fed-label.xsd        | 11 ++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/mdx/schema/uk-fed-label.xsd b/mdx/schema/uk-fed-label.xsd
index e35fd06d..83213fb8 100644
--- a/mdx/schema/uk-fed-label.xsd
+++ b/mdx/schema/uk-fed-label.xsd
@@ -2,7 +2,7 @@
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
     targetNamespace="http://ukfederation.org.uk/2006/11/label"
-    version="2008-06-24"
+    version="2014-07-22"
     elementFormDefault="qualified">
     
     <annotation>
@@ -124,4 +124,13 @@
         </annotation>
     </element>
     
+    <element name="ExportOptOut" type="ukfedlabel:datedLabel">
+        <annotation>
+            <documentation>
+                Indicates that the entity has been opted-out from inclusion in
+                the UK federation export aggregate.
+            </documentation>
+        </annotation>
+    </element>
+    
 </schema>
\ No newline at end of file
diff --git a/mdx/uk/check_ukreg.xsl b/mdx/uk/check_ukreg.xsl
index 4d7af2bd..4be22f07 100644
--- a/mdx/uk/check_ukreg.xsl
+++ b/mdx/uk/check_ukreg.xsl
@@ -11,6 +11,7 @@
 -->
 <xsl:stylesheet version="1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 
 	xmlns:mdxMail="xalan://uk.ac.sdss.xalan.md.Mail"
@@ -93,4 +94,15 @@
 	</xsl:template>
 	
 	
+	<!--
+		Check for entities which are both opted in to and opted out from export.
+	-->
+	<xsl:template match="md:EntityDescriptor/md:Extensions[ukfedlabel:ExportOptIn][ukfedlabel:ExportOptOut]">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">
+				<xsl:text>entity cannot be both opted in to and opted out from export</xsl:text>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
 </xsl:stylesheet>
diff --git a/xml/uk-fed-label.xsd b/xml/uk-fed-label.xsd
index e35fd06d..83213fb8 100644
--- a/xml/uk-fed-label.xsd
+++ b/xml/uk-fed-label.xsd
@@ -2,7 +2,7 @@
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
     targetNamespace="http://ukfederation.org.uk/2006/11/label"
-    version="2008-06-24"
+    version="2014-07-22"
     elementFormDefault="qualified">
     
     <annotation>
@@ -124,4 +124,13 @@
         </annotation>
     </element>
     
+    <element name="ExportOptOut" type="ukfedlabel:datedLabel">
+        <annotation>
+            <documentation>
+                Indicates that the entity has been opted-out from inclusion in
+                the UK federation export aggregate.
+            </documentation>
+        </annotation>
+    </element>
+    
 </schema>
\ No newline at end of file