resolve conflicts and merge

1 files changed, 0 insertions, 72 deletions

diff --git a/swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml
deleted file mode 100644
index 03161068..00000000
--- a/swamid-interfederations-2.0/beta.digitaltheatreplus.com.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://beta.digitaltheatreplus.com">
-  <!--
-		This is a "Digital Theatre Plus (setup site)" Shibboleth SP for Digital Theatre.com Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-04T16:07:08Z">
-      <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://live.digitaltheatreplus.vualto.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Digital Theatre Plus (setup site)</mdui:DisplayName>
-        <mdui:Logo height="60" width="104">https://live.digitaltheatreplus.vualto.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIJAN3dSNg4hiPsMA0GCSqGSIb3DQEBBQUAMDcxNTAzBgNV
-						BAMTLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFs
-						MB4XDTE0MTIwMjEwMjEyOVoXDTI0MTEyOTEwMjEyOVowNzE1MDMGA1UEAxMsaXAt
-						MTAtMjEwLTEzMC0xODUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWwwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWIBkrkj+I6eUqYNMmNdjkDF4phGN+
-						sNIjyo8kCcYc7Wb/WFYADECTYtZbKkSWBARejxCAGiqp2XGhpwN91cisYeeVY79B
-						EnI7O45meAasDOFGRVc8ciP5PaujLqz3zwWt8YAnsQizmq7bpvHerZQIkQt9c1Km
-						NeREIMJDB6FH0ZTsUbVLxDtQnAEHJ7jj0seNkDmNXP4ooiipKbZYbCVyksp6i6fV
-						xGp7bIZodBg7U70TK9zQuBPx3TWZsevxOcVwyaH5f3q5KijjBFOfPKGLkAhJ9xxF
-						sy1XhBPSaXCZ5wcfM86ZkmqjXauR90JwxDAciPorYV19BvHdFBVw0/7VAgMBAAGj
-						WjBYMDcGA1UdEQQwMC6CLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21w
-						dXRlLmludGVybmFsMB0GA1UdDgQWBBTcWEhiwHcbivBKw8bU1P5X912UljANBgkq
-						hkiG9w0BAQUFAAOCAQEAu9c6LYR9f4jCqfjUG+8aQohiqU4MYv9BWsTCchaEsjTX
-						TkbJP9r9G9ftc1eLUh9Ct8A4kKpk2qmb5dGYYn15YicvgTy1oS6foqck5IEmUllQ
-						pfw4r2O4rnTNaEKugxHrh9MTjy5aNOBAzJiLzz8Yy7kbVahaZJSloZySUeyLCbKh
-						OYvUnue1d7biTwQccRE7zMqTLO2B07KUzLVV75zhNIEeZlStQ0ubRBM7qmq52Jgh
-						LzDYGo/doin3Q2xtR/QRMHtxbxh1EFsRbPKbGjp89sNBrGI+RxE6SLb22dD7sy/m
-						5S4VgGuIjXcu5pGhndoGHXSmeg3DLMKSrmrkJUcNQg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Digital Theatre.com Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Theatre Plus (setup site)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.live.digitaltheatreplus.vualto.com/about-us</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Ware</SurName>
-    <EmailAddress>mailto:support@digitaltheatre.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Carly</GivenName>
-    <SurName>Britton</SurName>
-    <EmailAddress>mailto:support@vualto.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>