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

1 files changed, 27 insertions, 30 deletions

diff --git a/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml b/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml
index a65fc754..0c236f69 100644
--- a/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml
+++ b/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jisrc.mercury.hosting.eduserv.org.uk/oa/metadata">
-  <!--
-		This is an OpenAthens SP for the JISC Services Management Company Ltd.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jisrc.mercury.hosting.eduserv.org.uk/oa/metadata">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
@@ -62,23 +59,23 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Services Management Company Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">JISC Services Management Company Ltd: JISC RSC CMS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jiscadvance.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Eduserve Service Desk</GivenName>
-    <EmailAddress>mailto:support@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Eduserve Service Desk</GivenName>
-    <EmailAddress>mailto:support@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">JISC Services Management Company Ltd</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">JISC Services Management Company Ltd: JISC RSC CMS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.jiscadvance.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Eduserve Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:support@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eduserve Service Desk</md:GivenName>
+    <md:EmailAddress>mailto:support@eduserv.org.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>