From 3e579070efd7bfe7b7124bdb2457fc29bb74a85a Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 9 Jul 2015 00:17:07 +0200
Subject: http://metadata.ukfederation.org.uk/ukfederation-export.xml into
 swamid-interfederations-2.0

---
 .../shibsp.ntu.ac.uk-shibboleth.xml                | 55 ++++++++++++----------
 1 file changed, 29 insertions(+), 26 deletions(-)

(limited to 'swamid-interfederations-2.0/shibsp.ntu.ac.uk-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/shibsp.ntu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibsp.ntu.ac.uk-shibboleth.xml
index 749b73a9..89ea4cc4 100644
--- a/swamid-interfederations-2.0/shibsp.ntu.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibsp.ntu.ac.uk-shibboleth.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibsp.ntu.ac.uk/shibboleth">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibsp.ntu.ac.uk/shibboleth">
+  <!--
+		This is a "NTU Confluence Service" Shibboleth SP for Nottingham Trent University.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-06T11:10:29Z">
       <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:1.1:protocol">
-    <md:KeyDescriptor>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -37,24 +40,24 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibsp.ntu.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.ntu.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Nottingham Trent University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NTU Confluence service</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Richard</md:GivenName>
-    <md:SurName>Cross</md:SurName>
-    <md:EmailAddress>mailto:richard.cross@ntu.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Lee</md:GivenName>
-    <md:SurName>Hallam</md:SurName>
-    <md:EmailAddress>mailto:ITSShibbolethTechnical@ntu.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibsp.ntu.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.ntu.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Nottingham Trent University</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">NTU Confluence service</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Richard</GivenName>
+    <SurName>Cross</SurName>
+    <EmailAddress>mailto:richard.cross@ntu.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Lee</GivenName>
+    <SurName>Hallam</SurName>
+    <EmailAddress>mailto:ITSShibbolethTechnical@ntu.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
-- 
cgit v1.2.3