resolve conflicts and merge

1 files changed, 0 insertions, 114 deletions

diff --git a/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index d047b058..00000000
--- a/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bamboo-server1.oerc.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Surfnet testing server" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-17T12:30:00Z">
-      <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>
-      <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://bamboo-server1.oerc.ox.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>
-						MIIE9DCCA9ygAwIBAgIJAJjPinj3h+6JMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-						VQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
-						BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQLEwRPZVJDMSUwIwYDVQQD
-						ExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4
-						aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTIxNTQ0MzFaFw0yMTA1MDkx
-						NTQ0MzFaMIGsMQswCQYDVQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQH
-						EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQL
-						EwRPZVJDMSUwIwYDVQQDExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYw
-						JAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAM6EbueETfZqk/3WdvBBlhiyoKsd+nFOp6Xq
-						XrzetyhGYiPvRM12mh0yNnwQVDfUo3hDPziCmos8E+94Du1adJz8ekiFb8Nz7oNh
-						MKhzPi3DPU7vUTFd6bF/TiFR8FSq8PQJH6gL8Kn6zfECo2h+taVEjns6XNhOXXWI
-						zB+GMUSxRPdeFsmFUyvBExevNhPuO3C7N5WtbW4tG9j2sqdBJYYdeoy9nS3DVgSM
-						ctT15kPkIx46o37R1fNYAQskeOEey8+qMcRIbb4HA3L5RiuKxJ0Y1LbtGgezGwz2
-						9hRFqtdnwHPDBiNuJmWVWnuVxF07IowkZwzEVPf2QvXJy2UfIrUCAwEAAaOCARUw
-						ggERMB0GA1UdDgQWBBSMBsi1+lhDNEtrwQerDmHatWTUOTCB4QYDVR0jBIHZMIHW
-						gBSMBsi1+lhDNEtrwQerDmHatWTUOaGBsqSBrzCBrDELMAkGA1UEBhMCVUsxDzAN
-						BgNVBAgTBk94Zm9yZDEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJz
-						aXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzElMCMGA1UEAxMcYmFtYm9vLXNl
-						cnZlcjEub2VyYy5veC5hYy51azEmMCQGCSqGSIb3DQEJARYXeGluLnhpb25nQG9l
-						cmMub3guYWMudWuCCQCYz4p494fuiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
-						BQUAA4IBAQAWU22GX9LpL7ZtQiiTTKdJg7zI3pUVNNcmZA5MARUdfZ6i+QmOWyDw
-						ReZmpq0sWkCMBYwOsYIYVzuCE45WBZ16wqrPZWvWfm/BSycMpuyr3aqNc2TwH38j
-						g09eFGbbX0haiMaUbicmEf72vL/n5K5lKZs/uFea5NIYUDvuKnLwXyYM6pN3mNLT
-						HMsIPDthR1ywJitmoVZaXYzQDjhHSe8oV4LEBULMU4erB/+Au/Q2nC+3OWYvUhhA
-						E7a86SCurSbeZylvzbNVrqMcR9Vs1Op1n374Ycb9kfXkweWc60RVvBBx6h474jLv
-						MbCgGVmfiQqekWeztRCKWq/Jqedw3vWF
-					</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>
-						MIIE9DCCA9ygAwIBAgIJAJjPinj3h+6JMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-						VQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
-						BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQLEwRPZVJDMSUwIwYDVQQD
-						ExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4
-						aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTIxNTQ0MzFaFw0yMTA1MDkx
-						NTQ0MzFaMIGsMQswCQYDVQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQH
-						EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQL
-						EwRPZVJDMSUwIwYDVQQDExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYw
-						JAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAM6EbueETfZqk/3WdvBBlhiyoKsd+nFOp6Xq
-						XrzetyhGYiPvRM12mh0yNnwQVDfUo3hDPziCmos8E+94Du1adJz8ekiFb8Nz7oNh
-						MKhzPi3DPU7vUTFd6bF/TiFR8FSq8PQJH6gL8Kn6zfECo2h+taVEjns6XNhOXXWI
-						zB+GMUSxRPdeFsmFUyvBExevNhPuO3C7N5WtbW4tG9j2sqdBJYYdeoy9nS3DVgSM
-						ctT15kPkIx46o37R1fNYAQskeOEey8+qMcRIbb4HA3L5RiuKxJ0Y1LbtGgezGwz2
-						9hRFqtdnwHPDBiNuJmWVWnuVxF07IowkZwzEVPf2QvXJy2UfIrUCAwEAAaOCARUw
-						ggERMB0GA1UdDgQWBBSMBsi1+lhDNEtrwQerDmHatWTUOTCB4QYDVR0jBIHZMIHW
-						gBSMBsi1+lhDNEtrwQerDmHatWTUOaGBsqSBrzCBrDELMAkGA1UEBhMCVUsxDzAN
-						BgNVBAgTBk94Zm9yZDEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJz
-						aXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzElMCMGA1UEAxMcYmFtYm9vLXNl
-						cnZlcjEub2VyYy5veC5hYy51azEmMCQGCSqGSIb3DQEJARYXeGluLnhpb25nQG9l
-						cmMub3guYWMudWuCCQCYz4p494fuiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
-						BQUAA4IBAQAWU22GX9LpL7ZtQiiTTKdJg7zI3pUVNNcmZA5MARUdfZ6i+QmOWyDw
-						ReZmpq0sWkCMBYwOsYIYVzuCE45WBZ16wqrPZWvWfm/BSycMpuyr3aqNc2TwH38j
-						g09eFGbbX0haiMaUbicmEf72vL/n5K5lKZs/uFea5NIYUDvuKnLwXyYM6pN3mNLT
-						HMsIPDthR1ywJitmoVZaXYzQDjhHSe8oV4LEBULMU4erB/+Au/Q2nC+3OWYvUhhA
-						E7a86SCurSbeZylvzbNVrqMcR9Vs1Op1n374Ycb9kfXkweWc60RVvBBx6h474jLv
-						MbCgGVmfiQqekWeztRCKWq/Jqedw3vWF
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bamboo-server1.oerc.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: Surfnet testing server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oerc.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>