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

1 files changed, 36 insertions, 33 deletions

diff --git a/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml
index 0908dd03..22ff7987 100644
--- a/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml
+++ b/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala.surrey.ac.uk/oala/metadata">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala.surrey.ac.uk/oala/metadata">
+  <!--
+		This is an OpenAthens MD IdP for the University of Surrey.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T14:53:23Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" 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 WantAuthnRequestsSigned="false" 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">surrey.ac.uk</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    </Extensions>
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -37,8 +40,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -66,27 +69,27 @@
 					</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/surrey.ac.uk/c/ukfed"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/surrey.ac.uk/c/ukfed"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Surrey</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Surrey</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surrey.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Claire</md:GivenName>
-    <md:SurName>Gill</md:SurName>
-    <md:EmailAddress>mailto:c.j.gill@surrey.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Abdul</md:GivenName>
-    <md:SurName>Minhas</md:SurName>
-    <md:EmailAddress>mailto:a.minhas@surrey.ac.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/surrey.ac.uk/c/ukfed"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/surrey.ac.uk/c/ukfed"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Surrey</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Surrey</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.surrey.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Claire</GivenName>
+    <SurName>Gill</SurName>
+    <EmailAddress>mailto:c.j.gill@surrey.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Abdul</GivenName>
+    <SurName>Minhas</SurName>
+    <EmailAddress>mailto:a.minhas@surrey.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Athens Helpdesk</GivenName>
+    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>