From 2b677a19e71385f726a8118b99988671f4ade4f1 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 10 Mar 2015 11:08:05 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../leedstrinity.ac.uk-oala-metadata.xml           | 69 +++++++++++-----------
 1 file changed, 33 insertions(+), 36 deletions(-)

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

diff --git a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
index 5fe6ff69..4828e840 100644
--- a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://leedstrinity.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Leeds Trinity University.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://leedstrinity.ac.uk/oala/metadata">
+  <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"/>
-  </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">leedstrinity.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>
@@ -43,8 +40,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>
@@ -72,27 +69,27 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Leeds Trinity University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds Trinity University OALA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.leedstrinity.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:Helpdesk@leedstrinity.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Dolan</SurName>
-    <EmailAddress>mailto:R.Dolan@leedstrinity.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jeremy</GivenName>
-    <SurName>Grayson</SurName>
-    <EmailAddress>mailto:J.Grayson@leedstrinity.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Leeds Trinity University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Leeds Trinity University OALA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.leedstrinity.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:Helpdesk@leedstrinity.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ryan</md:GivenName>
+    <md:SurName>Dolan</md:SurName>
+    <md:EmailAddress>mailto:R.Dolan@leedstrinity.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jeremy</md:GivenName>
+    <md:SurName>Grayson</md:SurName>
+    <md:EmailAddress>mailto:J.Grayson@leedstrinity.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3