resolve conflicts and merge

1 files changed, 0 insertions, 77 deletions

diff --git a/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c7929bc7..00000000
--- a/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studsys.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 'Student System' SP owned by the University of Oxford.
-	-->
-  <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>
-      <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://www.studsys.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UEBhMCR0Ix
-						FDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoT
-						FFVuaXZlcnNpdHkgb2YgT3hmb3JkMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEdMBsG
-						A1UEAxMUd3d3LnN0dWRzeXMub3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10
-						ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrMB4XDTEyMDkxNDEwMzE1NVoXDTMy
-						MDkwOTEwMzE1NVowgbkxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGly
-						ZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9y
-						ZDEUMBIGA1UECxMLSVQgU2VydmljZXMxHTAbBgNVBAMTFHd3dy5zdHVkc3lzLm94
-						LmFjLnVrMS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJeAGPAZmoFV
-						jI0SuVzqP6xQA6FpqzrcwNF/iNN5OODL1ulgvGQOi3g8ThAoeYk0dO19pDhGd/86
-						44D8rXesekGWhUzP+Ww/8DjSJsaSUWq4leXcqYDcF8j8cgcHffUT3XLphZmI9DmU
-						1lLmkz7I6Oylgfx+ZZ+NtrL3y/JJWtUwF9x1LRwR6T+/eJXxnw4fxzfo5ndEHFhl
-						5/659TaCImKBm3g9aOOg1Wmnx0C+vpC14wY8NUoQVHN4gqq/jH5TXYtdm96ZJyLU
-						NzoXn3feSbMdUERSagvwJLbSM32W5i5jm7yyunKMUDYuDNpnJrA7RBgWc5K6rB34
-						SSBeNcRCODUCAwEAAaOCARowggEWMB0GA1UdDgQWBBSlpmuzhZ+Foz77+wtzD+j3
-						THbupzCB5gYDVR0jBIHeMIHbgBSlpmuzhZ+Foz77+wtzD+j3THbup6GBv6SBvDCB
-						uTELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZP
-						eGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRQwEgYDVQQLEwtJ
-						VCBTZXJ2aWNlczEdMBsGA1UEAxMUd3d3LnN0dWRzeXMub3guYWMudWsxLzAtBgkq
-						hkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrggEAMAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAE7kCZ+U1ggqaC+4uVyB0f3c
-						YWRc9G4voJrN+RhYYCB8QfFaV6Z8VHV8jgJHYvBQVSz90lJkPI3Y7zxj3hx7/k8u
-						3dQSrYS1oAAao6+LtdDTldPa9JL2WWtO5cbHT2em5eoRmALFawru+kzcFkG/xzUU
-						Syx3Mmypm4vOJPylzk4XMnINdn1WeHc5uuQfxo7/JeItYO5i9dSQ2xII8bsREhp+
-						NfrvBYnZJLqjqjxturZlrCC9GHb8FBl82Go0Ms4ZK3U388O6lWrNTuwS/tY26tla
-						2yob86I5X9ytflI0zaH8qhvHelwbRG3PKepXpvAKiMDU2UzP2FOcvOn+NN612O0=                       
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studsys.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: Student System</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ops</GivenName>
-    <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Livings</SurName>
-    <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>