From 70ea1b9f45fa9b10b010b9ecdf16c14c0f077fa6 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 20 Apr 2016 15:21:21 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../idp.newcollege.ac.uk-athensla.xml              | 61 ++++++++++------------
 1 file changed, 29 insertions(+), 32 deletions(-)

(limited to 'swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml')

diff --git a/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml b/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml
index f1acb4d5..ceeb6383 100644
--- a/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml
+++ b/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.newcollege.ac.uk/athensla">
-  <!--
-		This is an OpenAthens LA IdP for New College Swindon.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.newcollege.ac.uk/athensla">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T09:21:34Z">
       <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>
+  </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">newcollege.ac.uk</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">New College Swindon LA</mdui:DisplayName>
         <mdui:Logo height="523" width="258">https://www.newcollege.ac.uk/athens/logo.jpg</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -42,8 +39,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -69,23 +66,23 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensruntime.newcollege.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensruntime.newcollege.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">New College Swindon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">New College Swindon LA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.newcollege.ac.uk/athens/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Turpin</SurName>
-    <EmailAddress>mailto:richard.turpin@newcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Hole</SurName>
-    <EmailAddress>mailto:Ian.hole@newcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensruntime.newcollege.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensruntime.newcollege.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">New College Swindon</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">New College Swindon LA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.newcollege.ac.uk/athens/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Richard</md:GivenName>
+    <md:SurName>Turpin</md:SurName>
+    <md:EmailAddress>mailto:richard.turpin@newcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ian</md:GivenName>
+    <md:SurName>Hole</md:SurName>
+    <md:EmailAddress>mailto:Ian.hole@newcollege.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3