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/nortcoll.ac.uk-oala-metadata.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml')
| -rw-r--r-- | swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml deleted file mode 100644 index d4b8156a..00000000 --- a/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.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://nortcoll.ac.uk/oala/metadata"> - <!-- - This is an OpenAthens LA IdP for Bath College. - --> - <Extensions> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-28T10:54:50Z"/> - </Extensions> - <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0"> - <Extensions> - <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nortcoll.ac.uk</shibmd:Scope> - </Extensions> - <KeyDescriptor use="signing"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDUDCCAjigAwIBAgIIQ+s4Z37Tk+QwDQYJKoZIhvcNAQEFBQAwPzEgMB4GA1UE - CgwXTm9ydG9uIFJhZHN0b2NrIENvbGxlZ2UxGzAZBgNVBAMMEmlkcC5ub3J0Y29s - bC5hYy51azAeFw0xMzA2MjYwOTUyNTVaFw0yMzA2MjYwOTUyNTVaMD8xIDAeBgNV - BAoMF05vcnRvbiBSYWRzdG9jayBDb2xsZWdlMRswGQYDVQQDDBJpZHAubm9ydGNv - bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH2GL7v3ab - MLFWgzBVzSj8VLSGJ9ATCAdxU9rfFTJm/9OWMo13AReVUclXxf56GQo0FJOc39hM - 6XsyyeZTts2nDDUzg+t0Xibp2UKLSppkuSwVGTqHMaJp7DpUCEluUnhu3ZU/lBwo - ZiOb7IGtRvMlTgCkaIlAmvrrGvx09F9AopZdIY6a4kL6Oia8IpIP3pmeRqP7wrG1 - 28kjGbS/4nhAGKvwl+pzBGbnKXPLPXV6xrJB7S4KeS/RotDLgoI9/BOj9CCpjE2U - FtrQ3NEkfWhIVlZtJ+9M5YchdhsL1NwiO/ysgeLCOb+PJ0i1hkl7YxPf5oYgk37M - kPkontewA0prAgMBAAGjUDBOMB0GA1UdDgQWBBTEMkl+KBelULhBUBgqoQSs3Zk2 - jzAfBgNVHSMEGDAWgBTEMkl+KBelULhBUBgqoQSs3Zk2jzAMBgNVHRMEBTADAQH/ - MA0GCSqGSIb3DQEBBQUAA4IBAQCSYXa4gCKN3kYfrj3zI0qlVhdP0lqxbj3NvtbK - zt+XYGjOX9/cW51qe7islCZ4jQcBeiq0NKMHHvLSQm38xy0T18VOLplrnXBU+0Uo - NnE0ausV72tNdfOz4QjcAnB0IwZRQr4geoBva4pV92l3Ru9UyYzwu0dH1IHc6j6W - bHhSmZU3SkxAghaK0RKw+VdI0IEXmAjIXgYvKSp4ERZtQxQiHzDaC6TnINxbJYaL - CSul4tUiaGBvrD99sK5xjSXRyT76i+NqkzJme8EXyYH6C+s/pkoragQycIXRTAjo - J0oYK7cSzs2XI5pXVxiG7kNJsJQjVrM0wa9wTu+fWkXIg1Pq - </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> - MIIDUDCCAjigAwIBAgIIQ+s4Z37Tk+QwDQYJKoZIhvcNAQEFBQAwPzEgMB4GA1UE - CgwXTm9ydG9uIFJhZHN0b2NrIENvbGxlZ2UxGzAZBgNVBAMMEmlkcC5ub3J0Y29s - bC5hYy51azAeFw0xMzA2MjYwOTUyNTVaFw0yMzA2MjYwOTUyNTVaMD8xIDAeBgNV - BAoMF05vcnRvbiBSYWRzdG9jayBDb2xsZWdlMRswGQYDVQQDDBJpZHAubm9ydGNv - bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH2GL7v3ab - MLFWgzBVzSj8VLSGJ9ATCAdxU9rfFTJm/9OWMo13AReVUclXxf56GQo0FJOc39hM - 6XsyyeZTts2nDDUzg+t0Xibp2UKLSppkuSwVGTqHMaJp7DpUCEluUnhu3ZU/lBwo - ZiOb7IGtRvMlTgCkaIlAmvrrGvx09F9AopZdIY6a4kL6Oia8IpIP3pmeRqP7wrG1 - 28kjGbS/4nhAGKvwl+pzBGbnKXPLPXV6xrJB7S4KeS/RotDLgoI9/BOj9CCpjE2U - FtrQ3NEkfWhIVlZtJ+9M5YchdhsL1NwiO/ysgeLCOb+PJ0i1hkl7YxPf5oYgk37M - kPkontewA0prAgMBAAGjUDBOMB0GA1UdDgQWBBTEMkl+KBelULhBUBgqoQSs3Zk2 - jzAfBgNVHSMEGDAWgBTEMkl+KBelULhBUBgqoQSs3Zk2jzAMBgNVHRMEBTADAQH/ - MA0GCSqGSIb3DQEBBQUAA4IBAQCSYXa4gCKN3kYfrj3zI0qlVhdP0lqxbj3NvtbK - zt+XYGjOX9/cW51qe7islCZ4jQcBeiq0NKMHHvLSQm38xy0T18VOLplrnXBU+0Uo - NnE0ausV72tNdfOz4QjcAnB0IwZRQr4geoBva4pV92l3Ru9UyYzwu0dH1IHc6j6W - bHhSmZU3SkxAghaK0RKw+VdI0IEXmAjIXgYvKSp4ERZtQxQiHzDaC6TnINxbJYaL - CSul4tUiaGBvrD99sK5xjSXRyT76i+NqkzJme8EXyYH6C+s/pkoragQycIXRTAjo - J0oYK7cSzs2XI5pXVxiG7kNJsJQjVrM0wa9wTu+fWkXIg1Pq - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nortcoll.ac.uk/oala/sso"/> - <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nortcoll.ac.uk/oala/sso"/> - </IDPSSODescriptor> - <Organization> - <OrganizationName xml:lang="en">Bath College</OrganizationName> - <OrganizationDisplayName xml:lang="en">Norton Radstock College</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.nortcoll.ac.uk/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Kye</GivenName> - <SurName>Pearce-Rees</SurName> - <EmailAddress>mailto:kye.pearce-rees@nortcoll.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Kye</GivenName> - <SurName>Pearce-Rees</SurName> - <EmailAddress>mailto:kye.pearce-rees@nortcoll.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |