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

1 files changed, 28 insertions, 25 deletions

diff --git a/swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml
index 8a1f36bb..bf803ca3 100644
--- a/swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ccn.ac.uk/shibboleth">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ccn.ac.uk/shibboleth">
+  <!--
+		This is an IdP (owned by Eduserv) for City College Norwich.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccn.ac.uk</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -35,21 +38,21 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ccn.ac.uk/c/ukfed"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ccn.ac.uk/c/ukfed"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Eduserv</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">City College Norwich</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ccn.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Athens Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Athens Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:athenshelp@eduserv.org.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ccn.ac.uk/c/ukfed"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ccn.ac.uk/c/ukfed"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">City College Norwich</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ccn.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Athens Helpdesk</GivenName>
+    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Athens Helpdesk</GivenName>
+    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>