From 6e8f14f374ac3a4e80a9b101808f4a31ab10fc35 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 23 Jul 2015 09:18:50 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../idp.rhul.ac.uk-oala.xml                        | 59 ++++++++++------------
 1 file changed, 28 insertions(+), 31 deletions(-)

(limited to 'swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml')

diff --git a/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml b/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
index da9bf60c..3ec18623 100644
--- a/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
+++ b/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://idp.rhul.ac.uk/oala">
-  <!--
-		This is an OpenAthens LA IdP for Royal Holloway and Bedford New College.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://idp.rhul.ac.uk/oala">
+  <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-04T11:59:06Z"/>
-  </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">rhul.ac.uk</shibmd:Scope>
-    </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>
@@ -41,8 +38,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>
@@ -68,22 +65,22 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rhul.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rhul.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Royal Holloway and Bedford New College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Holloway OALA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rhul.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library Systems Team</GivenName>
-    <EmailAddress>mailto:libsysteam@rhul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Kiely</SurName>
-    <EmailAddress>mailto:Peter.Kiely@rhul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rhul.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rhul.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Royal Holloway and Bedford New College</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Royal Holloway OALA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rhul.ac.uk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library Systems Team</md:GivenName>
+    <md:EmailAddress>mailto:libsysteam@rhul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Kiely</md:SurName>
+    <md:EmailAddress>mailto:Peter.Kiely@rhul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3