resolve conflicts and merge

1 files changed, 0 insertions, 70 deletions

diff --git a/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 3c07ae59..00000000
--- a/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.ords.ox.ac.uk/shibboleth">
-  <!--
-		This is an "ORDS dev" Shibboleth SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:08:41Z">
-      <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://dev.ords.ox.ac.uk/Shibboleth.sso/WAYF/UKFederation"/>
-      <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://dev.ords.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJAMTekyIxruAZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWRldi5vcmRzLm94LmFjLnVrMB4XDTE0MDMyNjE1MjIwNVoXDTI0MDMyMzE1
-						MjIwNVowHDEaMBgGA1UEAxMRZGV2Lm9yZHMub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCyUaAfy6/+4NEKbLUL7bkZIaaeAZRmerKMSR4L
-						mwgueQ4VAO1mVogr3abLNJz3xtXqHeA4+iYKVyvGVBXoqQGl9SeLuoDRPEOQCxXc
-						sXxt7fEMpuQfqP7Q3XPvPwSpBuvtaac2kZgXIuHcSZZFJTa4d1aSJFgclzwzGh77
-						f7w87Olj85QK1422M2RZq8LDdIcyi/nsqSLHe08Dg9ZiW/yOr22m6mN6oVUz1Prw
-						BEnH6WU5KbwiOweVBt7CzHlLQS47fg6a+O3sQlYQsPnjjYYtODYG015gPk+1CNlm
-						XM4ji6yHbtY7cEmfIcxUHLajFrXNPkrejk/QbZr3ldcE1kzBAgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEWRldi5vcmRzLm94LmFjLnVrhiRodHRwczovL2Rldi5vcmRzLm94
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFLKTjIENem7hq6zmT3gfDgSqITHf
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCUSxq9Ltpxs0hCKwm+L7pv681mUDEeIlGFyVzy
-						A9GsMVTXJLh4iK+5hnsB1yxuOr5gyXpumDtThvrUNxs2ilhRFpl6FmSdj4B5e2by
-						bRbg/h91jdUuTRh48g9Y1PDD+ni6D672s9acjKqXv62mIAPxGob+2hDOVBHQtLj/
-						Yyug3pfNmTJyPkqZY7vEwuvsOvG+LR6z3hQzL/7kGd+OVtbaKYyeN0QDYozdYyHG
-						IChAFKDUiO1a4J05jUxLuGcto5ozOFurWGieiptFnhlr68t5vGXunQ55r41+5Ixw
-						USr1xa2CyDRm+G7gp/teublqbSKOfBTZ778RRMCK2KQiV+qh
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ords.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 ORDS dev</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>