resolve conflicts and merge

1 files changed, 0 insertions, 116 deletions

diff --git a/swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 80dd1ced..00000000
--- a/swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studsysdr.ox.ac.uk/shibboleth">
-  <!--
-		This is a "OSS Staff tier DR Live" 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="2010-10-20T13:54:00Z">
-      <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 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.studsysdr.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFMDCCBBigAwIBAgIJAKFUyKodFCpAMA0GCSqGSIb3DQEBBQUAMIHAMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
-						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEfMB0GA1UEAxMWd3d3LnN0dWRzeXNkci5v
-						eC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVrMB4XDTEw
-						MTAxOTE1MTU1M1oXDTIwMTAxNjE1MTU1M1owgcAxCzAJBgNVBAYTAkdCMRQwEgYD
-						VQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2
-						ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5k
-						IFByb2plY3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJ
-						KoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDYn8bydKw2kkvWZOo21iJlFc7HpJlz7mu9OaPMo0PNOlAB
-						ySERgfBF+84LjXgyzlOfM5me+ouWVoio37dB/0IPB9kcW6BoRUV05qYGeq+OJB8V
-						J4aUxANEneFpQV4QN5kygga91uHMedndjMJueORdmpRbaQse7n4lTL4YTblnga3/
-						ixL2bLfHfvYZ5q7hm8cxlbKhg0TiyjMjJ9HB2caIRxAmU+3jsAasFGZuT905IquG
-						AT2S9t97okzocS6ZRZY5bb0MSSRZCjCBx2SeKfxOieaz+csKhQ+kbmfKCopB0Jgd
-						26lUTadRhjOShP5k5iWx7aD+OvmjJe0YJVhh1sCfAgMBAAGjggEpMIIBJTAdBgNV
-						HQ4EFgQUziI8Ht93ixzAsvwUSo/GWpXmdRcwgfUGA1UdIwSB7TCB6oAUziI8Ht93
-						ixzAsvwUSo/GWpXmdRehgcakgcMwgcAxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5
-						IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5kIFByb2pl
-						Y3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJKoZIhvcN
-						AQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQChVMiqHRQqQDAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAGnpSzNXPStqoQYhiaRcsJ/8w2ooK4IcW2kYd1
-						mKm8xklL9cnBYpUkUCe1p26sMN8UVlXobH7fdAarYvkL2MWNYLiHmESYQ+k46vEr
-						N7FGROpQ94oFOSPvJCJQJj6uPemLiMyDWVq1JZnyIY4rggjDL72YJLSC3+pfB6iy
-						9A3b6P3tt+zt+qA/GbbPV3Ydz3z91gj752geICCrq3bMetSq6okMgbaljmf/XkMK
-						58UxgghQcXsCGBSO6OlKrT6ziQ3Aw0F2XnTWFBApxNfnotnpxlLoZQ6oAoUDUqPR
-						Kf8Nk0dJF9igV6Sd1QvvoclJMdhReqCsqr9xxVSfGQIINRJR
-					</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>
-						MIIFMDCCBBigAwIBAgIJAKFUyKodFCpAMA0GCSqGSIb3DQEBBQUAMIHAMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
-						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEfMB0GA1UEAxMWd3d3LnN0dWRzeXNkci5v
-						eC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVrMB4XDTEw
-						MTAxOTE1MTU1M1oXDTIwMTAxNjE1MTU1M1owgcAxCzAJBgNVBAYTAkdCMRQwEgYD
-						VQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2
-						ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5k
-						IFByb2plY3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJ
-						KoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDYn8bydKw2kkvWZOo21iJlFc7HpJlz7mu9OaPMo0PNOlAB
-						ySERgfBF+84LjXgyzlOfM5me+ouWVoio37dB/0IPB9kcW6BoRUV05qYGeq+OJB8V
-						J4aUxANEneFpQV4QN5kygga91uHMedndjMJueORdmpRbaQse7n4lTL4YTblnga3/
-						ixL2bLfHfvYZ5q7hm8cxlbKhg0TiyjMjJ9HB2caIRxAmU+3jsAasFGZuT905IquG
-						AT2S9t97okzocS6ZRZY5bb0MSSRZCjCBx2SeKfxOieaz+csKhQ+kbmfKCopB0Jgd
-						26lUTadRhjOShP5k5iWx7aD+OvmjJe0YJVhh1sCfAgMBAAGjggEpMIIBJTAdBgNV
-						HQ4EFgQUziI8Ht93ixzAsvwUSo/GWpXmdRcwgfUGA1UdIwSB7TCB6oAUziI8Ht93
-						ixzAsvwUSo/GWpXmdRehgcakgcMwgcAxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5
-						IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5kIFByb2pl
-						Y3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJKoZIhvcN
-						AQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQChVMiqHRQqQDAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAGnpSzNXPStqoQYhiaRcsJ/8w2ooK4IcW2kYd1
-						mKm8xklL9cnBYpUkUCe1p26sMN8UVlXobH7fdAarYvkL2MWNYLiHmESYQ+k46vEr
-						N7FGROpQ94oFOSPvJCJQJj6uPemLiMyDWVq1JZnyIY4rggjDL72YJLSC3+pfB6iy
-						9A3b6P3tt+zt+qA/GbbPV3Ydz3z91gj752geICCrq3bMetSq6okMgbaljmf/XkMK
-						58UxgghQcXsCGBSO6OlKrT6ziQ3Aw0F2XnTWFBApxNfnotnpxlLoZQ6oAoUDUqPR
-						Kf8Nk0dJF9igV6Sd1QvvoclJMdhReqCsqr9xxVSfGQIINRJR
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.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.studsysdr.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.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studsysdr.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: OSS Staff tier DR Live</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</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>