resolve conflicts and merge

1 files changed, 0 insertions, 63 deletions

diff --git a/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ee456ac6..00000000
--- a/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://goto.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School GOTO" 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:25:58Z"/>
-  </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.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJAMmSuBKQmM1rMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWdvdG8uc2JzLm94LmFjLnVrMB4XDTEyMTIxMjA3NTc1NFoXDTIyMTIxMDA3
-						NTc1NFowHDEaMBgGA1UEAxMRZ290by5zYnMub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDQ+u2W+HEKK/t0hZ3j6LQRIoj5YJDVw5Uz/Nrk
-						GsWLQf5NgXca0FggN4/MuT5wBOt11knZcqkroo9eTd5+JXYVKq8FNFLHcBm7F/D2
-						JMEofQssbW3jAfC5Ih9ns7dxWRPlQIyy747Czj5QeYgsd3VwxTCTmImet8QcczuE
-						60qUZwE57QYia1EbuQelVkFQaQFfObAlCp+z4zDbd5S4yqF+9KJIGgYgKSM5BGr0
-						TUILXxGKNwSV2W34nCGq7uyVbnKlQ/oNibOvc7kJD73QyRVQF9hJsEwCqR/Ie+xq
-						YlSMf7+oreYt6tBfAbsSYyMD/Yqj/3dGqAEmrqgsrummjnPZAgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEWdvdG8uc2JzLm94LmFjLnVrMB0GA1UdDgQWBBS4YdkEzNKVMvr3
-						16Wgs7zbMgV5+zANBgkqhkiG9w0BAQUFAAOCAQEAYRhCCsoR4ju1QbL51GKTmwOW
-						Qcc4Gx4bAu+ICEYHf65bbuY9H3LgwM7DIC+2iF9lyldaDO1VftBT2t5LFi6uoEU6
-						i1X6ArIXbiMBw/zmZVKSZnClBY/X5QkeDg+tA3FnDQ45WWXlukyx3DUThr1qne1A
-						sL1zu3tS/jg10A9ZTy6rgtNln6r/Zaumc7jQnRSv8zYICghX6YQHxaznQkBG4RYY
-						ieWFGVN7lSw52O0YCd9DwGNg44HuTea+hE/XIkqx0LNcEGtmuJsqVGZv9yKykY0B
-						iYcth/iCOH/Jh/+w1+VW3sZV3mKLQDT80uDGsCDg3LGDBpY95xQAek9MapwQ4w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto.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.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.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://goto.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.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.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</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>