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

1 files changed, 28 insertions, 31 deletions

diff --git a/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml b/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml
index 671f7411..a2a9c361 100644
--- a/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml
+++ b/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://serviceregistry.oerc.ox.ac.uk/simplesaml/">
-  <!--
-		This is a "Service Registry" SimpleSAMLphp SP for the University of Oxford.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://serviceregistry.oerc.ox.ac.uk/simplesaml/">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-26T17:45:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -43,8 +40,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>
@@ -78,24 +75,24 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Service Registry SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oerc.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oxford: Service Registry SP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oerc.ox.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@oerc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:support@oerc.ox.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>