resolve conflicts and merge

1 files changed, 0 insertions, 121 deletions

diff --git a/swamid-interfederations-2.0/oxford.saasiteu.com-.xml b/swamid-interfederations-2.0/oxford.saasiteu.com-.xml
deleted file mode 100644
index 078a5ae8..00000000
--- a/swamid-interfederations-2.0/oxford.saasiteu.com-.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxford.saasiteu.com/">
-  <!--
-		This is a "SaaSit Production" FrontRange SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-05T14:04:54Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
-						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
-						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
-						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
-						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
-						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
-						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
-						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
-						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
-						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
-						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
-						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
-						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
-						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
-						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
-						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
-						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
-						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
-						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
-						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
-						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
-						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
-						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
-						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
-						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
-						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
-						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
-						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
-						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
-					</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>
-						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
-						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
-						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
-						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
-						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
-						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
-						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
-						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
-						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
-						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
-						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
-						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
-						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
-						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
-						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
-						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
-						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
-						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
-						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
-						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
-						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
-						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
-						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
-						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
-						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
-						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
-						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
-						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
-						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <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://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx?binding=urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx" index="3" isDefault="false"/>
-    <AttributeConsumingService index="1" isDefault="false">
-      <ServiceName xml:lang="en">FRS</ServiceName>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SaaSit Production for the University of Oxford</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://oxford.saasiteu.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Cloud Service Management</GivenName>
-    <EmailAddress>mailto:CloudServiceManagement.Support@frontrange.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SaaS NOC</GivenName>
-    <EmailAddress>mailto:SaaS.NOC@frontrange.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>