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/yorksj.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml
index 9b2e7a30..65828165 100644
--- a/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.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://yorksj.idm.oclc.org/shibboleth">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://yorksj.idm.oclc.org/shibboleth">
+  <!--
+		This is a "York St John University" EZproxy SP for OCLC (UK) Limited.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-08T10:21:53Z">
       <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 urn:oasis:names:tc:SAML:1.1:protocol ">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1: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://login.yorksj.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -38,23 +41,23 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">OCLC (UK) Limited</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">York St John University Hosted EZProxy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.oclc.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>OCLC UK Support Desk</md:GivenName>
-    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>OCLC UK Support Desk</md:GivenName>
-    <md:EmailAddress>mailto:support-uk@oclc.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">York St John University Hosted EZProxy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>OCLC UK Support Desk</GivenName>
+    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>OCLC UK Support Desk</GivenName>
+    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>