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/idp.coleg-powys.ac.uk-idp-shibboleth.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml')
-rw-r--r-- | swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml deleted file mode 100644 index c493fb33..00000000 --- a/swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.coleg-powys.ac.uk/idp/shibboleth"> - <!-- - This is a Shibboleth IdP for Neath Port Talbot College. - --> - <Extensions> - <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/> - </Extensions> - <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> - <Extensions> - <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coleg-powys.ac.uk</shibmd:Scope> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="en">NPTC Group (former Coleg Powys users)</mdui:DisplayName> - <mdui:Logo height="122" width="100">https://idp.coleg-powys.ac.uk/idp/images/coleg-powys-logo.png</mdui:Logo> - </mdui:UIInfo> - </Extensions> - <KeyDescriptor> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDgDCCAmgCCQCjEQP33+OFtzANBgkqhkiG9w0BAQUFADCBgTEUMBIGA1UEChML - Q29sZWcgUG93eXMxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRAwDgYDVQQH - EwdOZXd0b3duMQ4wDAYDVQQIEwVQb3d5czELMAkGA1UEBhMCR0IxHjAcBgNVBAMT - FWlkcC5jb2xlZy1wb3d5cy5hYy51azAeFw0xMzA1MDkxNTU3MTVaFw0yMzA1MDcx - NTU3MTVaMIGBMRQwEgYDVQQKEwtDb2xlZyBQb3d5czEaMBgGA1UECxMRQ29tcHV0 - ZXIgU2VydmljZXMxEDAOBgNVBAcTB05ld3Rvd24xDjAMBgNVBAgTBVBvd3lzMQsw - CQYDVQQGEwJHQjEeMBwGA1UEAxMVaWRwLmNvbGVnLXBvd3lzLmFjLnVrMIIBIjAN - BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dfdyK7811MVGI1rUn+ftWqIsSd2 - TlpUnse7ohcs5Wk1goFph32IMhJO4A/utB0ruCK9fBmDI52cfAuIpnK/CoKIymsp - y0YfqQy9zj+lvCVHi985l9YN7nL6xFzyqJ38/7roOc4qDZy5E7ZpA6b70R90K8rD - h59MLJ/rrUWhBR94aQ3JzKDUeYyMGoAK2oTnmq7ecLy6Z0egAVbMLY9KnadKi9WL - ulKCOLNkd/j7+TVxLTrC92z8trXLrXZYjBvjCyVZiGHD/8DQ9ZagNbLxL8HvY/F/ - g5a52Ep0db408n4TGLUzp6xdg7Q9pc5NoKxVoEtiD3okafByvvHMjC3LTQIDAQAB - MA0GCSqGSIb3DQEBBQUAA4IBAQCHuH6vFAogF0VBZXgrgSbBx6vi/w981vUnO71H - 1bbirh216vUn8a/BPAHuLU1KwK6aOZvnNbFTE5xgORHQWA0gEsUKAhgZt+dUuAVs - qWpIzgc5eyqFMA9mOJGy6HbHsUtu4ZnnnL/gSJ5A68eP0drtjfK/84N0HOZnPXqF - 2SP8s6cs6Qc8aO/C/iLcAg+UYprIs8pcIbYQOPeuqo8bYAAzD78udsaiBmdB9mqh - t6sfik6Q3GLW1U0wRHE0JN42Y8EqJ96/2PFxun0sAkNJczpt9R8P6PxM0cfLVOth - gugBHo3aeeUlP0WHK5s/hswzuZwxBV4lGIu0R5azAEx9EXem - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/> - <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/> - <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat> - <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat> - <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.coleg-powys.ac.uk/idp/profile/Shibboleth/SSO"/> - <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coleg-powys.ac.uk/idp/profile/SAML2/POST/SSO"/> - <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.coleg-powys.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/> - <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coleg-powys.ac.uk/idp/profile/SAML2/Redirect/SSO"/> - </IDPSSODescriptor> - <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> - <Extensions> - <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coleg-powys.ac.uk</shibmd:Scope> - </Extensions> - <KeyDescriptor> - <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> - <ds:X509Data> - <ds:X509Certificate> - MIIDgDCCAmgCCQCjEQP33+OFtzANBgkqhkiG9w0BAQUFADCBgTEUMBIGA1UEChML - Q29sZWcgUG93eXMxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRAwDgYDVQQH - EwdOZXd0b3duMQ4wDAYDVQQIEwVQb3d5czELMAkGA1UEBhMCR0IxHjAcBgNVBAMT - FWlkcC5jb2xlZy1wb3d5cy5hYy51azAeFw0xMzA1MDkxNTU3MTVaFw0yMzA1MDcx - NTU3MTVaMIGBMRQwEgYDVQQKEwtDb2xlZyBQb3d5czEaMBgGA1UECxMRQ29tcHV0 - ZXIgU2VydmljZXMxEDAOBgNVBAcTB05ld3Rvd24xDjAMBgNVBAgTBVBvd3lzMQsw - CQYDVQQGEwJHQjEeMBwGA1UEAxMVaWRwLmNvbGVnLXBvd3lzLmFjLnVrMIIBIjAN - BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dfdyK7811MVGI1rUn+ftWqIsSd2 - TlpUnse7ohcs5Wk1goFph32IMhJO4A/utB0ruCK9fBmDI52cfAuIpnK/CoKIymsp - y0YfqQy9zj+lvCVHi985l9YN7nL6xFzyqJ38/7roOc4qDZy5E7ZpA6b70R90K8rD - h59MLJ/rrUWhBR94aQ3JzKDUeYyMGoAK2oTnmq7ecLy6Z0egAVbMLY9KnadKi9WL - ulKCOLNkd/j7+TVxLTrC92z8trXLrXZYjBvjCyVZiGHD/8DQ9ZagNbLxL8HvY/F/ - g5a52Ep0db408n4TGLUzp6xdg7Q9pc5NoKxVoEtiD3okafByvvHMjC3LTQIDAQAB - MA0GCSqGSIb3DQEBBQUAA4IBAQCHuH6vFAogF0VBZXgrgSbBx6vi/w981vUnO71H - 1bbirh216vUn8a/BPAHuLU1KwK6aOZvnNbFTE5xgORHQWA0gEsUKAhgZt+dUuAVs - qWpIzgc5eyqFMA9mOJGy6HbHsUtu4ZnnnL/gSJ5A68eP0drtjfK/84N0HOZnPXqF - 2SP8s6cs6Qc8aO/C/iLcAg+UYprIs8pcIbYQOPeuqo8bYAAzD78udsaiBmdB9mqh - t6sfik6Q3GLW1U0wRHE0JN42Y8EqJ96/2PFxun0sAkNJczpt9R8P6PxM0cfLVOth - gugBHo3aeeUlP0WHK5s/hswzuZwxBV4lGIu0R5azAEx9EXem - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/> - <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> - <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat> - <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat> - </AttributeAuthorityDescriptor> - <Organization> - <OrganizationName xml:lang="en">Neath Port Talbot College</OrganizationName> - <OrganizationDisplayName xml:lang="en">NPTC Group (former Coleg Powys users)</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.coleg-powys.ac.uk/</OrganizationURL> - </Organization> - <ContactPerson contactType="support"> - <GivenName>Support</GivenName> - <EmailAddress>mailto:support@nptcgroup.ac.uk</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Chris</GivenName> - <SurName>Lewis</SurName> - <EmailAddress>mailto:chris.lewis@nptcgroup.ac.uk</EmailAddress> - </ContactPerson> -</EntityDescriptor> |