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

1 files changed, 38 insertions, 35 deletions

diff --git a/swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml
index 7c69f330..7d0fd965 100644
--- a/swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://2012.qmplus.qmul.ac.uk/shibboleth">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://2012.qmplus.qmul.ac.uk/shibboleth">
+  <!--
+		This is a "2012 Archive service QMPlus" Shibboleth 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="2014-06-30T09:22:05Z">
       <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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -33,30 +36,30 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </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 :2012 Archive service QMPlus</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>Moodle Support</md:GivenName>
-    <md:EmailAddress>mailto:moodle-support@ulcc.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>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College :2012 Archive service QMPlus</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>Moodle Support</GivenName>
+    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Academic Applications</GivenName>
+    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>