diff options
author | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
commit | b53085c02cf81855379eb460206ee5a45abc9163 (patch) | |
tree | 5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml deleted file mode 100644 index aab892b9..00000000 --- a/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://platformdev-secure.palgraveconnect.com/shibboleth"> - <!-- - This is a Palgrave Connect OpenAthens SP for Macmillan Publishers Limited. - --> - <Extensions> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-14T15:05:33Z"/> - </Extensions> - <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> - <KeyDescriptor use="encryption"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDXjCCAkagAwIBAgIEUA5y6zANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJV - SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT - A05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29ubmVj - dC5jb20wHhcNMTIwNzI0MTAwMzIzWhcNMTUwNzI0MTAwMzIzWjBxMQswCQYDVQQG - EwJVSzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNV - BAsTA05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29u - bmVjdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClpsvzfYR2 - JlYzZElx7y+EoBqStGsaBrV2cLzxPRH6766SFX54bWVQEpPpO41Fdjh9+QHzglWk - XOCrO+bgTcqdat8t9pOTSxGuq5uu4wWNz7eGlXzaR54MKGU1T1XdNxGf++sStrvI - ggQh5XxdDUWn+mB5j0Q3IE0zUUQClDmvYhhXfSGd1iChHzO3z/jf+yEpflNVhdgo - XQJZW0OcwwV46X+BqH5NhWN+j44GHtDozvX+XAT1jp7qnchiXHcrsA6gjF1DuzNT - XuYa7GNo8inl6Mc+v1MaO3EaVZBc1tfuvkWBC/GLcuHGminyB3ckXZGoEuvqZ2HB - ve/IKaHz8OnzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKPsP4ULhqHt+J81MkAg - X/c61vNXrGIVZSrz3xea4TkKkvsKCWMo1FHqWjdciiXg+yooM6nrPxnnCyMojNuA - UG4c+tsa2uOfYoZdQ7SewVHGq0ybjrfXrrtD2BRfXwXq5SSF+x+XtaRTjCVIGBSr - +HzaaE6rIMeZTS+pBEXIegkYc8lnyCs0CpeX1Z+COEfQ4ciH+OuCMoDVheU0pkdm - 1WY2k3rJluzt/ebVxpCr95vbzC+2P6dsSXNs8IOqic1AeKAPSULUKTLxNQ2xfMyt - oPw888JFFsXn54w5CfuyMgEQDCEr1p6s/+H0QQwfabvIs7qcyK6l3eMbILFqG0Wy - ZuQ= - </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> - MIIDXjCCAkagAwIBAgIEUA5y6zANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJV - SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT - A05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29ubmVj - dC5jb20wHhcNMTIwNzI0MTAwMzIzWhcNMTUwNzI0MTAwMzIzWjBxMQswCQYDVQQG - EwJVSzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNV - BAsTA05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29u - bmVjdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClpsvzfYR2 - JlYzZElx7y+EoBqStGsaBrV2cLzxPRH6766SFX54bWVQEpPpO41Fdjh9+QHzglWk - XOCrO+bgTcqdat8t9pOTSxGuq5uu4wWNz7eGlXzaR54MKGU1T1XdNxGf++sStrvI - ggQh5XxdDUWn+mB5j0Q3IE0zUUQClDmvYhhXfSGd1iChHzO3z/jf+yEpflNVhdgo - XQJZW0OcwwV46X+BqH5NhWN+j44GHtDozvX+XAT1jp7qnchiXHcrsA6gjF1DuzNT - XuYa7GNo8inl6Mc+v1MaO3EaVZBc1tfuvkWBC/GLcuHGminyB3ckXZGoEuvqZ2HB - ve/IKaHz8OnzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKPsP4ULhqHt+J81MkAg - X/c61vNXrGIVZSrz3xea4TkKkvsKCWMo1FHqWjdciiXg+yooM6nrPxnnCyMojNuA - UG4c+tsa2uOfYoZdQ7SewVHGq0ybjrfXrrtD2BRfXwXq5SSF+x+XtaRTjCVIGBSr - +HzaaE6rIMeZTS+pBEXIegkYc8lnyCs0CpeX1Z+COEfQ4ciH+OuCMoDVheU0pkdm - 1WY2k3rJluzt/ebVxpCr95vbzC+2P6dsSXNs8IOqic1AeKAPSULUKTLxNQ2xfMyt - oPw888JFFsXn54w5CfuyMgEQDCEr1p6s/+H0QQwfabvIs7qcyK6l3eMbILFqG0Wy - ZuQ= - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/post" index="1" isDefault="true"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/art" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/post" index="3"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/art" index="4"/> - </SPSSODescriptor> - <Organization> - <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName> - <OrganizationDisplayName xml:lang="en">Macmillan Publishers Limited: Palgrave Connect Dev</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Mohammad</GivenName> - <SurName>Nawab</SurName> - <EmailAddress>mailto:m.nawab@nature.com</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>John</GivenName> - <SurName>Ollier</SurName> - <EmailAddress>mailto:j.ollier@nature.com</EmailAddress> - </ContactPerson> -</EntityDescriptor> |