resolve conflicts and merge

1 files changed, 0 insertions, 84 deletions

diff --git a/swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 20d69555..00000000
--- a/swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://netauth.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a "New College NAC" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-02T13:03:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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://netauth.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAKMSnZeSVHgEMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFG5ldGF1dGgubmV3Lm94LmFjLnVrMB4XDTEzMDkzMDE1MzQ0N1oXDTIzMDky
-						ODE1MzQ0N1owHzEdMBsGA1UEAxMUbmV0YXV0aC5uZXcub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC035v936htfmoVzstmJwIfPvfUB2qE
-						wey1wBMBuucw69i5g4yl8YZ17yklNQAXs3aLxiTUhLoLVZ8OK5vc4/z5PCrnIQbj
-						eO9ll6jwn6svf2NRiK5L6rDGgxjrbCjz7W7azQefCW9UF6HApFLY2GJOrZxYhnFW
-						RTiQIN5SrZxBqMNi780uPw88Qchm/8+B3E941F9Dh61Gp/DQHsORQWgEy5RF99Yk
-						MGc3wFWFNy0M0e3FHgjRxgNHvbIW5ny1TO1EAZnGfwzV30onyu/OgO/3V3jVb3Bk
-						0S48VDUFi2GTep9fOwmqJbKNy4r3VKBn5eIgVVlnveK/BbF7yIcMgwLrAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFG5ldGF1dGgubmV3Lm94LmFjLnVrMB0GA1UdDgQWBBQa
-						NkzluKeibaDUOYUKYis0I+BaDjANBgkqhkiG9w0BAQUFAAOCAQEAUabom1zsaMeN
-						Ah+SzTLFnBQAwHWSeJfWnEdtDFavwTenxjyxGMm9T85kvnQK16p0dI7yRxuHR26V
-						E6glnUU/XcO13yX2f0vPGtqLzVTK2lDK4BuSErJ+HQAuJxr0fGIHYP5s4U+Fe11l
-						wRU+KT7ijBH7IcHy7U/Kt6qKTSF9B3oMQJRvYTszduhik4fM2YCyWOscjvI+MCEd
-						4q3awKar8d4qiAqBFM627qTU+ozjYwV6O3mFPIfi8Kp3GM5+qbVBPgJhlPU6n6Fs
-						Fqnx77OlqMFgNDUgKpoXmT1+nh6Fb9/4orNFUp3gAJBvm80LmYl61O+UozUgtg1C
-						JBJczVcyrQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://netauth.new.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, New College NAC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Dore</SurName>
-    <EmailAddress>mailto:james.dore@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Dore</SurName>
-    <EmailAddress>mailto:james.dore@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>