resolve conflicts and merge

1 files changed, 0 insertions, 88 deletions

diff --git a/swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 66cb3726..00000000
--- a/swamid-interfederations-2.0/engs-web01.eng.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://engs-web01.eng.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Engineering Science Synch Portal Main Server" 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="2012-10-05T09:22:44Z"/>
-  </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://engs-web01.eng.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJANQNL49idvBrMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2VuZ3Mtd2ViMDEuZW5nLm94LmFjLnVrMB4XDTEyMDcxOTEzNDA1OFoXDTIy
-						MDcxNzEzNDA1OFowIjEgMB4GA1UEAxMXZW5ncy13ZWIwMS5lbmcub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9jbGCzmHl3ERccTim8QY0
-						NZmYT7sUvcN950gp13qRDPNO7ceYoeHiU313RyrSlk5VPNYAsT6MqS8UlK+ay8g4
-						Jloi4kUBFkUk+U1Pj2nC9qw0tll/ogmB8tXrPUXcOYhXI+uUVSDj892IUyMElNUk
-						3nldP+J0qA0//+SNFSrCHd44ytJ/bcAfBgL+HzDJn0bgCfGu1xPm7g1AfGUOpbyE
-						eta2BFLbqRhFTzNTdnCQkJixHoM917tvtxie4t9QsegXMJOcYpQRzZ1RE6QrSJsR
-						BB26tXX+3tC8aseRhUITN13m+wTrj1SR5pZk1jrctUHKwYZ2GcV+dZ+1dacOAdfp
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2VuZ3Mtd2ViMDEuZW5nLm94LmFjLnVrMB0G
-						A1UdDgQWBBR5snO7Txci4muSWxMZnmooKdVrmzANBgkqhkiG9w0BAQUFAAOCAQEA
-						NJrUBIaD/R5t2jC58UrsQFwA0aI0Ph/oQqWDDdoXPZ/tgctqO31Wi9raeYp/H/Ge
-						ZGDP6Rjudy1wWSEcRqu0VF5ZNI4uJ/7irMbWrlSlQhpdodJuOamUPqUm+yAEI//V
-						YgTB2F+FGrbNqTZjnY3GozCD3ZpLoHM7Y5Nl00g7vhCa3NSqXijAup2aaNfJJRKu
-						cWFdxBdzzqeABGZYH9herzoSZkFB6fCdhQb/blccGiOev+5g5c5ZnNAEb7wQPCca
-						fZRIPt9mAORaBZ8QrLddGgfdw3rq5NvXppbAXxo79OaMlwnkMD9n0hQ5FehL5y5e
-						6dl8d+0ivNjPUDcvd0ZLzA==
-					</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://engs-web01.eng.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Engineering Science Synch Portal Main Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eng.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Engineering Science IT Support</GivenName>
-    <EmailAddress>mailto:support@eng.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Engineering Science IT Support</GivenName>
-    <EmailAddress>mailto:support@eng.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>