From 567ef25fb9e7a968c8cd8fb7bf1ea88f9cf8d203 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 8 Dec 2015 14:05:34 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../edustore.adeptscience.co.uk-oasp.xml           | 59 ++++++++++------------
 1 file changed, 28 insertions(+), 31 deletions(-)

(limited to 'swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml')

diff --git a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml
index 69cdb940..59ade9b0 100644
--- a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml
+++ b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edustore.adeptscience.co.uk/oasp">
-  <!--
-		This is an OpenAthens SP for Adept Scientific plc.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edustore.adeptscience.co.uk/oasp">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="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>
@@ -45,26 +42,26 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Adept Scientific plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Adept Scientific plc: Adept4Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Ridley</SurName>
-    <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Ridley</SurName>
-    <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Adept Scientific plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Adept Scientific plc: Adept4Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Ridley</md:SurName>
+    <md:EmailAddress>mailto:mark.ridley@adeptscientific.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Ridley</md:SurName>
+    <md:EmailAddress>mailto:mark.ridley@adeptscientific.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3