From 567ef25fb9e7a968c8cd8fb7bf1ea88f9cf8d203 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 8 Dec 2015 14:05:34 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../dl.acm.org-oa-metadata.xml                     | 61 ++++++++++------------
 1 file changed, 29 insertions(+), 32 deletions(-)

(limited to 'swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml')

diff --git a/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml b/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml
index da7fa6e1..2307bc19 100644
--- a/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml
+++ b/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dl.acm.org/oa/metadata">
-  <!--
-		This is an OpenAthens 2 SP for Association for Computing Machinery, Inc.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dl.acm.org/oa/metadata">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -32,8 +29,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -58,25 +55,25 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dl.acm.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dl.acm.org/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dl.acm.org/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dl.acm.org/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Association for Computing Machinery, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Association For Computing Machinery: ACM Digital Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.acm.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Asad</GivenName>
-    <SurName>Ali</SurName>
-    <EmailAddress>mailto:ali@acm.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Greenberg</SurName>
-    <EmailAddress>mailto:greenberg@acm.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dl.acm.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dl.acm.org/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dl.acm.org/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dl.acm.org/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Association for Computing Machinery, Inc.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Association For Computing Machinery: ACM Digital Library</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.acm.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Asad</md:GivenName>
+    <md:SurName>Ali</md:SurName>
+    <md:EmailAddress>mailto:ali@acm.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Adam</md:GivenName>
+    <md:SurName>Greenberg</md:SurName>
+    <md:EmailAddress>mailto:greenberg@acm.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3