1 files changed, 29 insertions, 32 deletions
diff --git a/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml
index 61663318..99605d4b 100644
--- a/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://help.it.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for University of Oxford.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://help.it.ox.ac.uk/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-12T12:49:23Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </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>
@@ -32,27 +29,27 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - help.it.ox.ac.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://help.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford - help.it.ox.ac.uk</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://help.it.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NSMS</md:GivenName>
+    <md:EmailAddress>mailto:nsms@it.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>