urkund new entityID

1 files changed, 48 insertions, 51 deletions

diff --git a/swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml b/swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml
index 6030ba70..a8a525bc 100644
--- a/swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml
+++ b/swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml
@@ -1,25 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.careknowledge.com/ukfed/oa/metadata">
-  <!--
-		This is a "CareKnowledge" OpenAthens SP for OLM Pavilion Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-04T12:52:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CareKnowledge</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CareKnowledge helps you keep your social care knowledge and practice up to date.</mdui:Description>
-        <mdui:Logo height="110" width="275">https://www.careknowledge.com/App_Themes/ck/img/logo-full-colour.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <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.careknowledge.com/ukfed/oa/metadata">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-04T12:52:01Z">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    </md:Extensions>
+    <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:Extensions>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">CareKnowledge</mdui:DisplayName>
+          <mdui:Description xml:lang="en">CareKnowledge helps you keep your social care knowledge and practice up to date.</mdui:Description>
+          <mdui:Logo height="110" width="275">https://www.careknowledge.com/App_Themes/ck/img/logo-full-colour.gif</mdui:Logo>
+        </mdui:UIInfo>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDgjCCAmqgAwIBAgIJAOJNb5Ku1GAjMA0GCSqGSIb3DQEBBQUAMDQxFjAUBgNV
 						BAoTDU9MTSBHcm91cCBMdGQxGjAYBgNVBAMTEWNhcmVrbm93bGVkZ2UuY29tMB4X
 						DTE1MDkwMTA5MDEwMVoXDTI1MDgyOTA5MDEwMVowNDEWMBQGA1UEChMNT0xNIEdy
@@ -40,13 +37,13 @@
 						1E1VZ+aWVHjwYQwYYI0dMVXneNLgdgqnwZzKgdWA9XgfPAyHtn+9Nip1xdxMLgOh
 						14Vn2MYizmznFanAaXjq/VTYfu7b9KwW7Nl91socK3ZCSS4e04Q=
 					</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>
 						MIIDgjCCAmqgAwIBAgIJAOJNb5Ku1GAjMA0GCSqGSIb3DQEBBQUAMDQxFjAUBgNV
 						BAoTDU9MTSBHcm91cCBMdGQxGjAYBgNVBAMTEWNhcmVrbm93bGVkZ2UuY29tMB4X
 						DTE1MDkwMTA5MDEwMVoXDTI1MDgyOTA5MDEwMVowNDEWMBQGA1UEChMNT0xNIEdy
@@ -67,25 +64,25 @@
 						1E1VZ+aWVHjwYQwYYI0dMVXneNLgdgqnwZzKgdWA9XgfPAyHtn+9Nip1xdxMLgOh
 						14Vn2MYizmznFanAaXjq/VTYfu7b9KwW7Nl91socK3ZCSS4e04Q=
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.careknowledge.com/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.careknowledge.com/ukfed/oa/auth/rcv/saml2/post" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OLM Pavilion Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Pavilion Publishing and Media Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.careknowledge.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tim</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:tim.smith@olmgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:tim.smith@olmgroup.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.careknowledge.com/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.careknowledge.com/ukfed/oa/auth/rcv/saml2/post" index="2"/>
+    </md:SPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">OLM Pavilion Limited</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">Pavilion Publishing and Media Ltd</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">https://www.careknowledge.com/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Tim</md:GivenName>
+      <md:SurName>Smith</md:SurName>
+      <md:EmailAddress>mailto:tim.smith@olmgroup.com</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Tim</md:GivenName>
+      <md:SurName>Smith</md:SurName>
+      <md:EmailAddress>mailto:tim.smith@olmgroup.com</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>