resolve conflicts and merge

1 files changed, 0 insertions, 93 deletions

diff --git a/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 83f400b3..00000000
--- a/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sbs-webhosting.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School" 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="2012-12-06T09:27:25Z"/>
-  </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://sbs-webhosting.sbs.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>
-						MIIDGDCCAgCgAwIBAgIJAPNCbuPT2io8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG3Nicy13ZWJob3N0aW5nLnNicy5veC5hYy51azAeFw0xMjEyMDUwODM5MTda
-						Fw0yMjEyMDMwODM5MTdaMCYxJDAiBgNVBAMTG3Nicy13ZWJob3N0aW5nLnNicy5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO4N7eRtQMSY
-						X3IvueK45VAqmOQeQoGJie/mdclap1q7mhJ0QUDXvly81iLx6tYrj+pcHJjM+bZN
-						Hmwn5aNTNQeygCwYu9Q6P71Si005fRPHP6JSZxywI6DgQw2bC7PDA1ZgsEhvXqIT
-						6FUbF/K0XxaKRgYv0jire9e+mTkronnDlJOeAQtCOdf5wgp/zQjs4Yln4dD2+UXN
-						4tw1B4aOSCAlEteMO5up/DBwnx/G904kaidbOssQ180a3QEogF27bRh6lT+nDlOG
-						epKbPNwIzkJRhBZYjHHLjGUAgVIXQayS9etKvAH9hxsJ4NIiImUfH8a+2GFqZSvN
-						EgR8INMq7XcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbc2JzLXdlYmhvc3Rpbmcuc2Jz
-						Lm94LmFjLnVrMB0GA1UdDgQWBBRWZ9b7Zkx8CdEWWb10cWqQmA5CujANBgkqhkiG
-						9w0BAQUFAAOCAQEAmDjFtdmBhewEwwaAu6XPYVTnMsA1rOnrzTH8srObrgyRBNI7
-						Cd0bm1vq4Y5KwgxZYOW36b2dNDLO/oQSh/SHsWtweZj3njJsgKNZQ/9ES8gJRLAF
-						fIJK5CZBw46X4GqFSUKjBsOwq4Lwb4ziuyM7le+qJMw926RVXxCDFfsoIFFTQvMG
-						RTiokPOX7gSv91SdETtK2jf20YUt5iWlhyphx3gdd2fZBYO1yaKEaz4NMO1yIgKx
-						0qkXHgvbow0c6PP7ral0MuJkqj97HPvDvCpLuBosFVK4GDtLtMxhpTrp6NQjp982
-						uhmO5vu/Ld2xEnYKvQLGliEfuIyqmiCdmboi4w==
-					</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>
-						MIIDGDCCAgCgAwIBAgIJAPNCbuPT2io8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG3Nicy13ZWJob3N0aW5nLnNicy5veC5hYy51azAeFw0xMjEyMDUwODM5MTda
-						Fw0yMjEyMDMwODM5MTdaMCYxJDAiBgNVBAMTG3Nicy13ZWJob3N0aW5nLnNicy5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO4N7eRtQMSY
-						X3IvueK45VAqmOQeQoGJie/mdclap1q7mhJ0QUDXvly81iLx6tYrj+pcHJjM+bZN
-						Hmwn5aNTNQeygCwYu9Q6P71Si005fRPHP6JSZxywI6DgQw2bC7PDA1ZgsEhvXqIT
-						6FUbF/K0XxaKRgYv0jire9e+mTkronnDlJOeAQtCOdf5wgp/zQjs4Yln4dD2+UXN
-						4tw1B4aOSCAlEteMO5up/DBwnx/G904kaidbOssQ180a3QEogF27bRh6lT+nDlOG
-						epKbPNwIzkJRhBZYjHHLjGUAgVIXQayS9etKvAH9hxsJ4NIiImUfH8a+2GFqZSvN
-						EgR8INMq7XcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbc2JzLXdlYmhvc3Rpbmcuc2Jz
-						Lm94LmFjLnVrMB0GA1UdDgQWBBRWZ9b7Zkx8CdEWWb10cWqQmA5CujANBgkqhkiG
-						9w0BAQUFAAOCAQEAmDjFtdmBhewEwwaAu6XPYVTnMsA1rOnrzTH8srObrgyRBNI7
-						Cd0bm1vq4Y5KwgxZYOW36b2dNDLO/oQSh/SHsWtweZj3njJsgKNZQ/9ES8gJRLAF
-						fIJK5CZBw46X4GqFSUKjBsOwq4Lwb4ziuyM7le+qJMw926RVXxCDFfsoIFFTQvMG
-						RTiokPOX7gSv91SdETtK2jf20YUt5iWlhyphx3gdd2fZBYO1yaKEaz4NMO1yIgKx
-						0qkXHgvbow0c6PP7ral0MuJkqj97HPvDvCpLuBosFVK4GDtLtMxhpTrp6NQjp982
-						uhmO5vu/Ld2xEnYKvQLGliEfuIyqmiCdmboi4w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbs-webhosting.sbs.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 - Said Business School</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.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>Aaron</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>