From ea2380ce7db65eea08f262ec51333a84349ac53a Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Mon, 31 Aug 2015 14:25:40 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../www.asmscience.org-shibboleth.xml              | 55 ++++++++++------------
 1 file changed, 26 insertions(+), 29 deletions(-)

(limited to 'swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml b/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml
index 5cf6b03a..ec5e8479 100644
--- a/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.asmscience.org/shibboleth">
-  <!--
-		This is an "ASM Science" OpenAthens SP for Publishing Technology plc. 
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.asmscience.org/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-31T15:36:54Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -34,8 +31,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>
@@ -62,22 +59,22 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.asmscience.org/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.asmscience.org/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ASM Science</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.asmscience.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service</GivenName>
-    <EmailAddress>mailto:service@asmusa.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Arbuthnott</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.asmscience.org/session/shib" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.asmscience.org/session/shib" index="2"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Publishing Technology plc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ASM Science</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.asmscience.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Service</md:GivenName>
+    <md:EmailAddress>mailto:service@asmusa.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Arbuthnott</md:SurName>
+    <md:EmailAddress>mailto:openathens@publishingtechnology.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3