http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 29 insertions, 84 deletions

diff --git a/swamid-interfederations-2.0/secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/secure.nature.com-shibboleth.xml
index b4f3d20e..316bbb11 100644
--- a/swamid-interfederations-2.0/secure.nature.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/secure.nature.com-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://secure.nature.com/shibboleth">
-  <!--
-		This is an OpenAthens service provider for Nature Publishing Group (Macmillan Publishers Limited).
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.nature.com/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Nature Publishing Group journals</mdui:DisplayName>
         <mdui:Description xml:lang="en">Online access to Nature Publishing Group journals</mdui:Description>
@@ -16,8 +13,8 @@
         <mdui:Logo height="165" width="250">https://secure.nature.com/images/naturegroup_logo2.GIF</mdui:Logo>
         <mdui:Logo height="70" width="220">https://secure.nature.com/images/naturegroup_logo.GIF</mdui:Logo>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -40,77 +37,25 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIEUBaY0jANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEaMBgGA1UEAxMRc2VjdXJlLm5hdHVyZS5jb20wHhcNMTIwNzMwMTQyMzE0
-						WhcNMTUwNzMwMTQyMzE0WjBcMQswCQYDVQQGEwJVSzEPMA0GA1UEBxMGTG9uZG9u
-						MRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEaMBgGA1UEAxMRc2Vj
-						dXJlLm5hdHVyZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN
-						ab3XUgdogYGSr1QIaEGDF9YUvqapAg6Sq8rkGfahy2+Iqp+myMr0rqQpeDEpch6U
-						/figIswWVR4P5GA9+w68AKkmNGQhCmAbJQCWK3yQlDb8aHnPDG6aOZcJPsvT7lGs
-						/uyR5CkE9Hbvk3EbwKmnz7GDtxG6J/LrnO2VMEbfzgbFBe2saOdShY2ysUJ6ZVBM
-						+DtLBhJRGokaKrIOjunydAA2HHpBgOdjyiiZ6H2Q1XE+5iOLXRl4oyBTbJZKlgCC
-						ozBMFSI6x8oaMwA15Ik90BQD8baO7rB23Tumaw8cytgm5YxT1M923h2OfgNOw1qY
-						Frx3iKQk79n4ZynvxHDNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGY2fxjlC2+8
-						ZQIVdSVMR5470507XCMZ0vA33K2oScR1a+klcSFeOfu3Z+HEG4aCaB6E5wKpZPLZ
-						PQhZDNPhoUso4pBjOLOjWRG89ziWsfbMZ4JPlEmiK5U+zLOR4yA2T0ipiLGqS5pv
-						hmOditj2X06Ghbcn029hXKWsczc/dW0+ukraC9cndXkyESYkzc0spBtlMqKwrD8g
-						AeQV1hunv4YQE3qWv7zRvHaUmAmv5GyW6HQiBudCyrZx9AA3+2YRknwTSCUu6bYR
-						uVW5mhgM/CBHwaVDUF0abyuyizsj0KRc7tWbtxpwomE+symUtrrmQBqPW3B5yq6+
-						53kqJpLR8ZE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIEUBaY0jANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEaMBgGA1UEAxMRc2VjdXJlLm5hdHVyZS5jb20wHhcNMTIwNzMwMTQyMzE0
-						WhcNMTUwNzMwMTQyMzE0WjBcMQswCQYDVQQGEwJVSzEPMA0GA1UEBxMGTG9uZG9u
-						MRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEaMBgGA1UEAxMRc2Vj
-						dXJlLm5hdHVyZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN
-						ab3XUgdogYGSr1QIaEGDF9YUvqapAg6Sq8rkGfahy2+Iqp+myMr0rqQpeDEpch6U
-						/figIswWVR4P5GA9+w68AKkmNGQhCmAbJQCWK3yQlDb8aHnPDG6aOZcJPsvT7lGs
-						/uyR5CkE9Hbvk3EbwKmnz7GDtxG6J/LrnO2VMEbfzgbFBe2saOdShY2ysUJ6ZVBM
-						+DtLBhJRGokaKrIOjunydAA2HHpBgOdjyiiZ6H2Q1XE+5iOLXRl4oyBTbJZKlgCC
-						ozBMFSI6x8oaMwA15Ik90BQD8baO7rB23Tumaw8cytgm5YxT1M923h2OfgNOw1qY
-						Frx3iKQk79n4ZynvxHDNAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGY2fxjlC2+8
-						ZQIVdSVMR5470507XCMZ0vA33K2oScR1a+klcSFeOfu3Z+HEG4aCaB6E5wKpZPLZ
-						PQhZDNPhoUso4pBjOLOjWRG89ziWsfbMZ4JPlEmiK5U+zLOR4yA2T0ipiLGqS5pv
-						hmOditj2X06Ghbcn029hXKWsczc/dW0+ukraC9cndXkyESYkzc0spBtlMqKwrD8g
-						AeQV1hunv4YQE3qWv7zRvHaUmAmv5GyW6HQiBudCyrZx9AA3+2YRknwTSCUu6bYR
-						uVW5mhgM/CBHwaVDUF0abyuyizsj0KRc7tWbtxpwomE+symUtrrmQBqPW3B5yq6+
-						53kqJpLR8ZE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nature Publishing Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Macmillan Publishers Limited</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nature Publishing Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>John</md:GivenName>
+    <md:SurName>Ollier</md:SurName>
+    <md:EmailAddress>mailto:j.ollier@nature.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>