urkund new entityID

1 files changed, 43 insertions, 46 deletions

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 4ef339d8..b2058d03 100644
--- a/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml
@@ -1,18 +1,15 @@
-<?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>
-    <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">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+<?xml version="1.0"?>
+<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>
+    </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>
 						MIIGDzCCBPegAwIBAgIQJh9i1AJonsnAFcGwgs/cvzANBgkqhkiG9w0BAQUFADCB
 						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -47,13 +44,13 @@
 						5z9CF7Rt++PysgVB2M6swP3qVegOAFnkHGvuQExRS3dSQK4wUYXwKUoeXKBfTE60
 						iIcX2da2+HnwyJ4195yPUocmnA==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIGDzCCBPegAwIBAgIQJh9i1AJonsnAFcGwgs/cvzANBgkqhkiG9w0BAQUFADCB
 						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
 						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
@@ -88,27 +85,27 @@
 						5z9CF7Rt++PysgVB2M6swP3qVegOAFnkHGvuQExRS3dSQK4wUYXwKUoeXKBfTE60
 						iIcX2da2+HnwyJ4195yPUocmnA==
 					</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>Shaun</GivenName>
-    <SurName>Sole</SurName>
-    <EmailAddress>mailto:ssole@keynote.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ameet</GivenName>
-    <SurName>Shah</SurName>
-    <EmailAddress>mailto:ashah@mintel.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </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>Shaun</md:GivenName>
+      <md:SurName>Sole</md:SurName>
+      <md:EmailAddress>mailto:ssole@keynote.co.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Ameet</md:GivenName>
+      <md:SurName>Shah</md:SurName>
+      <md:EmailAddress>mailto:ashah@mintel.com</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>