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/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml')
| -rw-r--r-- | swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml deleted file mode 100644 index fcb55bda..00000000 --- a/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://arch2moodle.conted.ox.ac.uk/shibboleth-sp"> - <!-- - This is an "Archive for award bearing courses site" Shibboleth for the University of Oxford. - --> - <Extensions> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-11-14T17:08:00Z"> - <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy> - </mdrpi:RegistrationInfo> - </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> - MIIEpjCCA46gAwIBAgIJALdGk/GDLkgoMA0GCSqGSIb3DQEBBQUAMIHTMQswCQYD - VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd - MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l - bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSQwIgYDVQQDDBthcmNoMm1vb2Rs - ZS5jb250ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNv - bnRlZC5veC5hYy51azAeFw0xNDA1MTkxNTQ1MTFaFw0yNDA1MTYxNTQ1MTFaMIHT - MQswCQYDVQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94 - Zm9yZDEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0Rl - cGFydG1lbnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSQwIgYDVQQDDBthcmNo - Mm1vb2RsZS5jb250ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5 - bG9yQGNvbnRlZC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC - ggEBAL0OZbHXRsG9wrB70737KdlY8xdaDGvSedBTPKYXIf00B4xMLSXsYov19yTO - rcPLuVda0rNt85mTrC/M/VD9hlHgzALnJIsApqUprsDzoTS/vClWwNyqOKP4mDWF - Yqw2nUUekJKrdcHETNptAsmqFcevv/EVCBd6OCNZExNAVYwvZvSDKT92Y0Ou3Nvt - c4Lxndyq3LQTbXwuB69ctx0SZbHB6MOUD0dFdmH6g22jzuA59M1Gevc0cXXUvw+a - qGsUTtRN85Q5t0lCs9UvW+9N4nvAHkuR8wnn7/ate0VyPuHrbkSOEoCbVtafkx6c - /A2SfiYmP5g8aCFSoGHqu3iWhocCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB - hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE - FPXvl+z8qlRh81pc6/+0moo6Uz2NMB8GA1UdIwQYMBaAFPXvl+z8qlRh81pc6/+0 - moo6Uz2NMA0GCSqGSIb3DQEBBQUAA4IBAQAph+BB117ucSrjA4bg1DjzeQYwMmgS - ndz5kQXqgTyafXs/3sSBNS9g9hKKadzntTLQdoSytzgcEDIhskzl9FkJQN6scq96 - +LmZZjz9CIXyn3dBLOBpP2whuT4V8CetustNdbTMZE2xml0JCmeHL0uy87bQS37S - v9uevHXdxb1EoZxRZmue4mWPJYfEuT0xSLSLXxah60bgS/t3rBuRXVmOuicxHylM - Wr9ZuBF0R/9h9gbOS1vyTM9TCrZtA39HBCyDFCt6TH4KNiXX9B9a3cX3a8mADfZI - eouxo4D9OsCnCEJs7ZFa2Hbzcoxi+t2mOKR1BmE2YsOAIqyw4YnpARHv - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://arch2moodle.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://arch2moodle.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="6"/> - </SPSSODescriptor> - <Organization> - <OrganizationName xml:lang="en">University of Oxford</OrganizationName> - <OrganizationDisplayName xml:lang="en">University of Oxford: Archive for award bearing courses site</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Mike</GivenName> - <SurName>Taylor</SurName> - <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Mike</GivenName> - <SurName>Taylor</SurName> - <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |