From 64e68708aa94f8947159264177212be299a679aa Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Fri, 10 Apr 2015 14:43:44 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../www.keynote.co.uk-shibboleth.xml               | 79 +++++++++++-----------
 1 file changed, 38 insertions(+), 41 deletions(-)

(limited to 'swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml
index ebba4a1d..118c405a 100644
--- a/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.keynote.co.uk/shibboleth">
-  <!--
-		This is a "Key Note: Market Intelligence" OpenAthens SP for Key Note Limited.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.keynote.co.uk/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-15T09:50:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -49,8 +46,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -90,34 +87,34 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.keynote.co.uk/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.keynote.co.uk/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.keynote.co.uk/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.keynote.co.uk/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Key Note Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Key Note: Market Intelligence</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.keynote.co.uk/GlobalFrame.htm</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Vipul</GivenName>
-    <SurName>Agarwal</SurName>
-    <EmailAddress>mailto:vipul@byng-systems.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Vipul</GivenName>
-    <SurName>Agarwal</SurName>
-    <EmailAddress>mailto:vipul@byng-systems.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ollie</GivenName>
-    <SurName>Maitland</SurName>
-    <EmailAddress>mailto:ollie@byng-systems.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@byng-systems.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.keynote.co.uk/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.keynote.co.uk/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.keynote.co.uk/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.keynote.co.uk/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Key Note Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Key Note: Market Intelligence</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.keynote.co.uk/GlobalFrame.htm</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Vipul</md:GivenName>
+    <md:SurName>Agarwal</md:SurName>
+    <md:EmailAddress>mailto:vipul@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Vipul</md:GivenName>
+    <md:SurName>Agarwal</md:SurName>
+    <md:EmailAddress>mailto:vipul@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ollie</md:GivenName>
+    <md:SurName>Maitland</md:SurName>
+    <md:EmailAddress>mailto:ollie@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:support@byng-systems.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3