resolve conflicts and merge

1 files changed, 0 insertions, 74 deletions

diff --git a/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml b/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml
deleted file mode 100644
index e784f56c..00000000
--- a/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://archive.guardian.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 SP for Guardian News & Media Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://archive.guardian.co.uk/Shibboleth.sso/WAYF/UKFederation"/>
-      <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://archive.guardian.co.uk/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://archive.guardian.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDoDCCAogCCQD3vWcl7rNUgDANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEeMBwGA1UEChQV
-						R3VhcmRpYW4gTmV3cyAmIE1lZGlhMR4wHAYDVQQLExVHdWFyZGlhbiBQcm9mZXNz
-						aW9uYWwxHzAdBgNVBAMTFmFyY2hpdmUuZ3VhcmRpYW4uY28udWswHhcNMTEwMjAx
-						MDkyNjE0WhcNMjEwMTI5MDkyNjE0WjCBkTELMAkGA1UEBhMCR0IxEDAOBgNVBAgT
-						B0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEeMBwGA1UEChQVR3VhcmRpYW4gTmV3
-						cyAmIE1lZGlhMR4wHAYDVQQLExVHdWFyZGlhbiBQcm9mZXNzaW9uYWwxHzAdBgNV
-						BAMTFmFyY2hpdmUuZ3VhcmRpYW4uY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQClyvCzzPicg89DDrCTdwlSKxxhWkoDdDM/zvQplF33faQHBEX1
-						kX+NHiWm7bFsR1EgsZEXN5MShCkxSapGJ/KQNaqWCasBxOnlKPNmnSxg8DUf8Il/
-						Er6NDOm7w8mzyr6jKyLLBWSpRM79+aNqlp8mJnrEYEohwcmIjNX9yDhD9MMX4INh
-						npBKP3lHpUSEVcvF4l/CEaMHl37l2ipwqc2p9Yb3adKI3m5Mo1HwhIOX+FVMB3H8
-						s2wP8rBniNJLqzU61PCzgsj3yu8GuVyTHdy5MkzxsANiFZ5rM9x3MyMK81ddC+/h
-						6s/LPahVKDe8M/Dxpohi8T+245pBzAVmR7udAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggEBABK63U1h8B1I3AFeaCir1rQjgvTLqIAwDPSO5O60CoA1Dsa5STjdOQHlWfU6
-						6yk2RMDl79avgQ79dZuKYfOTRgWNFttTe6qXfC7V8iPL1S6ZI5UD/QXNfUFDYnPT
-						2rKjPWOQSvtcFRNIQQEggIJJARCJ+6wmrQdSFdEwTApo1vUMrvewglWoZtOZYZjZ
-						5PqI5ayLcMUj4gYwtt3aTdAa+EeE9upHEvvAVkx4TT9sZzzH6UIFuAOqAdVxoixY
-						TYacJZq5++ryJ0ljizbVDyflHYPrnZq/F7FrsTLG0zWvKK+WwOClHU5na5YZIBA4
-						nhD5qKnl7TBNTd30v5ddf1XcImY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Guardian News &amp; Media Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Guardian and Observer digital archive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://archive.guardian.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lucy</GivenName>
-    <SurName>Haire</SurName>
-    <EmailAddress>mailto:lucy.haire@guardian.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rupert</GivenName>
-    <SurName>Bates</SurName>
-    <EmailAddress>mailto:rupert.bates@guardian.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>