resolve conflicts and merge

1 files changed, 0 insertions, 79 deletions

diff --git a/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml
deleted file mode 100644
index ed6a6423..00000000
--- a/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukaf.it-innovation.soton.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for the University of Southampton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-13T15:30:07Z"/>
-  </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://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GENESI-DEC bridge to UK Access Management federation</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enables UK Access Management federation members to access GENESI-DEC repositories</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjygAwIBAgIJAL06GKgIw781MA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMTHnVrYWYuaXQtaW5ub3ZhdGlvbi5zb3Rvbi5hYy51azAeFw0xMjAyMjMxNDU5
-						MzVaFw0yMjAyMjAxNDU5MzVaMCkxJzAlBgNVBAMTHnVrYWYuaXQtaW5ub3ZhdGlv
-						bi5zb3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsh
-						7nb5qjRPVhJKl7d7HtTfVbmWSMq1NPzDzYyTMAOg0+VcmDFvu5ICIp0w2w07QzGv
-						3ryZp2TaT+9DNyYaeVfnSB5rPPAuHLHrXvTwszgfXH6Bq88fkBLEHR7xIMPNqNFG
-						9JHf6VY3Z6HwRhX2wJt34O6IO7q1AuMsgmSR8vLD6ftHX7VzSXkS305cA1zNN1vD
-						xnV8Zp8ZyNE3F5xVCZBVs7XK9futaxSL8GJfX8l0IzBFeezXh9BmN5p0/2KDtwmw
-						YsBinxXAIwBCUVctfuMpnM3p9ZHRTfR4hbkDwpbTXxwEmajDXnyrbdNK/zEuGhOW
-						4+m38wiymTEmMQaPys0CAwEAAaN/MH0wXAYDVR0RBFUwU4IedWthZi5pdC1pbm5v
-						dmF0aW9uLnNvdG9uLmFjLnVrhjFodHRwczovL3VrYWYuaXQtaW5ub3ZhdGlvbi5z
-						b3Rvbi5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBTAs5xK22h/EZSU8IMQeGKQ
-						mYg4YjANBgkqhkiG9w0BAQUFAAOCAQEAxm8quSodKR3OSqZKQyv48Nw4ztkOgoIq
-						iRT/SNCtGIsIxRLE/wh6VD92ini8KLXyjY+9vnySiIz7EmPU8noS67XRkfMss33Y
-						gB0uKN4jwo7wQw0oWzd7YuPjWBfWVgHElvtITjpJ/NR5MCk2A4w2kKjvCd70e+Ut
-						O8Uiewnm0VArTVusZ1IZtT3P+5Yp4Hiq5+sjtRbxhTQn/cAkl57CemlBrj6jsPT2
-						uH0taQOxowajF5t/STCwIlCRBNptPlAMFB0x6AB2Oq2dNjzLhq8VnpSAZ6+EwSuo
-						3nkLy6HSlY8Nka9tIZollWJv0yu6+6BHzf/KMzryiGaxpKjMtB+Caw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Southampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GENESI-DEC bridge to UK Access Management federation</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it-innovation.soton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help Desk</GivenName>
-    <EmailAddress>mailto:support@it-innovation.soton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Web Master</GivenName>
-    <EmailAddress>mailto:webmaster@it-innovation.soton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>