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/havana.ucs.ed.ac.uk-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml deleted file mode 100644 index e811c556..00000000 --- a/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://havana.ucs.ed.ac.uk/shibboleth"> - <!-- - This is a Shibboleth test SP hosted by the University of Edinburgh - for the JANET(UK) JVCS booking system. - --> - <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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol"> - <KeyDescriptor> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIID2DCCAsACCQDhpWXD/oCByTANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC - R0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGluYnVyZ2gxJDAiBgNV - BAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEPMA0GA1UECxMGSVMtSVRJ - MRwwGgYDVQQDExNoYXZhbmEudWNzLmVkLmFjLnVrMSIwIAYJKoZIhvcNAQkBFhNt - Lm1jaW50b3NoQGVkLmFjLnVrMB4XDTEzMDczMDE0MDM1N1oXDTMzMDcyNTE0MDM1 - N1owga0xCzAJBgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJ - RWRpbmJ1cmdoMSQwIgYDVQQKExtUaGUgVW5pdmVyc2l0eSBvZiBFZGluYnVyZ2gx - DzANBgNVBAsTBklTLUlUSTEcMBoGA1UEAxMTaGF2YW5hLnVjcy5lZC5hYy51azEi - MCAGCSqGSIb3DQEJARYTbS5tY2ludG9zaEBlZC5hYy51azCCASIwDQYJKoZIhvcN - AQEBBQADggEPADCCAQoCggEBAK2yC2qIxgLO+wMp4SKVyKCDpwDurMHkZkkTSidQ - MtWLNgYwHezrL0m8iZKnCNEzT2R5i2w23aKtBkBpDqyLFWKHVGEj5O386T4AB1BL - NJ1uqL6tNf1tkTxIBpubWWKKE8XIM/lLoN/mRJ54f/2yxiqvzvImoWA+3Uz7fIpW - /kcfyDNnWInxPDkY65Jj7Ymd9L1bRvejIeMTkAwjMatA+astXHL/fepWEu7dvXCU - 6Bhi95nmZTAw1dmiOCE7pfMYLM7Dn9yDNxTsk+pw0RQrEtFNoGPwxp68xJ2OmKmD - iIdxOp9Q0hm9KnnflTTMeGKFxsp+sjksdHh2M0N/h4JMAl8CAwEAATANBgkqhkiG - 9w0BAQUFAAOCAQEAUdniY6kaIwI0T6XxNTDUihAOwp2DAoEM/EaYRcR6DrxarzIu - 1UbxqKRkavje+s9HO8iiFPwpLM7fnksxBAnaeNTveH7hgvJ67ELGmTd303yf7FaY - PpB7VX5d95seuSYqedgciSA6pJRi7oalCryRSCZ0+9uqfO7DZQ8BnzjGZKvOU44q - TjlvzyFrtqiwsl8a0vDk7a7YLpD+tsgxgzvQ++x7x4RBiMLxPfoLtN4h13SoLya5 - JwJJ+DMu7camjdGd1nyg1jv/eEUA3vuQg7CPR3jONSw5dSsNK+jHMzeogG165oAV - IKD+m69XgWLE9gQQCzekuQChiZg5+O5EcyPAUA== - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/> - <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/> - <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/> - <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/> - <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/POST"/> - <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/> - </SPSSODescriptor> - <Organization> - <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName> - <OrganizationDisplayName xml:lang="en">University of Edinburgh: JANET(UK) JVCS booking system</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.jvcs.ja.net/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Mark</GivenName> - <SurName>McIntosh</SurName> - <EmailAddress>mailto:M.McIntosh@ed.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Mark</GivenName> - <SurName>McIntosh</SurName> - <EmailAddress>mailto:M.McIntosh@ed.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |