http://metadata.ukfederation.org.uk/ukfederation-export.xml into swamid-interfederations-2.0

1 files changed, 29 insertions, 26 deletions

diff --git a/swamid-interfederations-2.0/test.media.qmplus.qmul.ac.uk.xml b/swamid-interfederations-2.0/test.media.qmplus.qmul.ac.uk.xml
index 601ffda5..769f81c2 100644
--- a/swamid-interfederations-2.0/test.media.qmplus.qmul.ac.uk.xml
+++ b/swamid-interfederations-2.0/test.media.qmplus.qmul.ac.uk.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.media.qmplus.qmul.ac.uk">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.media.qmplus.qmul.ac.uk">
+  <!--
+		This is a "test Media Service" simpleSAMLphp SP for Queen Mary and Westfield College, University of London.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-09-27T10:33:33Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -38,8 +41,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -71,22 +74,22 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.media.qmplus.qmul.ac.uk/user/logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.media.qmplus.qmul.ac.uk/user/authenticate" index="0"/>
-  </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 : Media Service</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Academic Applications</md:GivenName>
-    <md:EmailAddress>mailto:its-aa@qmul.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Academic Applications</md:GivenName>
-    <md:EmailAddress>mailto:its-aa@qmul.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.media.qmplus.qmul.ac.uk/user/logout"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.media.qmplus.qmul.ac.uk/user/authenticate" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College : Media Service</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Academic Applications</GivenName>
+    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Academic Applications</GivenName>
+    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>