resolve conflicts and merge

1 files changed, 0 insertions, 63 deletions

diff --git a/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e594d1b4..00000000
--- a/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://drupal-test1.admin.ox.ac.uk/shibboleth">
-  <!--
-		This is a "IT Services drupal-test1" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-13T11:32:32Z">
-      <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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAJLwYa1nUjhIMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2RydXBhbC10ZXN0MS5hZG1pbi5veC5hYy51azAeFw0xNDA2MTEwNzM4NTZa
-						Fw0yNDA2MDgwNzM4NTZaMCYxJDAiBgNVBAMTG2RydXBhbC10ZXN0MS5hZG1pbi5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCrjkmZs9yt
-						nETaaTxuF459aLEF5H12+vcuwsR662oNVitQqHO1XUUd5KVJ2502H3tpWZbT0rWA
-						wnv0nwHB14gm4evKInO/Da9yojWFUtOFExHqePyDfOQZyKb3mAlpRrQAtCpELTjq
-						Zr0HTht/ODhsmCKdRUzsNDOld6X7HYU834DoQoZCGpHuzDK/Nj6C9gweL1Uxn1RB
-						kVd2t+5/nU0aXSfyMmL++H4kxPDEYEcyZpz2xCwZDfqbSiMn2mltwxUM6Pl5YnwM
-						TMvEN9BiWdhTSckqWoqz9pxbJePM2k4kH2tm+v2oHRlC2/hKEtOggKTyeqdQxryK
-						qqj85s6HZa0CAwEAAaNJMEcwJgYDVR0RBB8wHYIbZHJ1cGFsLXRlc3QxLmFkbWlu
-						Lm94LmFjLnVrMB0GA1UdDgQWBBT8QD5mvc4hICi5sUNX2UZ/9hDmKjANBgkqhkiG
-						9w0BAQUFAAOCAQEAgQLx3imjfSX3QxSJqZPHuzLFoygwXm2EWm5m1LR8aUl1WWIo
-						2CwZR7wMZ0pVYiBJgYqwjkNpozJ1f6Fr9F48o/sSDG673zxjFbOAxLm7nTHBvc39
-						qIMNxvOmhl8f/A7gT+OnR+dmVfPI42BrHhUEAOSTmkTRRT1jV6WHKNwXjqngYqD+
-						EOASg50rUobY9bF+6k6vGhWxTBAS+UcBUsTGiGU9cDS1cuFpONYixQB7cYA++1SR
-						hxhDEKXAC6V3xfJiCLPEcKBaKRyFh+ImaDfcqWjollm0Y2xd/uF1/Tg8AMxLslGw
-						PI60xEImflkCgUGXgjTfpKljm+bcaUKAnUQMpg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford IT Services drupal-test1</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>