resolve conflicts and merge

1 files changed, 0 insertions, 64 deletions

diff --git a/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ee95e87f..00000000
--- a/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://x5-qa.bsp.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth X5 QA Environment SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-23T09:48:29Z"/>
-  </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://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate> 
-						MIIDETCCAfmgAwIBAgIJALT+QUXBSZeDMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEng1LXFhLmJzcC5veC5hYy51azAeFw0xMjEwMTkwOTQwMTJaFw0yMjEwMTcw
-						OTQwMTJaMB0xGzAZBgNVBAMTEng1LXFhLmJzcC5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAKEKyMazhRGGodfwZDljiQZOKgx73F7nJpR1
-						OotpgBlUw06aUI8ayaz38THfi3HeEcbqMrVWo/gO9l/hrbtqTzQ6pW39204BKoyv
-						aeiT3y7Zox8Dn6tjJUsOVFMVCy4hDLoJ577IdL3yX42zeGsbLkzvGJcJ2C4HsW1m
-						FXWFUv1fSKm76W/cFQF0HuJ1hCZ8DOcnpoAmokE0jPerGbRKWJewQ3+xaB7SNqp9
-						icNxIzOmnd4eFFxP/6veM3ckBF1bbWAOB1fQRBdGK24JQMIC9J/ibuwf/QTMzD2i
-						iBjVCIDnILrVdBbSLtVmKNMFZOK2sBiL7IYuXtuoIWf9RWh1zvECAwEAAaNUMFIw
-						MQYDVR0RBCowKIISeDUtcWEuYnNwLm94LmFjLnVrhhJ4NS1xYS5ic3Aub3guYWMu
-						dWswHQYDVR0OBBYEFMjXSu1rl1SQXLkzWctcqzz3VhapMA0GCSqGSIb3DQEBBQUA
-						A4IBAQAhPszsE9vpMD9xqO6tnXMzEDRHeubZQRfpUUq3Wu/YAGEnZkmA0dAtlvPX
-						V5QxXhK9IGLYrxLuwlOzgowb001uyvxxqhbTdAFmKB7wabWLnBg/8SJpDBp6sBMe
-						fa4OJ3NZ17FN/EkXtp9VDQO992x8OsFYwZcLrHxBaQqC9lcCskIm04b5AQUc8STU
-						MwNUAkof7SVjRHh6YDDJ1rm8GteKWMgzsoArLLRKtPpOXRHxKWwnbO2zrkK6cUO5
-						M3orN7xlXTBbSgM6UXtpTyXPXDf7GbwhN6q0dhHN0+YZY9mr0L2dq6Detym7fOVF
-						dOSjq/lxxyKOR4Ey9R9suqDKD1EB
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - X5 QA Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Malin</SurName>
-    <EmailAddress>mailto:ben.malin@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>