From ca2f04cc602018cd5456e67f527353093583cdbc Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Sat, 19 Mar 2016 00:04:40 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

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

(limited to 'swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml')

diff --git a/swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml
index 4c41b71e..61ad7783 100644
--- a/swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eresources.city.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA 2.0 IdP for City University London
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eresources.city.ac.uk/oala/metadata">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">city.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>
@@ -37,8 +34,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>
@@ -65,22 +62,22 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://eresources.city.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eresources.city.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">City University London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">City University London (IT log-in)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.city.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>E-Resources Helpdesk</GivenName>
-    <EmailAddress>mailto:e-access@city.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Zakrocki</SurName>
-    <EmailAddress>mailto:Robert.zakrocki.1@city.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://eresources.city.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eresources.city.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">City University London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">City University London (IT log-in)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.city.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>E-Resources Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:e-access@city.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Robert</md:GivenName>
+    <md:SurName>Zakrocki</md:SurName>
+    <md:EmailAddress>mailto:Robert.zakrocki.1@city.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3