From 54f80505cbaac150bd7414a7f8c45c5a7f336f50 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 16 Feb 2016 14:06:42 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../idp.niesr.ac.uk-shibboleth.xml                 | 53 ++++++++++------------
 1 file changed, 25 insertions(+), 28 deletions(-)

(limited to 'swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.xml
index 8b00d049..3dee11fb 100644
--- a/swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.niesr.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for the National Institute of Economic and Social Research.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.niesr.ac.uk/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor 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 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">niesr.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -38,21 +35,21 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/niesr.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/niesr.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Institute of Economic &amp; Social Research</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.niesr.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/niesr.ac.uk/c/ukfed"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/niesr.ac.uk/c/ukfed"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Institute of Economic &amp; Social Research</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.niesr.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Athens Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3