resolve conflicts and merge

1 files changed, 0 insertions, 82 deletions

diff --git a/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 3c6ac57f..00000000
--- a/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eeyore.sjc.ox.ac.uk/shibboleth">
-  <!--
-		This is a "St John's College NAC" 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-08-13T16:03:21Z"/>
-  </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://eeyore.sjc.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAOXHkHR5abqcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2VleW9yZS5zamMub3guYWMudWswHhcNMTMwODEyMTAzMjIzWhcNMjMwODEw
-						MTAzMjIzWjAeMRwwGgYDVQQDExNlZXlvcmUuc2pjLm94LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuBOxdHKNQUD0B0kpIWMJEcpWgLxC1/S6
-						ZwH3owCAJnqwS8qtJpZWr4peEIDYX4E8uGNEubxui5ioMWxy/UAuUmWfcFoqZ6hV
-						KKT82iVjspi55puGb7SgBDWqMcQt/S03bVAl5XEJqmLg0L3kZSj1pCdUFijRTUPL
-						477LhTyaoZqCoTbnIpKkVUh8UjeIjco6pIhDv/bVTqSkO920lUVx8cnamZPy1jXG
-						tjAEzZxcpAH8zSXwkuffxNFWT1u2yhssIt1fjIGoO0DuJme74Ls3O8vP10Rl/gkh
-						0eGSvGlERCfQcM+KGu0xmHzLfd2vi0GtMYQYe03xFDOMGoUZW6P0iwIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNlZXlvcmUuc2pjLm94LmFjLnVrMB0GA1UdDgQWBBR3TJq8
-						XWc8yOsnJiEBJAzZm09K9jANBgkqhkiG9w0BAQUFAAOCAQEAHnBwN4rEVqh3b2Jl
-						HntNXIGqths1B+mdHXFEyWs8WcE0NZHp4Pvom4DYyWmwy2td4MaXwY4iEQLQFNCN
-						TZvcXjREowzMEu5Sx7odpGTffsJPMDhVzZpRYR5P3NBh4RxirdIS6NYec/bIf56I
-						4SqpthhygQU+TIz8CKekAe+9HI10m7iMxAnvSddcIR9dk9Zc56waQoynoE0lBo82
-						aT93LqeJd5zMxGEaSoZrxCsoOPW4zYUrHFNqQkmgKU5PMK1y7RIkERB4HTEl4QAg
-						b0Tcl7t7OcEG7lKUdAjOqW8E4DgrdSqzvhQCRI2rm2bKqpHq9CIMXFLlGITTKKOS
-						1FZTdQ==
-					</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://eeyore.sjc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St John's College NAC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sjc.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matt</GivenName>
-    <SurName>Jennings</SurName>
-    <EmailAddress>mailto:it-support@sjc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matt</GivenName>
-    <SurName>Jennings</SurName>
-    <EmailAddress>mailto:it-support@sjc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>