resolve conflicts and merge

1 files changed, 0 insertions, 82 deletions

diff --git a/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml b/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml
deleted file mode 100644
index a64f9cdf..00000000
--- a/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testpbyp.camb-ed.com/SP/Shibboleth">
-  <!--
-		This is a "Personalisation by Pieces" Shibboleth SP for Cambridge Education Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://testpbyp.camb-ed.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Personalisation by Pieces (PbyP)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Personalisation by Pieces (PbyP) is an approach
-					to teaching and learning developed by Cambridge Education in 2006. It is a
-					framework to support personalised learning based on core skills and competencies.</mdui:Description>
-        <mdui:Logo height="100" width="252">https://services.camb-ed.com/images/ce-logo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAJ0gsyZA9LuWMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGm50ZGQzMDk3LXZtMDEuY2FtYmJlLmxvY2FsMB4XDTExMTAxOTA5NDc0NloX
-						DTIxMTAxNjA5NDc0NlowJTEjMCEGA1UEAxMabnRkZDMwOTctdm0wMS5jYW1iYmUu
-						bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCh5Q5Pfp0V1Ch6
-						BGzR3BdI5zG2iuEFSIXL86J8BjNtmXK7trhlmkFV8IRrSlZZT4HoQ5L8osWMmjvF
-						PT7QUShEgOa2whBn40B8FKCLgEpBw5cigexoc5CSsrwrlYFRvyI5dPFxWswcx+xJ
-						ZY8Rrzr2nWyt3uFzs2wNwIx/ftXQPLXQPVRU14OQQa34oy8EY8Gu+IcZJKbLUssz
-						3jFc/7RYXXE6GT6gU1zuIVTXl3C/rZniD2byTkw6cT9p0PqnAjt75A2tjd4Caro6
-						8wyof9P7NjtHaRAl1lY/FH0OFPuSoF4FJxFgzeY/iQ59qxZ0hpVx0/ypy35bkrIB
-						9sYRChKPAgMBAAGjSDBGMCUGA1UdEQQeMByCGm50ZGQzMDk3LXZtMDEuY2FtYmJl
-						LmxvY2FsMB0GA1UdDgQWBBQIox4FW13pfw8o8eGdT9Pf62b05TANBgkqhkiG9w0B
-						AQUFAAOCAQEAHZ1hImDls+f1zizRgGQVAi3oDJxKIbsZpabHWiF26ZLm510Scw0m
-						EMo+ujL+QZGZGrm8EFvRg3SXRgn1R7FogYof7rg8xegReDSpKLsnGJFiKj+CBq8w
-						bFZ1A4jfGD1BITLqn1RpFqrFAXHI5O+LbZSMf4LxC/y7h8H/oa86qKAyBQ/6VrGQ
-						xKt+6n+Wf8hbkI2xcBzfzr5RiRWynCDl7uBLZtgqVnqWm+kMSZ7pumsCoQVnIiUg
-						UY4Kot4hlc38yuDomldi17E41LhqZqi/ZOUi2o2l9r7kyGKDd5LCmXNiQdsGtfWb
-						7xE8KO+hyTvS+CzJoArDBNyd7hkQJqw3gw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cambridge Education Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cambridge Education Limited: Personalisation by Pieces</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.camb-ed.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Bell</SurName>
-    <EmailAddress>mailto:simon.bell@camb-ed.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Zishan</GivenName>
-    <SurName>Sheikh</SurName>
-    <EmailAddress>mailto:Zishan.sheikh@camb-ed.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Bell</SurName>
-    <EmailAddress>mailto:simon.bell@camb-ed.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Zishan</GivenName>
-    <SurName>Sheikh</SurName>
-    <EmailAddress>mailto:Zishan.sheikh@camb-ed.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>