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

1 files changed, 34 insertions, 31 deletions

diff --git a/swamid-interfederations-2.0/bos2-demo.ilrt.bris.ac.uk-entity.xml b/swamid-interfederations-2.0/bos2-demo.ilrt.bris.ac.uk-entity.xml
index b856e5a5..efac3f96 100644
--- a/swamid-interfederations-2.0/bos2-demo.ilrt.bris.ac.uk-entity.xml
+++ b/swamid-interfederations-2.0/bos2-demo.ilrt.bris.ac.uk-entity.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bos2-demo.ilrt.bris.ac.uk/entity">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bos2-demo.ilrt.bris.ac.uk/entity">
+  <!--
+		This is a "Bristol Online Surveys Demo" Authentic2 SP for the University of Bristol.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-10T11:06:58Z"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Bristol Online Surveys Demo service</mdui:DisplayName>
         <mdui:Description xml:lang="en">BOS is an easy-to-use service that allows you to develop, deploy, and 
 					analyse surveys via the Web. Extensively used in UK HE.</mdui:Description>
         <mdui:Logo height="80" width="185">https://www.survey.bris.ac.uk/graphics/bos-logo.png</mdui:Logo>
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -45,27 +48,27 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleLogout" ResponseLocation="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleLogoutReturn"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleLogoutSOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/manageNameIdSOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/manageNameId" ResponseLocation="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/manageNameIdReturn"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleSignOnArtifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleSignOnPost" index="2"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Bristol</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Bristol Online Surveys Demo service</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.survey.bris.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Ed</md:GivenName>
-    <md:SurName>Crewe</md:SurName>
-    <md:EmailAddress>mailto:ed.crewe@bris.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ed</md:GivenName>
-    <md:SurName>Crewe</md:SurName>
-    <md:EmailAddress>mailto:ed.crewe@bris.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleLogout" ResponseLocation="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleLogoutReturn"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleLogoutSOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/manageNameIdSOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/manageNameId" ResponseLocation="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/manageNameIdReturn"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleSignOnArtifact" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bos2-demo.ilrt.bris.ac.uk/authsaml2/singleSignOnPost" index="2"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Bristol</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Bristol Online Surveys Demo service</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.survey.bris.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Ed</GivenName>
+    <SurName>Crewe</SurName>
+    <EmailAddress>mailto:ed.crewe@bris.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ed</GivenName>
+    <SurName>Crewe</SurName>
+    <EmailAddress>mailto:ed.crewe@bris.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>