resolve conflicts and merge

1 files changed, 0 insertions, 92 deletions

diff --git a/swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml
deleted file mode 100644
index b58d05a1..00000000
--- a/swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2sp.ntu.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2.3.1 SP for Nottingham Trent University
-	-->
-  <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://shib2sp.ntu.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>
-						MIIC3DCCAcSgAwIBAgIJAJo8E70ZFlUHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3NoaWIyc3AwHhcNMTAwNTE3MDk0MjM5WhcNMjAwNTE0MDk0MjM5WjASMRAw
-						DgYDVQQDEwdzaGliMnNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						wdIcqfW5diwfvyCH6wQhCg9/foLi7OgVOsxPag90eS2QTU1+AXjRpXPo7SWF8L6s
-						vPbnWuBNb6ygxNtSgou9dq1+s9/Ib5JeDNfJYF0HmcXme72xdqkRlLNd+AM1pWie
-						ww6+pTJRognTl8Kvahr9OWmF8WsmnTpktC4sKzOalchrTt+FoEJotyN/b4Eo7XI3
-						6IFsW8UkX9Fgq0A2RC99URx3eJoeJ+tBaWAkarGCvpzRt4EL9htAui+oeiRRldKV
-						VY2WlIJC6v8ay9cnqmhMwk/jhx9uyNmFIP49pFinhJiZ9MkOhJHDdVYuDmp9covj
-						YXyaBJIPeEbvHovSzcaKEwIDAQABozUwMzASBgNVHREECzAJggdzaGliMnNwMB0G
-						A1UdDgQWBBQz/l71WUEnWuQoGlxqcvps54wrbTANBgkqhkiG9w0BAQUFAAOCAQEA
-						OSvTiwxS1HnSyTRzmBtU2AL8w/IhO7XHYbMQpaaMYDSrQs8ajxDpUOjOuvXv5g+I
-						d9kncKZzuE4IJ1OmdzcsrJ0eETDjujPI0b5smxOoBWNJxl3KKKeJybpJVMFkTA0z
-						yLyymq/nf23QG76qVbUDr6GsJO2RDgX6h1OfUhBzEzGW59TQRoqKyvWqPuCNp4lU
-						os1OGZMyq8k9K5S1yIrNqmxI+TI/+aG1QXGKqGy0uhOHGEa0mClLrFBUVGEpoi2L
-						x5BCvr49YvlqB+HeIWj+ZmcF8e+8yYKceVaZ67yVFCkZMcHp/CkVY7V1hLX8mHki
-						4lcfxOKtZ+Rx/ai+73mSLQ==
-					</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>
-						MIIC3DCCAcSgAwIBAgIJAJo8E70ZFlUHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3NoaWIyc3AwHhcNMTAwNTE3MDk0MjM5WhcNMjAwNTE0MDk0MjM5WjASMRAw
-						DgYDVQQDEwdzaGliMnNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						wdIcqfW5diwfvyCH6wQhCg9/foLi7OgVOsxPag90eS2QTU1+AXjRpXPo7SWF8L6s
-						vPbnWuBNb6ygxNtSgou9dq1+s9/Ib5JeDNfJYF0HmcXme72xdqkRlLNd+AM1pWie
-						ww6+pTJRognTl8Kvahr9OWmF8WsmnTpktC4sKzOalchrTt+FoEJotyN/b4Eo7XI3
-						6IFsW8UkX9Fgq0A2RC99URx3eJoeJ+tBaWAkarGCvpzRt4EL9htAui+oeiRRldKV
-						VY2WlIJC6v8ay9cnqmhMwk/jhx9uyNmFIP49pFinhJiZ9MkOhJHDdVYuDmp9covj
-						YXyaBJIPeEbvHovSzcaKEwIDAQABozUwMzASBgNVHREECzAJggdzaGliMnNwMB0G
-						A1UdDgQWBBQz/l71WUEnWuQoGlxqcvps54wrbTANBgkqhkiG9w0BAQUFAAOCAQEA
-						OSvTiwxS1HnSyTRzmBtU2AL8w/IhO7XHYbMQpaaMYDSrQs8ajxDpUOjOuvXv5g+I
-						d9kncKZzuE4IJ1OmdzcsrJ0eETDjujPI0b5smxOoBWNJxl3KKKeJybpJVMFkTA0z
-						yLyymq/nf23QG76qVbUDr6GsJO2RDgX6h1OfUhBzEzGW59TQRoqKyvWqPuCNp4lU
-						os1OGZMyq8k9K5S1yIrNqmxI+TI/+aG1QXGKqGy0uhOHGEa0mClLrFBUVGEpoi2L
-						x5BCvr49YvlqB+HeIWj+ZmcF8e+8yYKceVaZ67yVFCkZMcHp/CkVY7V1hLX8mHki
-						4lcfxOKtZ+Rx/ai+73mSLQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Nottingham Trent University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nottingham Trent University: Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Cross</SurName>
-    <EmailAddress>mailto:richard.cross@ntu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Hallam</SurName>
-    <EmailAddress>mailto:ITSShibbolethTechnical@ntu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>