urkund new entityID

1 files changed, 66 insertions, 69 deletions

diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
index c891ec43..e6b7cf34 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
@@ -1,23 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/ukborders">
-  <!--
-		This is a "UK Data Service Census Support" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UK Data Service Census Support</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Boundary datasets and geographic look up tables of the United Kingdom</mdui:Description>
-        <mdui:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/ukborders.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <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://sp.edina.ac.uk/shibboleth/ukborders">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
+    </md:Extensions>
+    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+      <md:Extensions>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">UK Data Service Census Support</mdui:DisplayName>
+          <mdui:Description xml:lang="en">Boundary datasets and geographic look up tables of the United Kingdom</mdui:Description>
+          <mdui:Logo height="161" width="350">https://auth.edina.ac.uk/public/images/splogos/ukborders.png</mdui:Logo>
+        </mdui:UIInfo>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIEnDCCA4SgAwIBAgIQWut7bBSSWefrikHOubml4zANBgkqhkiG9w0BAQsFADBk
 						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
@@ -44,52 +41,52 @@
 						vnPPZxVDGAaP4I1gJPTdzPqtTsiKRiMb3x1hMMK/dF/n6nlK94YZ3tixX6OJRAwD
 						a2U2jkfsIUdtV6+2zYAlc6uXUWKRrE8+ManCTprC5/k=
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="37"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="38"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="39"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="40"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UK Data Service Census Support</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/ukborders/description/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>EDINA Helpdesk</GivenName>
-    <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Soares</SurName>
-    <EmailAddress>mailto:ben.soares@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML/POST" index="13"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="14"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="15"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="17"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="18"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="27"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukblx-dev.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="28"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="31"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="32"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="33"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="34"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="35"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="37"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="38"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="39"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="40"/>
+    </md:SPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">UK Data Service Census Support</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://edina.ac.uk/ukborders/description/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>EDINA Helpdesk</md:GivenName>
+      <md:EmailAddress>mailto:edina@ed.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Ben</md:GivenName>
+      <md:SurName>Soares</md:SurName>
+      <md:EmailAddress>mailto:ben.soares@ed.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>