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/pubs.acs.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml
index 28ceb37e..66facdbe 100644
--- a/swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubs.acs.org/shibboleth">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubs.acs.org/shibboleth">
+  <!--
+		This is an "ACS Publications" SP for the American Chemical Society, Inc.
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-18T17:36:00Z">
       <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 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">ACS Publications</mdui:DisplayName>
         <mdui:Description xml:lang="en">Publishes products and services for the practice and advancement of the chemical sciences.</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://pubs.acs.org/page/about-us.html</mdui:InformationURL>
       </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -37,29 +40,29 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.acs.org/action/samlACS" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.acs.org/action/saml2post" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.acs.org/action/saml2artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">American Chemical Society, Inc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ACS Publications</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.acs.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Kal</md:GivenName>
-    <md:SurName>Hashmani</md:SurName>
-    <md:EmailAddress>mailto:k_hashmani@acs.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gabriel</md:GivenName>
-    <md:SurName>Kiblin</md:SurName>
-    <md:EmailAddress>mailto:g_kiblin@acs.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John</md:GivenName>
-    <md:SurName>MacArthur</md:SurName>
-    <md:EmailAddress>mailto:j_macarthur@acs.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.acs.org/action/samlACS" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.acs.org/action/saml2post" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.acs.org/action/saml2artifact" index="3"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">American Chemical Society, Inc</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">ACS Publications</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.acs.org/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Kal</GivenName>
+    <SurName>Hashmani</SurName>
+    <EmailAddress>mailto:k_hashmani@acs.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Gabriel</GivenName>
+    <SurName>Kiblin</SurName>
+    <EmailAddress>mailto:g_kiblin@acs.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>John</GivenName>
+    <SurName>MacArthur</SurName>
+    <EmailAddress>mailto:j_macarthur@acs.org</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>