resolve conflicts and merge

1 files changed, 0 insertions, 72 deletions

diff --git a/swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml
deleted file mode 100644
index 22d70312..00000000
--- a/swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jordanpublishingcpd.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for Jordan Publishing 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://www.jordanpublishingcpd.co.uk/Shibboleth.sso/Login"/>
-      <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://www.jordanpublishingcpd.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jordan Publishing / Family Law</mdui:DisplayName>
-        <mdui:Description xml:lang="en">For access to law reports, case law, commentary, precedents and legal and administrative changes.</mdui:Description>
-        <mdui:Logo height="64" width="252">https://www.jordanpublishingcpd.co.uk/jordanslogo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYjCCAkoCCQCgLsM5xyLGGDANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDEYMBYGA1UEChMP
-						Sm9yZGFucyBMaW1pdGVkMSYwJAYDVQQDEx13d3cuam9yZGFucHVibGlzaGluZ2Nw
-						ZC5jby51azAeFw0xMTEwMTAwOTUzMDBaFw00MTEwMDIwOTUzMDBaMHMxCzAJBgNV
-						BAYTAkdCMRAwDgYDVQQIEwdCcmlzdG9sMRAwDgYDVQQHEwdCcmlzdG9sMRgwFgYD
-						VQQKEw9Kb3JkYW5zIExpbWl0ZWQxJjAkBgNVBAMTHXd3dy5qb3JkYW5wdWJsaXNo
-						aW5nY3BkLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuFsJ
-						DikTpQWue+TeFD7f/SxyB95/b4D1a/4L04NtzzauQ9G+IZmtzoVvIadkYNZEqBA6
-						gyYddDxQ2z74PO/NUY04xicrwMLsm51CZz6UpZcA/g3Plr0qCNKpQdR6xiZwbH5r
-						QPvNDVpR+k1tcI/ylmvH5XW/XOHqIpr1cWAINiBCs4YXNy26c0V/1iBApKRovTyY
-						Oy2ZqxDLzC1l4xe8AliI318JcIm6ObOk3Z8OjmtzKla58xtjswvQsLVyIlb/10eA
-						XZUUHBjhgl8ule7T9isYtJ250xcfYW37Px8eERxOyTuCi7NEkQGiniSEnzp9PP5P
-						Uf4sugluTP/MRvKkqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBJ5V21s9XjpfI5
-						t+vb7eleCZOdrFOA0ON9l24CDTADuhakdFA473JgIvjGk2m/VbH5nLZDI26IRIuv
-						lm2G6eaE2FZrDCu/EScmm4G8UxuYWXXj2+grYeWJ/o9U5Zbm38a2j/z2guDCfaO2
-						+3DYYegalq7klPCuwdvN9lObF/8elD3NAx7sFgR0DAyZNF57ppejnrC3yVpyWizO
-						/0hdLckeOfpxUyal2UFB0H7hUqShfBJiJykMczpocFYRPEuOr+21Z89eoAQbplfM
-						ln8E55bf4eHw1k6Wb95K3VeDqwSznFWVXIkxEiWXCuKXxHd+J145S3YZe5ayeRvz
-						wdxJFa0Y
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Jordan Publishing Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Jordan Publishing / Family Law</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jordanpublishing.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Withers</SurName>
-    <EmailAddress>mailto:simon_withers@jordanpublishing.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jordan Publishing technical support</GivenName>
-    <EmailAddress>mailto:electronic@jordanpublishing.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>