From 3e579070efd7bfe7b7124bdb2457fc29bb74a85a Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 9 Jul 2015 00:17:07 +0200
Subject: http://metadata.ukfederation.org.uk/ukfederation-export.xml into
 swamid-interfederations-2.0

---
 .../www.asmscience.org-shibboleth.xml              | 55 ++++++++++++----------
 1 file changed, 29 insertions(+), 26 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 ec5e8479..5cf6b03a 100644
--- a/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.asmscience.org/shibboleth">
-  <md:Extensions>
+<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>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-31T15:36:54Z"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -31,8 +34,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -59,22 +62,22 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </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>
+    </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>
-- 
cgit v1.2.3