urkund new entityID

1 files changed, 48 insertions, 51 deletions

diff --git a/swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.xml
index 760fb70b..ac5ff0ef 100644
--- a/swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-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://openathens.blackpoolsixth.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens IdP for The Blackpool Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-03T09:47:16Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">openathens.blackpoolsixth.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Blackpool Sixth Form College</mdui:DisplayName>
-        <mdui:Logo height="138" width="138">https://drive.google.com/file/d/0B0EYs7-1W-QLS0FHamZQOVJsNjQ/view?usp=sharing</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://openathens.blackpoolsixth.ac.uk/oala/metadata">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-03T09:47:16Z">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    </md:Extensions>
+    <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">openathens.blackpoolsixth.ac.uk</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="en">Blackpool Sixth Form College</mdui:DisplayName>
+          <mdui:Logo height="138" width="138">https://drive.google.com/file/d/0B0EYs7-1W-QLS0FHamZQOVJsNjQ/view?usp=sharing</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>
 						MIIDfDCCAmSgAwIBAgIIZ5b5ek0HMy0wDQYJKoZIhvcNAQEFBQAwVTEpMCcGA1UE
 						CgwgVGhlIEJsYWNrcG9vbCBTaXh0aCBGb3JtIENvbGxlZ2UxKDAmBgNVBAMMH29w
 						ZW5hdGhlbnMuYmxhY2twb29sc2l4dGguYWMudWswHhcNMTUwNzMwMDgwMDU3WhcN
@@ -40,13 +37,13 @@
 						CU7f5enOAZT5n9W8CFI5xNcpbazKoUzjTt15yoEOsD7vYNhJnS1EFClDBmM/ERxP
 						2l6IdVWB/SVkgM6+P3kLtIZ/j4HLSsJ6GEIbJGI00UE=
 					</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>
 						MIIDfDCCAmSgAwIBAgIIZ5b5ek0HMy0wDQYJKoZIhvcNAQEFBQAwVTEpMCcGA1UE
 						CgwgVGhlIEJsYWNrcG9vbCBTaXh0aCBGb3JtIENvbGxlZ2UxKDAmBgNVBAMMH29w
 						ZW5hdGhlbnMuYmxhY2twb29sc2l4dGguYWMudWswHhcNMTUwNzMwMDgwMDU3WhcN
@@ -67,25 +64,25 @@
 						CU7f5enOAZT5n9W8CFI5xNcpbazKoUzjTt15yoEOsD7vYNhJnS1EFClDBmM/ERxP
 						2l6IdVWB/SVkgM6+P3kLtIZ/j4HLSsJ6GEIbJGI00UE=
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.blackpoolsixth.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.blackpoolsixth.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Blackpool Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Blackpool Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.blackpoolsixth.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alison</GivenName>
-    <SurName>Miller</SurName>
-    <EmailAddress>mailto:alison.miller@blackpoolsixth.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Hopwood</SurName>
-    <EmailAddress>mailto:lee.hopwood@blackpoolsixth.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.blackpoolsixth.ac.uk/oala/sso"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.blackpoolsixth.ac.uk/oala/sso"/>
+    </md:IDPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">The Blackpool Sixth Form College</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">Blackpool Sixth Form College</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.blackpoolsixth.ac.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Alison</md:GivenName>
+      <md:SurName>Miller</md:SurName>
+      <md:EmailAddress>mailto:alison.miller@blackpoolsixth.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Lee</md:GivenName>
+      <md:SurName>Hopwood</md:SurName>
+      <md:EmailAddress>mailto:lee.hopwood@blackpoolsixth.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>