resolve conflicts and merge

1 files changed, 0 insertions, 87 deletions

diff --git a/swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index a3fd9cbf..00000000
--- a/swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jcr.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a 'New College JCR admin host' 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-11-06T14:29:24Z">
-      <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://jcr.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate> 
-						MIIDHDCCAgSgAwIBAgIJAI83ga/ABB6dMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGpjci5uZXcub3guYWMudWswHhcNMTMxMTAzMjA0MDUwWhcNMjMxMTAxMjA0
-						MDUwWjAbMRkwFwYDVQQDExBqY3IubmV3Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAvoS72hGDIl+GbpfaZL0UOlgGgFcuhaVeqX55D1qa
-						8iloWd33o/c52UZEezMCA8DDlUeD4tZhomLRyXX4ZEzKGtigDhJ+fZbo5JgP9lBh
-						pF6L9WoHRGlNO8VaiRM9Imu8sO5+btTfA1rMeVXCmG/NftOG8upXG6RNKB+ccakY
-						m5mbe2ecDBy6r58usRIFqZK/4/My3LWU288l33bOE6r6tUCpSyW81b1sEWpllY3Z
-						B82hAbOEXQD4ozVURP6QJoID+kOQFRIyzvg9FXfMCoPuUWdboJW1hv5BmZWt9MOa
-						UmE2UVqYYvvEmaOT65suW3OTyMiOnt48A3fFi98MNKebcQIDAQABo2MwYTBABgNV
-						HREEOTA3ghBqY3IubmV3Lm94LmFjLnVrhiNodHRwczovL2pjci5uZXcub3guYWMu
-						dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaMxyJ9eSM7u3SF3NXi1HGMaHYFowDQYJ
-						KoZIhvcNAQEFBQADggEBAEl38kBgp1fMgU18W6ChrzZm8EoQiBIOSdScErmZ6XCr
-						Va99wjy8bnI/7q5KhXvoJyemNbpIK3c80zFzAdHNkZ6uMhJfyU53Ur8PSzDCNFrO
-						7uGDj/N4AXqZWuHATG/lHXp7icK+LsgNhhCdqsKCTl9/JBiU9lNR1fR+hliLzEYW
-						R6X5dggs8sDIZPju4N0Y/Z8OuvlWwV60zbX9YJG5nr/CnccPblaYPmL5Don0DP8b
-						VUZfweYVy3ttIKxcB2s5AxK4AtXzsKxkiSjPJcaH5cKJQqGGe4tKvDBjw2tS1r+t
-						onpvIhg5z9yn4KlD1Bc4Zvi28xZZVC4yS0Js/3rxhHY=
-					</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://jcr.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcr.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://jcr.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://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcr.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 admin host</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Officer</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Officer</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>