urkund new entityID

1 files changed, 49 insertions, 52 deletions

diff --git a/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml
index 1719dd00..22adfcee 100644
--- a/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml
@@ -1,21 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala.aaschool.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the Architectural Association (Incorporated).
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-19T11:56:39Z">
-      <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">aaschool.ac.uk</shibmd:Scope>
-    </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://oala.aaschool.ac.uk/oala/metadata">
+    <md:Extensions>
+      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-19T11:56:39Z">
+        <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">aaschool.ac.uk</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>
 						MIIDVjCCAj6gAwIBAgIIU8+cSxqyjekwDQYJKoZIhvcNAQEFBQAwQjEiMCAGA1UE
 						CgwZQXJjaGl0ZWN0dXJhbCBBc3NvY2lhdGlvbjEcMBoGA1UEAwwTb2FsYS5hYXNj
 						aG9vbC5hYy51azAeFw0xNDAyMDUxMjU0MjFaFw0yNDAyMDUxMjU0MjFaMEIxIjAg
@@ -35,13 +32,13 @@
 						N+Fr1zIKaChdHOdfBVIuG8o9SL5GeLuHOSUwKtYngivsmk73rRvQxJHYwuRstWlV
 						O6NtqBZn2l5WgFXs6cNoPTwZCFrlNTiQIVXgZnWaTdXzei52kRX/5v/X
 					</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>
 						MIIDVjCCAj6gAwIBAgIIU8+cSxqyjekwDQYJKoZIhvcNAQEFBQAwQjEiMCAGA1UE
 						CgwZQXJjaGl0ZWN0dXJhbCBBc3NvY2lhdGlvbjEcMBoGA1UEAwwTb2FsYS5hYXNj
 						aG9vbC5hYy51azAeFw0xNDAyMDUxMjU0MjFaFw0yNDAyMDUxMjU0MjFaMEIxIjAg
@@ -61,30 +58,30 @@
 						N+Fr1zIKaChdHOdfBVIuG8o9SL5GeLuHOSUwKtYngivsmk73rRvQxJHYwuRstWlV
 						O6NtqBZn2l5WgFXs6cNoPTwZCFrlNTiQIVXgZnWaTdXzei52kRX/5v/X
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.aaschool.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.aaschool.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Architectural Association (Incorporated)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Architectural Association</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aaschool.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simine</GivenName>
-    <SurName>Marine</SurName>
-    <EmailAddress>mailto:simine.marine@aaschool.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:itdept@aaschool.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mathew</GivenName>
-    <SurName>Bielecki</SurName>
-    <EmailAddress>mailto:itdept@aaschool.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.aaschool.ac.uk/oala/sso"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.aaschool.ac.uk/oala/sso"/>
+    </md:IDPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="en">Architectural Association (Incorporated)</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">Architectural Association</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://www.aaschool.ac.uk/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Simine</md:GivenName>
+      <md:SurName>Marine</md:SurName>
+      <md:EmailAddress>mailto:simine.marine@aaschool.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>David</md:GivenName>
+      <md:SurName>Hopkins</md:SurName>
+      <md:EmailAddress>mailto:itdept@aaschool.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Mathew</md:GivenName>
+      <md:SurName>Bielecki</md:SurName>
+      <md:EmailAddress>mailto:itdept@aaschool.ac.uk</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>