From d66762cf86c8ca8e67ecc8e84433123c664eb6b5 Mon Sep 17 00:00:00 2001
From: Anders Lördal <anders@lordal.se>
Date: Fri, 11 Sep 2015 14:33:31 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../hls.uwe.ac.uk-athens.xml                       | 57 ++++++++++------------
 1 file changed, 27 insertions(+), 30 deletions(-)

(limited to 'swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml')

diff --git a/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml b/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml
index e4d82ddd..d85468d4 100644
--- a/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml
+++ b/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hls.uwe.ac.uk/athens">
-  <!--
-		This is an "HLS SP" OpenAthens SP for the University of the West of England, Bristol. 
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hls.uwe.ac.uk/athens">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-15T16:34:27Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -34,8 +31,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>
@@ -60,23 +57,23 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of the West of England, Bristol</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of the West of England (UWE) - HLS SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uwe.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library IT Team</GivenName>
-    <EmailAddress>mailto:lib.it@uwe.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Library IT Team</GivenName>
-    <EmailAddress>mailto:lib.it@uwe.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of the West of England, Bristol</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of the West of England (UWE) - HLS SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uwe.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Library IT Team</md:GivenName>
+    <md:EmailAddress>mailto:lib.it@uwe.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Library IT Team</md:GivenName>
+    <md:EmailAddress>mailto:lib.it@uwe.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3