From d5a74f6fcf4e05626a778d3035f0b6c0ed31b1bf Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Thu, 10 Dec 2015 15:54:49 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

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

(limited to 'swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml')

diff --git a/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml
index 805ba579..d4351dee 100644
--- a/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml
+++ b/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.glasgowkelvin.ac.uk/openathens">
-  <!--
-		This is an OpenAthens LA IdP for Glasgow Kelvin College.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.glasgowkelvin.ac.uk/openathens">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-22T14:18:15Z">
       <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">glasgowkelvin.ac.uk</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Glasgow Kelvin College</mdui:DisplayName>
       </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>
@@ -40,8 +37,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>
@@ -66,23 +63,23 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.glasgowkelvin.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.glasgowkelvin.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Glasgow Kelvin College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Glasgow Kelvin College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.glasgowkelvin.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matt</GivenName>
-    <SurName>Campbell</SurName>
-    <EmailAddress>mailto:MCampbell@glasgowkelvin.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>McBride</SurName>
-    <EmailAddress>mailto:amcbride@glasgowkelvin.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.glasgowkelvin.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.glasgowkelvin.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Glasgow Kelvin College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Glasgow Kelvin College</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.glasgowkelvin.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Matt</md:GivenName>
+    <md:SurName>Campbell</md:SurName>
+    <md:EmailAddress>mailto:MCampbell@glasgowkelvin.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>McBride</md:SurName>
+    <md:EmailAddress>mailto:amcbride@glasgowkelvin.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3