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

1 files changed, 39 insertions, 36 deletions

diff --git a/swamid-interfederations-2.0/tdnetdiscover.com-saml2-prod.xml b/swamid-interfederations-2.0/tdnetdiscover.com-saml2-prod.xml
index 8c31a937..91afd00c 100644
--- a/swamid-interfederations-2.0/tdnetdiscover.com-saml2-prod.xml
+++ b/swamid-interfederations-2.0/tdnetdiscover.com-saml2-prod.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://tdnetdiscover.com/saml2/prod">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://tdnetdiscover.com/saml2/prod">
+  <!--
+		This is a SP for TDNet Ltd.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-08-18T11:20:07Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <SPSSODescriptor 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">TDNet Discover</mdui:DisplayName>
         <mdui:Description xml:lang="en">Empowers users to discover and obtain all the information they need to bridge the gaps of knowledge.</mdui:Description>
         <mdui:Logo height="34" width="147">https://tdnetdiscover.com/ui/content/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>
@@ -37,32 +40,32 @@
 					</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://tdnetdiscover.com/shibboleth/acs" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">TDNet Discover</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Empowers users to discover and obtain all the information they need to bridge the gaps of knowledge.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">TDNet Ltd</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">TDNet Discover</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.tdnet.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>TDNet</md:GivenName>
-    <md:SurName>Customer Support</md:SurName>
-    <md:EmailAddress>mailto:support@tdnet.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gidon</md:GivenName>
-    <md:SurName>Junge</md:SurName>
-    <md:EmailAddress>mailto:gidon@tdnet.com</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://tdnetdiscover.com/shibboleth/acs" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">TDNet Discover</ServiceName>
+      <ServiceDescription xml:lang="en">Empowers users to discover and obtain all the information they need to bridge the gaps of knowledge.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">TDNet Ltd</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">TDNet Discover</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.tdnet.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>TDNet</GivenName>
+    <SurName>Customer Support</SurName>
+    <EmailAddress>mailto:support@tdnet.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Gidon</GivenName>
+    <SurName>Junge</SurName>
+    <EmailAddress>mailto:gidon@tdnet.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>