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/bits-dev.uas.ox.ac.uk-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml deleted file mode 100644 index 46245429..00000000 --- a/swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bits-dev.uas.ox.ac.uk/shibboleth"> - <!-- - This is a 'Business Intelligence Development Environment' Tableau Server SP for the University of Oxford. - --> - <Extensions> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T10:19:31Z"> - <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy> - </mdrpi:RegistrationInfo> - </Extensions> - <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> - <KeyDescriptor use="signing"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDHTCCAgWgAwIBAgIJAPX9ZMiSNYDiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV - BAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azAeFw0xMjA1MTUxNTIwMTJaFw0yMjA1 - MTMxNTIwMTJaMCAxHjAcBgNVBAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azCCASIw - DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7/B49gX3LryCKiTawlklJBKTNl - LrCIrohEDTEFEYRvGn/YETCR1I0z0LmNz6mrqR3ZVtX7pdQZxF7o5vBsFgKp19Dx - 9iTl9MqaVfAmgD7wj+IOe5vCHMKiBT1HD1B8eJiCL9kWdG87AfH5LLZlflcUTBGY - hcL2iBfMIHdsU3qM4/h6wmBdQt15Rcc9rspuM9yahL3CgHt6ivTV5akZ0zWCCRXP - AP9lnice3cs4xxanhMeV3ldMbGPC4R8RP4uxloA19a18VvYC8JBYzVRfmdHq8A7E - aziSye+k6/pMDRuW2Q5pQmmwsHlLJwslapRkvnwh5bYjpZsU/wDXImMQ2bMCAwEA - AaNaMFgwNwYDVR0RBDAwLoIVYml0cy1kZXYudWFzLm94LmFjLnVrhhViaXRzLWRl - di51YXMub3guYWMudWswHQYDVR0OBBYEFA7Qoo+j5LHk9+MUiqKZqsIX8VL3MA0G - CSqGSIb3DQEBBQUAA4IBAQAfBJ6Yy4bPFD7IM62gmcjX5WPZXlQn7w0LeLRnzvPp - d+EKAkp2zRYHpimxkvkol/89QpJR6E6Ta3ZE0Kc6hm8DDPRcKZUQ6GevmIBJFKV2 - uGltW8WOCjINAfVcLsVOnhxWo8z6PjL8V+wUJWIZ7gY3wTAhUHh9SpCIv/W6rTBM - 09Fx9GjuCeASiKivQSpWDYjuZGCt50y7xN/Q8Nq4crOZ30b51QawNAusNqmNOuI9 - ZjXp/kn1jcYC5+48iEzuS4xk2PApy43g+PQq/ZcBjHsdDcuiRZPDOmwKjpZEE3u2 - 2tGYyfRBDPB/0Mjc7RunWPkOvZUQLA7ndT/Hl+K828MZ - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <KeyDescriptor use="encryption"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDHTCCAgWgAwIBAgIJAPX9ZMiSNYDiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV - BAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azAeFw0xMjA1MTUxNTIwMTJaFw0yMjA1 - MTMxNTIwMTJaMCAxHjAcBgNVBAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azCCASIw - DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7/B49gX3LryCKiTawlklJBKTNl - LrCIrohEDTEFEYRvGn/YETCR1I0z0LmNz6mrqR3ZVtX7pdQZxF7o5vBsFgKp19Dx - 9iTl9MqaVfAmgD7wj+IOe5vCHMKiBT1HD1B8eJiCL9kWdG87AfH5LLZlflcUTBGY - hcL2iBfMIHdsU3qM4/h6wmBdQt15Rcc9rspuM9yahL3CgHt6ivTV5akZ0zWCCRXP - AP9lnice3cs4xxanhMeV3ldMbGPC4R8RP4uxloA19a18VvYC8JBYzVRfmdHq8A7E - aziSye+k6/pMDRuW2Q5pQmmwsHlLJwslapRkvnwh5bYjpZsU/wDXImMQ2bMCAwEA - AaNaMFgwNwYDVR0RBDAwLoIVYml0cy1kZXYudWFzLm94LmFjLnVrhhViaXRzLWRl - di51YXMub3guYWMudWswHQYDVR0OBBYEFA7Qoo+j5LHk9+MUiqKZqsIX8VL3MA0G - CSqGSIb3DQEBBQUAA4IBAQAfBJ6Yy4bPFD7IM62gmcjX5WPZXlQn7w0LeLRnzvPp - d+EKAkp2zRYHpimxkvkol/89QpJR6E6Ta3ZE0Kc6hm8DDPRcKZUQ6GevmIBJFKV2 - uGltW8WOCjINAfVcLsVOnhxWo8z6PjL8V+wUJWIZ7gY3wTAhUHh9SpCIv/W6rTBM - 09Fx9GjuCeASiKivQSpWDYjuZGCt50y7xN/Q8Nq4crOZ30b51QawNAusNqmNOuI9 - ZjXp/kn1jcYC5+48iEzuS4xk2PApy43g+PQq/ZcBjHsdDcuiRZPDOmwKjpZEE3u2 - 2tGYyfRBDPB/0Mjc7RunWPkOvZUQLA7ndT/Hl+K828MZ - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat> - <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat> - <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat> - <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat> - <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits-dev.uas.ox.ac.uk/wg/saml/SSO/index.html" index="0" isDefault="true"/> - </SPSSODescriptor> - <Organization> - <OrganizationName xml:lang="en">University of Oxford</OrganizationName> - <OrganizationDisplayName xml:lang="en">University of Oxford: Business Intelligence Development Environment</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Operations Team</GivenName> - <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Nick</GivenName> - <SurName>Letellier</SurName> - <EmailAddress>mailto:nick.letellier@it.ox.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |