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/athens.winchester.ac.uk-oala-metadata.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml')
| -rw-r--r-- | swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml deleted file mode 100644 index ce8a306e..00000000 --- a/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athens.winchester.ac.uk/oala/metadata"> - <!-- - This is an OpenAthens LA IdP for the University of Winchester. - --> - <Extensions> - <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> - <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> - <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue> - </saml:Attribute> - </mdattr:EntityAttributes> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-08T13:59:39Z"/> - </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">winchester.ac.uk</shibmd:Scope> - </Extensions> - <KeyDescriptor use="signing"> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDXDCCAkSgAwIBAgIIQmqDispxGNswDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE - CgwYVW5pdmVyc2l0eSBvZiBXaW5jaGVzdGVyMSAwHgYDVQQDDBdhdGhlbnMud2lu - Y2hlc3Rlci5hYy51azAeFw0xMzA3MDMxMDA5NTlaFw0yMzA3MDMxMDA5NTlaMEUx - ITAfBgNVBAoMGFVuaXZlcnNpdHkgb2YgV2luY2hlc3RlcjEgMB4GA1UEAwwXYXRo - ZW5zLndpbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK - AoIBAQCJ1jkVRgLTXubvfnTjrgldm0Lzg0A7LLkiBtcRhimvbf5ZWO69qaiPOi7U - ZqS2nI1OKErrQV8QImOv15sbYZesSqnErkOiitJbOvdGliwIR5x4njSrqA7d4heZ - G8dbYpEtJexNz1Lct4pzDxq7FP3uixX+CYuutrTsxCrrsO450zs0aVzM2qUEK9GZ - r144+6H4cA8AKQD0rB1uqv9aNDZljkWhkgMUoUCkjc1mXsmuSP+0DappKGBhIdRH - KBisDT4+d3QBvt7HaY9xi0bQllu05enGeA5PaPfIaZFOEXVA28bgrHcbDaa2Ccb9 - xIpVaKsMGh/cK4JExZjTxdnGCvF5AgMBAAGjUDBOMB0GA1UdDgQWBBTZsfd42w9Y - 1+pqgyYhGZqJp7Y2+jAfBgNVHSMEGDAWgBTZsfd42w9Y1+pqgyYhGZqJp7Y2+jAM - BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBjPCDp8APA44IqqaCxdxIe - +UqgLVMCRMSP2d4F5x99/OLOfSLLVqCZMVddqkwbgGi+/Q8Zw7NCcJw4QaY4nzO8 - 7UXTsACjlQz5fD+FdxjVGkfIc3aSRH8Ly83W5RveQdaTukhmaFdM1ndK0TqhMc7n - owepHnvJwak5PH6KyZ1FYNLhCfjh4xNuuwhmoh60XAweUWZzP9IfS2VxNNzBv3+5 - fcaD4APnIG4TQqH263QTMpdv31bgHuYCs90L4+7ZjF90CCPxvhmEg0MYbdabCJOz - TQq4kHUbCj4NK67GjP305jurZGiOUQRqy3ma0TcwYkElPkKZj6hZEPvNfuRTp2V9 - </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> - MIIDXDCCAkSgAwIBAgIIQmqDispxGNswDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE - CgwYVW5pdmVyc2l0eSBvZiBXaW5jaGVzdGVyMSAwHgYDVQQDDBdhdGhlbnMud2lu - Y2hlc3Rlci5hYy51azAeFw0xMzA3MDMxMDA5NTlaFw0yMzA3MDMxMDA5NTlaMEUx - ITAfBgNVBAoMGFVuaXZlcnNpdHkgb2YgV2luY2hlc3RlcjEgMB4GA1UEAwwXYXRo - ZW5zLndpbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK - AoIBAQCJ1jkVRgLTXubvfnTjrgldm0Lzg0A7LLkiBtcRhimvbf5ZWO69qaiPOi7U - ZqS2nI1OKErrQV8QImOv15sbYZesSqnErkOiitJbOvdGliwIR5x4njSrqA7d4heZ - G8dbYpEtJexNz1Lct4pzDxq7FP3uixX+CYuutrTsxCrrsO450zs0aVzM2qUEK9GZ - r144+6H4cA8AKQD0rB1uqv9aNDZljkWhkgMUoUCkjc1mXsmuSP+0DappKGBhIdRH - KBisDT4+d3QBvt7HaY9xi0bQllu05enGeA5PaPfIaZFOEXVA28bgrHcbDaa2Ccb9 - xIpVaKsMGh/cK4JExZjTxdnGCvF5AgMBAAGjUDBOMB0GA1UdDgQWBBTZsfd42w9Y - 1+pqgyYhGZqJp7Y2+jAfBgNVHSMEGDAWgBTZsfd42w9Y1+pqgyYhGZqJp7Y2+jAM - BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBjPCDp8APA44IqqaCxdxIe - +UqgLVMCRMSP2d4F5x99/OLOfSLLVqCZMVddqkwbgGi+/Q8Zw7NCcJw4QaY4nzO8 - 7UXTsACjlQz5fD+FdxjVGkfIc3aSRH8Ly83W5RveQdaTukhmaFdM1ndK0TqhMc7n - owepHnvJwak5PH6KyZ1FYNLhCfjh4xNuuwhmoh60XAweUWZzP9IfS2VxNNzBv3+5 - fcaD4APnIG4TQqH263QTMpdv31bgHuYCs90L4+7ZjF90CCPxvhmEg0MYbdabCJOz - TQq4kHUbCj4NK67GjP305jurZGiOUQRqy3ma0TcwYkElPkKZj6hZEPvNfuRTp2V9 - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.winchester.ac.uk/oala/sso"/> - <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.winchester.ac.uk/oala/sso"/> - </IDPSSODescriptor> - <Organization> - <OrganizationName xml:lang="en">University of Winchester</OrganizationName> - <OrganizationDisplayName xml:lang="en">University of Winchester Pilot</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.winchester.ac.uk/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Helpdesk</GivenName> - <EmailAddress>mailto:Helpdesk@winchester.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Helpdesk</GivenName> - <EmailAddress>mailto:Helpdesk@winchester.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |