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

1 files changed, 31 insertions, 28 deletions

diff --git a/swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.xml b/swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.xml
index 1b56e33d..e7aac76d 100644
--- a/swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.xml
+++ b/swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.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://bath-test.topdesk.net/tas/secure/login/verify">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bath-test.topdesk.net/tas/secure/login/verify">
+  <!--
+		This is a "TOPdesk (test)" TOPdesk SP for the University of Bath.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-18T13:18:10Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" 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">University of Bath: TOPdesk (test)</mdui:DisplayName>
         <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
+    </Extensions>
+    <KeyDescriptor use="encryption">
       <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="signing">
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -65,22 +68,22 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <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://bath-test.topdesk.net/tas/secure/login/verify" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Bath</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Bath: TOPdesk (test)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://bath.topdesk.net/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Webmaster</md:GivenName>
-    <md:EmailAddress>mailto:webmaster@bath.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Richard</md:GivenName>
-    <md:SurName>Phillips</md:SurName>
-    <md:EmailAddress>mailto:R.I.Phillips@bath.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <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://bath-test.topdesk.net/tas/secure/login/verify" index="0"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Bath</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Bath: TOPdesk (test)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://bath.topdesk.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Webmaster</GivenName>
+    <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Richard</GivenName>
+    <SurName>Phillips</SurName>
+    <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>