resolve conflicts and merge

1 files changed, 0 insertions, 116 deletions

diff --git a/swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml
deleted file mode 100644
index 9cd82424..00000000
--- a/swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.youngepilepsy.org.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The National Centre for Young People with Epilepsy.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-18T10:56:17Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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">youngepilepsy.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE1zCCA7+gAwIBAgIRAIrwNxflMTquvXfq6pK7gn8wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMjA2MTIwMDAwMDBaFw0xNTA2MTIyMzU5NTlaMIGoMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlMaW5nZmllbGQxOzA5
-						BgNVBAoTMlRoZSBOYXRpb25hbCBDZW50cmUgZm9yIFlvdW5nIFBlb3BsZSB3aXRo
-						IEVwaWxlcHN5MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEhMB8GA1UEAxMYaWRwLnlv
-						dW5nZXBpbGVwc3kub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAvplNMCWV3HnGWGuAt/VF0SMVmyE5fJCix71f0PUsdUMx7UiBTVAY6YPk+xfd
-						ikArI5zcLUOxuf3WMol5cpb34xrBsPzyyQF/+MbCTHBhm/Z6BWqZzZLtR8HSCF7Y
-						nEOB7QhDrgMs2hGD/F4NZdVbgF9veblDYEsChfLYWssNe1/dNAEh3EF5XBO633tF
-						94A9o+Av2JEzRH3R1Vq81rhVBI2pPRFsyfrLug6AcN9ONMpkByLRy0n+JR+npQ0n
-						d2vMo6x3L+hUEpVOgzjftKyeB53I2daXDQABRhBn/WC/RrkaBlaXJ108/FUkOHAG
-						WT4Sb4/Wt/tdn8yL0SuVsf+b3QIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2T
-						aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFPNOHJ0GourmWopHAyS1yeYTt2mT
-						MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-						BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-						Y3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC55b3VuZ2VwaWxlcHN5
-						Lm9yZy51azANBgkqhkiG9w0BAQUFAAOCAQEAH86tOvqiEgvcXJ8xtCdYjJQIcH76
-						jHZeUG34kBK4CUxRKApPv+y5EA6qO/HtStQBWfTqngFhQfDUMD8FV/UABwFBvC19
-						7WJ6NW7U8zhnz1pM0v46oDRFMhlQnLT0kvVqauGibZ6fma6ZkRyKsejCwfStnzxq
-						HZhOcaFLT7t6D5jV1e2BykrjUObZ+8bRBSvBnWAnZ+AMYLpTV+1lnjMXdhqBJmli
-						hZvJeOeLHgAgM7E8YrTBmrIMRPpZ5+wsn/vx1zLPTB1Rj5LL6AHRiplTxUNrtXWv
-						d+xYnzbHJUA9ufb2nG1b+EqbvE/XBCq0l6EuQ6QxOukQcrYB/cEK4yuNKg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.youngepilepsy.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.youngepilepsy.org.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.youngepilepsy.org.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.youngepilepsy.org.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.youngepilepsy.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.youngepilepsy.org.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">youngepilepsy.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE1zCCA7+gAwIBAgIRAIrwNxflMTquvXfq6pK7gn8wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMjA2MTIwMDAwMDBaFw0xNTA2MTIyMzU5NTlaMIGoMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlMaW5nZmllbGQxOzA5
-						BgNVBAoTMlRoZSBOYXRpb25hbCBDZW50cmUgZm9yIFlvdW5nIFBlb3BsZSB3aXRo
-						IEVwaWxlcHN5MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEhMB8GA1UEAxMYaWRwLnlv
-						dW5nZXBpbGVwc3kub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAvplNMCWV3HnGWGuAt/VF0SMVmyE5fJCix71f0PUsdUMx7UiBTVAY6YPk+xfd
-						ikArI5zcLUOxuf3WMol5cpb34xrBsPzyyQF/+MbCTHBhm/Z6BWqZzZLtR8HSCF7Y
-						nEOB7QhDrgMs2hGD/F4NZdVbgF9veblDYEsChfLYWssNe1/dNAEh3EF5XBO633tF
-						94A9o+Av2JEzRH3R1Vq81rhVBI2pPRFsyfrLug6AcN9ONMpkByLRy0n+JR+npQ0n
-						d2vMo6x3L+hUEpVOgzjftKyeB53I2daXDQABRhBn/WC/RrkaBlaXJ108/FUkOHAG
-						WT4Sb4/Wt/tdn8yL0SuVsf+b3QIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2T
-						aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFPNOHJ0GourmWopHAyS1yeYTt2mT
-						MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-						BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-						Y3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC55b3VuZ2VwaWxlcHN5
-						Lm9yZy51azANBgkqhkiG9w0BAQUFAAOCAQEAH86tOvqiEgvcXJ8xtCdYjJQIcH76
-						jHZeUG34kBK4CUxRKApPv+y5EA6qO/HtStQBWfTqngFhQfDUMD8FV/UABwFBvC19
-						7WJ6NW7U8zhnz1pM0v46oDRFMhlQnLT0kvVqauGibZ6fma6ZkRyKsejCwfStnzxq
-						HZhOcaFLT7t6D5jV1e2BykrjUObZ+8bRBSvBnWAnZ+AMYLpTV+1lnjMXdhqBJmli
-						hZvJeOeLHgAgM7E8YrTBmrIMRPpZ5+wsn/vx1zLPTB1Rj5LL6AHRiplTxUNrtXWv
-						d+xYnzbHJUA9ufb2nG1b+EqbvE/XBCq0l6EuQ6QxOukQcrYB/cEK4yuNKg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.youngepilepsy.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.youngepilepsy.org.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">The National Centre for Young People with Epilepsy</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Young Epilepsy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://youngepilepsy.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tyrone</GivenName>
-    <SurName>da Silva</SurName>
-    <EmailAddress>mailto:tdasilva@youngepilepsy.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Seager</SurName>
-    <EmailAddress>mailto:cseager@youngepilepsy.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>