resolve conflicts and merge

1 files changed, 0 insertions, 64 deletions

diff --git a/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 3001817d..00000000
--- a/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://goto-prod.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School GOTO production" 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-13T12:26:13Z"/>
-  </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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAMAONeRqTU2xMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmdvdG8tcHJvZC5zYnMub3guYWMudWswHhcNMTIxMjEyMDgxMDExWhcNMjIx
-						MjEwMDgxMDExWjAhMR8wHQYDVQQDExZnb3RvLXByb2Quc2JzLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0OE96RgaUQaT5/T2QJyauFFB
-						aK3eWXF4S9ortfE06ofcp3JIvqPzSoxQ2IHMzQpXEmy7fGIKgusCXpjUAtgbRFrP
-						oK4DGCS2E8HmP1PryKj6UTpj7HBR+2kJ8JCVCslOEsLvjPQRjNDliZ2wvr8bw7+H
-						NnAQ1GmObjVHp7Mm4aY7TzJ5oKI1GZTV7nyhWvQATS3qdGLYvgNm86gAi1GTKIwv
-						qbon2bBRs96HYzH+BtPObBl1HJwjCXSACRHGxG4l5TBy0bde/9vp+O3rqjDrspxt
-						om6j5N5xenRhZyaY9UGpGsTpU8P4MfWjeRe5UG2IfCYAvafvHfc499lhPSXwIwID
-						AQABo0QwQjAhBgNVHREEGjAYghZnb3RvLXByb2Quc2JzLm94LmFjLnVrMB0GA1Ud
-						DgQWBBSeowx6+U31cl0vAiB9QBPLDyzoGzANBgkqhkiG9w0BAQUFAAOCAQEAucxx
-						6svK/sfjLoJN1yvVw1fOUkeIWJQ5cxvINN2S6VrifOxYnODAGPKmMluQZSA/veco
-						+2YrAbpGCftbZhUK1h2TAupy7/Kob6dpqaPfpiZTL2mWFUUShHapyZQzV6U2qtjU
-						ZBkzwMpBcaqQFRDo17qrebrskP7Baw6G4Z7p5PEVxzkvsecryOKEbZ+umu0tJkIU
-						X07ML5IKwkPS9TgHu5K1N9fP8H143PPO4xbc1HOLN+EjTM7v4lbebDaR0mbq4Pf1
-						kUtULGLhBnRXk4+7BNARn1XTkVz5pm8paytoEuj0XaICV1XFBFRjuioehkZsDzlg
-						qGeMk89a5KytkMHT/g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School GOTO production</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>