resolve conflicts and merge

1 files changed, 0 insertions, 94 deletions

diff --git a/swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index f407ab0e..00000000
--- a/swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://in-one-ear.oucs.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 SP for 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://in-one-ear.oucs.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>
-						MIIDDzCCAfegAwIBAgIJANo1yZ5Bvvm3MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51azAeFw0xMDA5MDMxMTI0NTlaFw0y
-						MDA4MzExMTI0NTlaMCMxITAfBgNVBAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOin6mg0I1WsGLAzgMac
-						htBUaH8QKtmnHgZfkrOmMl8bDBR40PnKcHNdP9szrUn2O5yk68JNbbgvGPT3+RFo
-						Y8Dy27MUIG/xuP1fDUUpvmOJkKq6GLs00tTWVeHgk3cMP6kwUF0C7isz6g/qF9l5
-						OkfUiOudCS3iw1SLKyAR+eR/ezVEvpgB3T1VSY6Smrl/0QR+aSXtXTKSJYmpk6q/
-						MoxVnKSzuo/B74GPhQnQeEx4fA2mUOsgwjMx6xh91Dr1jLZr8M22d+NYMp8LxnfV
-						slfUB75xPHxuk2JOVdDeBUPjM4DFt6SH6Mmw0g11z9tuhd7/bfLks1j5wjwQ37hM
-						gJcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW4tb25lLWVhci5vdWNzLm94LmFjLnVr
-						MB0GA1UdDgQWBBSw/IthEiVYSu2UxqhN5IB8p5dceDANBgkqhkiG9w0BAQUFAAOC
-						AQEA48hDABp6eyTjqkvKroQCAQ+UEc5mHweQN1sLLoZijgRm8SZ14qJGa7KS8Rxm
-						QMPaUC6n/WN7IOPju1p7RxH1MWnLiPo4Um8LUeIBhl6PQV+4MshBCfhyD7iFdVXm
-						3jOhIhjv1R1wOhgUOrhK0iljF0CWZy8moceNSeHIOSOqx1UYTMCy42lwE7vYRWJJ
-						PDdzNqfTI/HcsTQjSS2oktg9NL4Rqv9i5GDeX8zlm8vY1HBdO8Fl7wpJi3cu83US
-						YW2Gm7mZZRExf4FI4TtiBtXKr3C64ZAWCIcF0Gjp0ckOM6zoU/KWlhRN43wFHmpz
-						RWKs9nPy5aZ19wn+/+Qpx//xnA==
-					</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>
-						MIIDDzCCAfegAwIBAgIJANo1yZ5Bvvm3MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51azAeFw0xMDA5MDMxMTI0NTlaFw0y
-						MDA4MzExMTI0NTlaMCMxITAfBgNVBAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOin6mg0I1WsGLAzgMac
-						htBUaH8QKtmnHgZfkrOmMl8bDBR40PnKcHNdP9szrUn2O5yk68JNbbgvGPT3+RFo
-						Y8Dy27MUIG/xuP1fDUUpvmOJkKq6GLs00tTWVeHgk3cMP6kwUF0C7isz6g/qF9l5
-						OkfUiOudCS3iw1SLKyAR+eR/ezVEvpgB3T1VSY6Smrl/0QR+aSXtXTKSJYmpk6q/
-						MoxVnKSzuo/B74GPhQnQeEx4fA2mUOsgwjMx6xh91Dr1jLZr8M22d+NYMp8LxnfV
-						slfUB75xPHxuk2JOVdDeBUPjM4DFt6SH6Mmw0g11z9tuhd7/bfLks1j5wjwQ37hM
-						gJcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW4tb25lLWVhci5vdWNzLm94LmFjLnVr
-						MB0GA1UdDgQWBBSw/IthEiVYSu2UxqhN5IB8p5dceDANBgkqhkiG9w0BAQUFAAOC
-						AQEA48hDABp6eyTjqkvKroQCAQ+UEc5mHweQN1sLLoZijgRm8SZ14qJGa7KS8Rxm
-						QMPaUC6n/WN7IOPju1p7RxH1MWnLiPo4Um8LUeIBhl6PQV+4MshBCfhyD7iFdVXm
-						3jOhIhjv1R1wOhgUOrhK0iljF0CWZy8moceNSeHIOSOqx1UYTMCy42lwE7vYRWJJ
-						PDdzNqfTI/HcsTQjSS2oktg9NL4Rqv9i5GDeX8zlm8vY1HBdO8Fl7wpJi3cu83US
-						YW2Gm7mZZRExf4FI4TtiBtXKr3C64ZAWCIcF0Gjp0ckOM6zoU/KWlhRN43wFHmpz
-						RWKs9nPy5aZ19wn+/+Qpx//xnA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://in-one-ear.oucs.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: Trying out Windows</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nigel</GivenName>
-    <SurName>Brown</SurName>
-    <EmailAddress>mailto:nigel.brown@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nigel</GivenName>
-    <SurName>Brown</SurName>
-    <EmailAddress>mailto:nigel.brown@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>