From 8af645334f7e6137e88ca057be6f188d098250ad Mon Sep 17 00:00:00 2001
From: Anders Lördal <anders@lordal.se>
Date: Fri, 11 Sep 2015 14:33:50 +0200
Subject: http://metadata.ukfederation.org.uk/ukfederation-export.xml into
 swamid-interfederations-2.0

---
 .../test-secure.nature.com-shibboleth.xml          | 57 ++++++++++++----------
 1 file changed, 30 insertions(+), 27 deletions(-)

(limited to 'swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml
index 61af4fa6..ae90093e 100644
--- a/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-secure.nature.com-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://test-secure.nature.com/shibboleth">
-  <md:Extensions>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-secure.nature.com/shibboleth">
+  <!--
+		This is an OpenAthens 2 (test) service provider for Nature Publishing Group (Macmillan Publishers Limited).
+	-->
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -30,25 +33,25 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-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://test-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://test-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://test-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 (test)</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>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-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://test-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-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 (test)</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>
-- 
cgit v1.2.3