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

1 files changed, 35 insertions, 32 deletions

diff --git a/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml
index abcddde1..de93dc6f 100644
--- a/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.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://adfs.geant.org/adfs/services/trust">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.geant.org/adfs/services/trust">
+  <!--
+		This is a "GÉANT Web Presence" ADFS SP for GÉANT Limited.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-08T14:43:52Z">
       <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">GÉANT Web Presence</mdui:DisplayName>
         <mdui:Description xml:lang="en">Suite of websites and web applications for GÉANT Project.</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="en">https://adfs.geant.org/PrivacyPolicy/GEANTWebPrivacyPolicy.htm</mdui:PrivacyStatementURL>
       </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>
@@ -36,8 +39,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>
@@ -60,26 +63,26 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.geant.org/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.geant.org/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <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://adfs.geant.org/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.geant.org/adfs/ls/" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GÉANT Limited</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GÉANT Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>GÉANT Ltd. Support</md:GivenName>
-    <md:EmailAddress>mailto:DANTEITSupport@dante.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>GÉANT Ltd. IT</md:GivenName>
-    <md:EmailAddress>mailto:it@dante.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.geant.org/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.geant.org/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <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://adfs.geant.org/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.geant.org/adfs/ls/" index="1"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">GÉANT Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GÉANT Ltd.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.geant.org/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>GÉANT Ltd. Support</GivenName>
+    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>GÉANT Ltd. IT</GivenName>
+    <EmailAddress>mailto:it@dante.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>