resolve conflicts and merge

1 files changed, 0 insertions, 95 deletions

diff --git a/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml b/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml
deleted file mode 100644
index f635baae..00000000
--- a/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs-tst.uas.ox.ac.uk/adfs/services/trust">
-  <!--
-		This is a "UAS Test Federation Server" ADFS SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-17T15:58:44Z"/>
-  </Extensions>
-  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdTCCA12gAwIBAgIQAYeNkmekB/SM25iBZ344pTANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDUxNTAwMDAwMFoXDTE2MDUxNDIzNTk1OVowQjEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRmc2QtdHN0LnVh
-						cy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALYVAWpu
-						sOdCft81RDGMmpFYRtzwQKWpMdCygldUxjphjl8x7h4YOh3EnTHFV969JZO0OM2N
-						Pd0OkOJpRIxQ+1NMlkEjDciIcV3hDqK6q7tUcOGN7Wxdshj1kprpABz7uwZY9voJ
-						QARQJDJsAcV4smSLcD5My+7ZuOZ/jE6CEOaE5e3RUYIevfTk4PUsT4vrQ1N32Hjs
-						lKlTzeaKhY2jLVQMO+mHNgufEGv/hUQFVGPYGDdXmLaJLw+K0sMbEY+IPRknlEBf
-						nTgW+ZY8HbQPrUlSeb7gWOL8wJG3g3CbXKGy7wl+XoSjwVrvJN/Pc0fBX6pChgAP
-						vcKXSX8rMG2bJv8CAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-						KzdXR+qQ47ntMB0GA1UdDgQWBBRVo3xu6xD4PEcrqyYc/nZ7PnykbzAOBgNVHQ8B
-						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-						L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZnNkLXRzdC51YXMub3gu
-						YWMudWswDQYJKoZIhvcNAQEFBQADggEBABlAGHmGLEBxaxnsE0cK3KLd2gbB8b3U
-						6eUylt0uD9i40aSgxhZaG5lP1CPco+jomeyZCtdnQJMz07NSWTet0Bzms6ZPMYOX
-						L/A7PAWjGP+nsdVHkKWO/LCwa1RwpQY7Y5gD89toQUNrVTc8UuNRpWdjpkFWrzQc
-						5ReHSCcpG3XnZgJiYeD8Fbm62qLq8DFStGxNl0LadOWtm0SYHk9AcXt0D3e63cde
-						KRxLQLd/2BKKh0D9ea3I2EIMU5uwzx11M6xDVTXyzwSf34Msj6YyYWx4QASETezM
-						Mz48c4qnZn8LgQbdVM0km+HhYvRWTRmWYSJMfP5oUKjKwY6omSi/R+0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdTCCA12gAwIBAgIQUBxe1RI1OSeeGJz+HrEzhjANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDUxNTAwMDAwMFoXDTE2MDUxNDIzNTk1OVowQjEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRmc3MtdHN0LnVh
-						cy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdJ3HyV
-						4zb2QhQ7+oZ4pSt1mdc4zhkKxz2Uh3re0pTG72YxfiZTuyjcbE4MQysotAAQHvrt
-						ezyyC5RXOEAF5Rnvsmda4Qm4NF0FHFVSjULopBm6w363doFz79pL8Uj7OcG5w8Tw
-						ESotHf8a0UQcliwpTRY+seFSuLcexOGKNHG/F0bCMXTiNcJFYLAhJ5aF5WqDttPN
-						g3WwBozla6QRDZpvOPVZAVsR79wJ9ntVxy8U0zs1ErBm5AF1bpHLcQBHTOXvcreO
-						LeB8r0micOvJYndfD7ZpNnhCF80L3Msy/FmxyrAd1n4B/NfluCd8dB/wutSIlQfh
-						nhfN+1JcgUtIDRMCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-						KzdXR+qQ47ntMB0GA1UdDgQWBBRf/qdLfo/Qs/aJMHLCOf/7p35aDDAOBgNVHQ8B
-						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-						L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZnNzLXRzdC51YXMub3gu
-						YWMudWswDQYJKoZIhvcNAQEFBQADggEBAKn8mZS6VfJxeShly/I/YixiHwSnAsG8
-						rtH8N0rE7wmrnYUlZ048ihBc4Pv4f4i4YAL8ilujcqSNWt5XNBCM3+FyNDVOZOlm
-						94WZ9clNsDicnG4jC/jop0lETzrN/rYoqmIIqaKPd0HnUQU89Q/9K853+VOYY/Md
-						VmeNJ1CSgMW4bjC/oS4JutCCrrRisnlleRhWH5vQYIVSKOGOCaNqlHEkLSdX1irz
-						WeWFbCJV+mzUy6Glo2J5TT24L8LyZuPTpBqNura5SWBcT76qY7FYfnMrx54YhlEc
-						uZg2deYNiyxcEP4vZgQi764am9mYbcP3sYt1cTy8W+sTQYGKp/q0MoA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UAS Test Federation Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support </GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support </GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>