resolve conflicts and merge

1 files changed, 0 insertions, 88 deletions

diff --git a/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 197cb772..00000000
--- a/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jcrweb.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a "New College JCR" 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#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-10-18T10:02:09Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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://jcrweb.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJAM+jRUVpcaogMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2pjcndlYi5uZXcub3guYWMudWswHhcNMTMxMDExMjEyMDIwWhcNMjMxMDA5
-						MjEyMDIwWjAeMRwwGgYDVQQDExNqY3J3ZWIubmV3Lm94LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3RatgWIQ0tgieur/TZdJMa+J7+Qm3D+y
-						1oev1jnx1mgLo/dzafOHFhoJZ3AqLUNJAIbJPNlIhJpGEViwpJnBIlukULWKtF9x
-						UxH/vQvkQhMWxox1bHO4heWt4QmHcBM0vVi84MoobVjHKHk4/IFBg4cD9P8URObR
-						uKhZ5a7UPlOk5+RYN7vP5PjazNzHW3IX68ta3BL2RG4Eni4TGFCuUg9tUVeNFUVN
-						y9JnYcLSRrNOF1ND9XX9p/SjFDV9WvjbWsgyUrTVPTvXSzgYZI58r01WSrE7tz9f
-						dvbOP6KMEgI6JONlYflpA0Cb+QyYqBA4ZFYNsqb2yhg4ZltCwOZDiwIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghNqY3J3ZWIubmV3Lm94LmFjLnVrhiZodHRwczovL2pjcndl
-						Yi5uZXcub3guYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUq8M4jctknnDLTc81
-						iYJG2rgDVYQwDQYJKoZIhvcNAQEFBQADggEBAKmylrHk0WDPwoHAy1KXqQbySSyF
-						LYHyEAWxVceWoY5AozLFysUu0MpllDbZcUTBMs+TzLVpq8PUdrj3A87IVB7WhIzw
-						uwBi61ZmPvMiE43s/5HZJG0ibf48q0ZS7h1cVsUOFaJGYattJUvvfRu0GgtMyjJi
-						/msRlm6B8YkO95AZc9BsxfnuPYn0LRzQyt1T8pObH/oNUsCcvybXJTHG93oE7mRd
-						hryZmf6zRTaMrw9KT6SvQf2Let/RJHv8OK3juH8kw6iraOSc+cK0Ea2rCWJYNWS0
-						aHp4plsboCSy3YDvkk573vE1IbHvoT86Qg9cIOVoUOd1BE8uxQhXOVg/WDM=
-					</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://jcrweb.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrweb.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://jcrweb.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://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrweb.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 JCR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://jcr.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>Jakub</GivenName>
-    <SurName>Warmuz</SurName>
-    <EmailAddress>mailto:jakub.warmuz@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>