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

1 files changed, 31 insertions, 28 deletions

diff --git a/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml b/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml
index c7e71485..a02cf438 100644
--- a/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml
+++ b/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ezproxy.bodleian.ox.ac.uk/sp">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ezproxy.bodleian.ox.ac.uk/sp">
+  <!--
+		This is an EZproxy SP for the University of Oxford.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-01T13:52:15Z">
       <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:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -42,23 +45,23 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Oxford</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Oxford EZproxy service</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://bodleian.ox.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Simon</md:GivenName>
-    <md:SurName>McLeish</md:SurName>
-    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Simon</md:GivenName>
-    <md:SurName>McLeish</md:SurName>
-    <md:EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Oxford EZproxy service</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://bodleian.ox.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Simon</GivenName>
+    <SurName>McLeish</SurName>
+    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Simon</GivenName>
+    <SurName>McLeish</SurName>
+    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>