http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 25 insertions, 28 deletions

diff --git a/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml
index 867b9cfe..a10c9756 100644
--- a/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mahara.qmul.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Mahara SP for Queen Mary and Westfield College, University of London.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mahara.qmul.ac.uk/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-23T11:16:13Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -30,23 +27,23 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: Mahara</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services helpdesk</GivenName>
-    <EmailAddress>mailto:its-helpdesk@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Moodle Support</GivenName>
-    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: Mahara</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Services helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:its-helpdesk@qmul.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Moodle Support</md:GivenName>
+    <md:EmailAddress>mailto:moodle-support@ulcc.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>