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

1 files changed, 42 insertions, 70 deletions

diff --git a/swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml
index a2e4facf..0530fd76 100644
--- a/swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml
@@ -1,82 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-secure.palgrave-journals.com/shibboleth">
-  <!--
-		This is an OpenAthens 2 SP for Macmillan Publishers Limited.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-secure.palgrave-journals.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">
-    <KeyDescriptor use="encryption">
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-						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
+						MIIDdzCCAl+gAwIBAgIEZnzg8DANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQGEwJV
 						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
 						A05QRzEqMCgGA1UEAxMhdGVzdC1zZWN1cmUucGFsZ3JhdmUtam91cm5hbHMuY29t
-						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
+						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
-						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
+						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
+						uU1h/2oAHZduSdY55wvXQYvJQCCwh5IFMgPf
 					</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>
-						MIIDVDCCAjygAwIBAgIET2caJjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEqMCgGA1UEAxMhdGVzdC1zZWN1cmUucGFsZ3JhdmUtam91cm5hbHMuY29t
-						MB4XDTEyMDMxOTExMzYwNloXDTE1MDMxOTExMzYwNlowbDELMAkGA1UEBhMCVUsx
-						DzANBgNVBAcTBkxvbmRvbjESMBAGA1UEChMJTWFjbWlsbGFuMQwwCgYDVQQLEwNO
-						UEcxKjAoBgNVBAMTIXRlc3Qtc2VjdXJlLnBhbGdyYXZlLWpvdXJuYWxzLmNvbTCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIoNcsvMozRfV8S+0W7sqKB4
-						pbUQyP7zd8IM/i7lx09v11z4QnprdGr0165v+FG3QLK7dzvHPzJin2O+/KEI00lK
-						Rm6iRtopGkL4uaz1lzNqm+UODmmxVIy7bjEmw59CrtQ2+WMymwevbWQZfIo/55wH
-						b65USn/bBkhafv3FuXwAPq06IuufhbirJk7jW6eI+Ef5JF4nu0DZTdFdD/znK2ih
-						PLsm+V1hYvKlMrAu+KdjGSv+McSF0GxB4OCLy0SS1aYYQgDv/TYWn8MMMwHQ3Dqr
-						ZuGIabuJ0OiUxv8DNAov7hiJIzCiYXprgX4fBhmRAtibMO3aI9klofqSjmAqbI0C
-						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAP4JcAlIwxtT9nwqdnOjKuGDHpknrPAGF
-						VssPB4cuHmlV/qQTm1rGVfI6SAM41BfG+rg+JsE84PCTWHWAkSH7UopMm417/A7l
-						pagQEKOKB+JTz1fvSF9wXk8nrBuacfTe33mD0NaDrFa+wYCbK6M0cd79qMDKb7zu
-						8RExGNUJmAeFNmMhql737DLZDE37OcdKWJuYqUkKpvi7dtx1MHjATDhzqW8W92tW
-						syCWJ1maeLAWLEij76i6KiU1vAec6ttH1qxyAjOV3Hz1K9mk5JhNPZQVJJnBJI5a
-						TrTDTgRHovF4QucVMSlNDSdtnG2InN8inOr8IvTx740AHKPlPd26xw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.palgrave-journals.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.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Palgrave Journals (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</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://test-secure.palgrave-journals.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.palgrave-journals.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.palgrave-journals.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.palgrave-journals.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">Palgrave Journals (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</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>