resolve conflicts and merge

1 files changed, 0 insertions, 99 deletions

diff --git a/swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.xml b/swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.xml
deleted file mode 100644
index 72157aad..00000000
--- a/swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-test.cartoons.ac.uk/_sp">
-  <!--
-		This is a "British Cartoon Archive (TEST)" simpleSAMLphp SP for the University of Kent.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-31T13:14:38Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">British Cartoon Archive (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test British Cartoon Archive service (not for public use)</mdui:Description>
-        <mdui:Logo height="65" width="234">https://www.cartoons.ac.uk/sites/all/themes/bcad/images/logos/bcad-logo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID8zCCAtugAwIBAgIJAKE2TIxIQxuCMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
-						VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEbMBkG
-						A1UECgwSVW5pdmVyc2l0eSBvZiBLZW50MR0wGwYDVQQLDBRJbmZvcm1hdGlvbiBT
-						ZXJ2aWNlczEgMB4GA1UEAwwXd3d3LXRlc3QuY2FydG9vbnMuYWMudWswHhcNMTUw
-						MzMxMTAzOTA0WhcNMjUwMzMwMTAzOTA0WjCBjzELMAkGA1UEBhMCR0IxDTALBgNV
-						BAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoMElVuaXZlcnNp
-						dHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRpb24gU2VydmljZXMxIDAeBgNV
-						BAMMF3d3dy10ZXN0LmNhcnRvb25zLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAn1JbzpY2ZOG1l0q+VvK3pP+eaBPU468X5pj3c8HRI444tIpj
-						mYW6HWzz5OAra400QkZM72cNTFjCscO4OWnA7SbqkXlpv3vVxMZ8PX9fBf/cxsMH
-						LBNXoMQh1D85N0Z0r4mhqDJzLfOdJVIQAog22hqyZpgxJ0c48TLcllllzQf1xhDh
-						hj1hPPVd9hrUGbmnI0rod55Z5z7dqxrtsEmGYM6BLBjQT3IO02YKGa/4bgW3Wxoo
-						UYKnKFIhtF54a2oRTG3xhSpvH9xABSFzrmQ+k4jT+1yb7OR77BjqBWKFgSVZxh0I
-						8KuzLE8fJiLfmIdG1ZtHoaMOEhW74IqSWHUznQIDAQABo1AwTjAdBgNVHQ4EFgQU
-						p/i93quZlOSka+XAjKPjxFi3hR0wHwYDVR0jBBgwFoAUp/i93quZlOSka+XAjKPj
-						xFi3hR0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAV72ikG+e8fAy
-						NjSMDbA/2ArD7kYrSj3dmyYVatghL3doZCVEm9ZyGo6x/jW/QyFVn4P43kMR4min
-						fwJZi4ooUOFeDTta4YfLFMYVdvYTMNrJs1UtN6/iOFvFud4mdW+VdnfEzqgkRyG8
-						rYSVKtYKbiqdxigVVY0icvpu2cvJrkAtAcZOmuZn+HtbU/PUsHcs2GmOL5pF++M5
-						hcSgpWFmTZgZZFUEpzUQC7c+Coz5QGPkfSI7y5hE01ePdbITgXTGprC2Ep23su5X
-						It7yGAT8rRCp52rrT7aB8ih0rNLDulVHovCf18GJuw0luo8XEmv7wWQmTMcA70qA
-						enohx6xxVA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID8zCCAtugAwIBAgIJAKE2TIxIQxuCMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
-						VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEbMBkG
-						A1UECgwSVW5pdmVyc2l0eSBvZiBLZW50MR0wGwYDVQQLDBRJbmZvcm1hdGlvbiBT
-						ZXJ2aWNlczEgMB4GA1UEAwwXd3d3LXRlc3QuY2FydG9vbnMuYWMudWswHhcNMTUw
-						MzMxMTAzOTA0WhcNMjUwMzMwMTAzOTA0WjCBjzELMAkGA1UEBhMCR0IxDTALBgNV
-						BAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoMElVuaXZlcnNp
-						dHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRpb24gU2VydmljZXMxIDAeBgNV
-						BAMMF3d3dy10ZXN0LmNhcnRvb25zLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAn1JbzpY2ZOG1l0q+VvK3pP+eaBPU468X5pj3c8HRI444tIpj
-						mYW6HWzz5OAra400QkZM72cNTFjCscO4OWnA7SbqkXlpv3vVxMZ8PX9fBf/cxsMH
-						LBNXoMQh1D85N0Z0r4mhqDJzLfOdJVIQAog22hqyZpgxJ0c48TLcllllzQf1xhDh
-						hj1hPPVd9hrUGbmnI0rod55Z5z7dqxrtsEmGYM6BLBjQT3IO02YKGa/4bgW3Wxoo
-						UYKnKFIhtF54a2oRTG3xhSpvH9xABSFzrmQ+k4jT+1yb7OR77BjqBWKFgSVZxh0I
-						8KuzLE8fJiLfmIdG1ZtHoaMOEhW74IqSWHUznQIDAQABo1AwTjAdBgNVHQ4EFgQU
-						p/i93quZlOSka+XAjKPjxFi3hR0wHwYDVR0jBBgwFoAUp/i93quZlOSka+XAjKPj
-						xFi3hR0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAV72ikG+e8fAy
-						NjSMDbA/2ArD7kYrSj3dmyYVatghL3doZCVEm9ZyGo6x/jW/QyFVn4P43kMR4min
-						fwJZi4ooUOFeDTta4YfLFMYVdvYTMNrJs1UtN6/iOFvFud4mdW+VdnfEzqgkRyG8
-						rYSVKtYKbiqdxigVVY0icvpu2cvJrkAtAcZOmuZn+HtbU/PUsHcs2GmOL5pF++M5
-						hcSgpWFmTZgZZFUEpzUQC7c+Coz5QGPkfSI7y5hE01ePdbITgXTGprC2Ep23su5X
-						It7yGAT8rRCp52rrT7aB8ih0rNLDulVHovCf18GJuw0luo8XEmv7wWQmTMcA70qA
-						enohx6xxVA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Kent</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Kent: British Cartoon Archive (TEST)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cartoons.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Slowe</SurName>
-    <EmailAddress>mailto:M.Slowe@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>