resolve conflicts and merge

1 files changed, 0 insertions, 92 deletions

diff --git a/swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 375022e3..00000000
--- a/swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://as1.jesus.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Jesus College meal booking" 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="2014-09-22T13:48:33Z">
-      <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://as1.jesus.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAP1oldxO3zymMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmFzMS5qZXN1cy5veC5hYy51azAeFw0xNDA5MTExMDEzMTBaFw0yNDA5MDgx
-						MDEzMTBaMB0xGzAZBgNVBAMTEmFzMS5qZXN1cy5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAKZcXku3Zc8SySbCvMeljZQV5jypnNoVsKr+
-						xJ2aftBX3yEBy+EplJeb8c2zZy6wzDbYqmO44GgKtNnApNl3EACPvLIcs5STrd8E
-						/gpSMctx0yhFlt1bNlKXlN7oIlgLIkHxCq+HYOEOtl6jo1iWs+yomqyyDzy6rkBB
-						pmcsQOG6k8e+PV6n51gdrjzC2eMYQYx5cVC6BNTPZRQMyROMu8w6j30K9cRnFrLc
-						3zOl2BN/52qmYnjqhuKwHfGiCGa4bJXZTKOyq7vCiy9hPhjE6RAgZ/ou3oifvLfc
-						p4LPVKG9jfyYNS2Ujz4AFBZB3CogOqeKXHwlaG6FV/vVufhos9cCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISYXMxLmplc3VzLm94LmFjLnVrMB0GA1UdDgQWBBQIR4e76w+e
-						4xVKYSKirFqZw3OcTDANBgkqhkiG9w0BAQUFAAOCAQEAmaYiU1kGOEi6Kx5l9mWe
-						FIsUCQM5QUHu2Yzy5Jo0+Jlom41XOR5vWjrly8bcG/3ztQQ/0gahSFIaXuym2b9o
-						/LPSsHklOjB9oHPudlzBkkn1LSiAXE6kjaLEIZg+sTgTyVoo0ZmVa7NsBSF0LTe6
-						lWlhmg+eMMKF/RyzZRrS8pGv2HeRSsGXcpUKEZi3ltZkJahMrYGKGl2PgAdIk8Nw
-						JP2zMRijGCQPMTx3qNW2kPr6vJyU6FLjsvh4Pe7Iqy3f/I24hLv56yjq2/WnZcRT
-						05XT9RmfWaVoCNvoFqa9gTOmvVqt1dz4HU5QDuxnZ6sxlhc8z15p794mPat3aPmo
-						HQ==
-					</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://as1.jesus.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://as1.jesus.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, Jesus College meal booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jesus.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Gerard</GivenName>
-    <SurName>Fegan</SurName>
-    <EmailAddress>mailto:computing.officer@jesus.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Melson</SurName>
-    <EmailAddress>mailto:it.manager@jesus.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>