resolve conflicts and merge

1 files changed, 0 insertions, 80 deletions

diff --git a/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8e4be2b5..00000000
--- a/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bcmtest.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a "New College test BCM system" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-10T10:15:43Z"/>
-  </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://bcmtest.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIJALCv+bulPWu6MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGJjbXRlc3QubmV3Lm94LmFjLnVrMB4XDTEzMDYwNzA4MzcwNloXDTIzMDYw
-						NTA4MzcwNlowHzEdMBsGA1UEAxMUYmNtdGVzdC5uZXcub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0cLeXLGI3vQXsQFBvnbD/YUF2vRSn
-						ox1F2qiLd2VSNL+j657o5wq0hZjLoro0Ee+gxA6ahVI0RlBN6uyc1S02FCd7PSa9
-						0n93KfKpL40Uj/0H+M6gwmMqv0CKQcM5uPQfMZPGZnFBI7G/i+XOWkRULP8fQ1lT
-						ZceJiIELd0d7OptgwVH3mAGgp5LEFDiuApLkLWENhcLb3qTDA74qX1uiYj0kD19I
-						U5Cbb97bTAcVyCj8LVgnp9b2hIoNOg0upDw3YqRp3m5CqTKNfqOm1CViqyBa4pYq
-						L+x6SxtoHP/D2cqG39irKX64oMcV7LdkfKbCeTC7EUyE1ctsRgRqojcrAgMBAAGj
-						azBpMEgGA1UdEQRBMD+CFGJjbXRlc3QubmV3Lm94LmFjLnVrhidodHRwczovL2Jj
-						bXRlc3QubmV3Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFBFln19MZG+e
-						J17IgU8o9c4pZlC1MA0GCSqGSIb3DQEBBQUAA4IBAQAiamHirEjlyEkzpYdtC47P
-						GGSaM8qLbmjzRUvb3Tgp0Bio21a9h/nQI0yu2u35/mUyWXipAQzA/qdMBq34KUgy
-						XxeWByT6dyncB9uS3ZTAIcR2IjHJUj+fiW3317QJpL2Oq9OSO5mZ9DH1cgKnWhK6
-						JQBogeOnB9c2hM7IzOwvNe2H0EtqxgFDYnzGsWlhvddNcTDpOAWvyBUfA7uFHEmU
-						f1O6QnyW1PJA9bamGntVs0curAhoEnYewZRHS7NxGl52wM9E+ESuMYb4VLb73GL0
-						iCE6OCCjV5non0T45y0UOL0t69mf/TRp//I21O+9bhDniCkuWLMVKfRTpyxUroPQ
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, New College test BCM system</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>