resolve conflicts and merge

1 files changed, 0 insertions, 89 deletions

diff --git a/swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c0a08b8d..00000000
--- a/swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bits.uas.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for 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#ecdsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <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/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <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-25T11:54:02Z"/>
-  </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://bits.uas.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDTCCAfWgAwIBAgIJAN6n87m9JqBAMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWJpdHMudWFzLm94LmFjLnVrMB4XDTEzMDYyMTEwNDU1MloXDTIzMDYxOTEw
-						NDU1MlowHDEaMBgGA1UEAxMRYml0cy51YXMub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCd+fqX2VRSIL9K4DMFfZtObbZkbXEvSyHWtFI5
-						oAIIbfvmmE0pziAC2Rbxa9nLLRw2G7d9AEfW2ktOIS9AE1LVZLoK7v0gvatV7ZaH
-						13C6domsuQzWELqG+vHR9cyIX1tiL8oo+kJLrniHpMuifdm5I+XKTfjNmu493Het
-						sjxu0DpsezqE9F1tlA9mBlSjqKFfp8uYhS+1HjVhT9E+k/TSwz3K/k2EkcXFLKFG
-						4KCFr+bZeW5wiUmy3r87V1N0Zph8uObix00+aQKi0dwCLgIxSRM/LPfakN9gk0L/
-						j2EydLJw0APmPXh8D9IKZAtRGOcN44P2UMc3k9N+a8VR4OJBAgMBAAGjUjBQMC8G
-						A1UdEQQoMCaCEWJpdHMudWFzLm94LmFjLnVrhhFiaXRzLnVhcy5veC5hYy51azAd
-						BgNVHQ4EFgQUsUURuBA+9z5VuLCzxXXODxH4G5UwDQYJKoZIhvcNAQEFBQADggEB
-						AHY96+ozosd3+kYqe9+xKAobDbTX7ZczK51PfzwmLYBRlt6p/yauGoJqSEoNhrPy
-						x4BZ8fPKHgKA2iqAFm5RzBv6t883VR9Npt0P2hQ8+fArcczgwDeCBKTZ16VLlQSy
-						VPZm7/QRGNU8EKx+CEYa5xUAk03Q7XmtmKI3Au7lOkRG0rpHAPTCiEvNcTuniMKl
-						DUSludjtx5UzkiYMRp+5048aTmQBmiHWsvrIUWsaX5vMBt+9QQSOXJEmJ8bRkpkB
-						o8JhwcADWs/8/XCO8IgVJptowHEkJKlHdyyCTr106+Vp62wLwMHzZSlRKTK3VKO2
-						j+LYa2YPte02DhcTeM41wXo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://bits.uas.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bits.uas.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 Business Intelligence Production Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ops Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Rumble</SurName>
-    <EmailAddress>mailto:nick.rumble@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>