resolve conflicts and merge

1 files changed, 0 insertions, 74 deletions

diff --git a/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml b/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml
deleted file mode 100644
index a6c1d893..00000000
--- a/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://passport2.e2bn.org/shibboleth">
-  <!--
-		This is an E2BN Online Services Shibboleth SP for the East of England Broadband Network.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-06T09:59:42Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://passport2.e2bn.org/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://passport2.e2bn.org/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEqjCCA5KgAwIBAgIQaxilpKtFyudwNIabYTWe6zANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMDgwMzAwMDAwMFoXDTE1MDgwMzIzNTk1OVowgYIxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIEw1IZXJ0Zm9yZHNoaXJlMRIwEAYDVQQHEwlIaW54d29y
-						dGgxKjAoBgNVBAoTIUVhc3Qgb2YgRW5nbGFuZCBCcm9hZGJhbmQgTmV0d29yazEb
-						MBkGA1UEAxMScGFzc3BvcnQyLmUyYm4ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAwWzHYa3GF8L0WS6Vy+/oj4BXuLIegDpYmZpOdNHKc6cUelYD
-						mANHjc8crK/OzfIkdYZ/xd+RM6GWHiDfo0DwI7/T8WtOLEGy/liM+ekPEq4XQdZk
-						tDWCF937oj5CbXH8QPWdzyFVf4AUA6Sb+JZpO0zT5ptW8WHeM6TFP1izlXhaNvOl
-						Ql3lBSCuVJcMCiHUUabgA96JByWviim2i0UkHDK5NVrsx1KYL7oK2ipOuds5HXa6
-						yy/s1FUQ4DkK3xEn3ES6JQTFEwPQ1RgR3xryY335ilcvtd7Xd+ELBKuHxxB2FJGy
-						6hNcwxreLeFQiKiIV6BMJLvOh4JPBJ82GKaXQQIDAQABo4IBZTCCAWEwHwYDVR0j
-						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFE6U3xk/mGGDfrom
-						4PmC+wZxRgXgMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
-						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEnBhc3Nwb3J0
-						Mi5lMmJuLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEAGF313BU94mPtvNABYwuN2RmM
-						6bUyIkedHzkE2t3jhLB5TBl1dbqcAqA9Ojgxa0/81bbtOgccAYm90df/PqFI2V5z
-						pyeMJodK8M/W+mlGfl6KtBPyV3ioFflhIeyubLUhDxP2pacTI40+4GYsylHMcvEx
-						NwzL7DXqWFzPK2OqdEqrQWFko+VnnfRDcg7pMaKO9+xqhutw9XGmllUTk1rLr/Bn
-						QVZejbc10E/YaTEWXrvsnOUPvKi9ufV7mkfi5Zq0LtwlpeI4IjgaykGZHEEcTdNA
-						A48T78ntBTNuYYtFdpAkqpAcvMhkrMJplW2G4+KFLeotqtZzBTkyIj5MANRJuA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport2.e2bn.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">East of England Broadband Network</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">E2BN Online Services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.e2bn.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Bright</SurName>
-    <EmailAddress>mailto:service@e2bn.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Bright</SurName>
-    <EmailAddress>mailto:service@e2bn.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>