resolve conflicts and merge

1 files changed, 0 insertions, 92 deletions

diff --git a/swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml
deleted file mode 100644
index 2472833f..00000000
--- a/swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.wortech.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 SP for Heart of Worcestershire College.
-	-->
-  <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>
-      <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://sp-test.wortech.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>
-						MIIDBjCCAe6gAwIBAgIJAMwsgNyzDRXNMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azAeFw0xMDExMDkxNTI5MDZaFw0yMDEx
-						MDYxNTI5MDZaMCAxHjAcBgNVBAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeI+dq6Q0k+EvCnXvyITtkxUYDS
-						+6b0GXkofMeMyDt+4fy0IznKXK46VncC1sfronjA5ah6Y2VXhDzZKrt/2TtPRNLQ
-						J7k9CfyYUTAXZ5B1pR4a1IevXcoQPFROmXxZsoqViuNXH+BzuIviv9f6TSPennW0
-						SX3plKCFAvnHiYPsPbdcBwTku6NVLOsgfeAV1XQUVHP0f3xBr2wk3TiELxEhbtTx
-						S2rNqgkHkx+eDKAfTBp7GzCh5Q7VsMfKNWmdgAq42HLpOnqvviPF/Fn9KLKCNuMA
-						TH01ypbb4vEL5xP/UbQKfER0Wa67isFpfkXgMeS66wmA6TlwNXCGOudrZIMCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVc3AtdGVzdC53b3J0ZWNoLmFjLnVrMB0GA1UdDgQW
-						BBSB03qpqS73R8ADFUKyCMvsO/7OozANBgkqhkiG9w0BAQUFAAOCAQEAxJctEFMq
-						SKsmQPuc/oudcQYsbC8IUzbVjJ6TsuC/s/Y9sVPKtCCmaCJFeymbx9yHRdH8k0dP
-						7n2pFmv7oHpohHniOzF/X5O3HZLTAKq077axk54ca4MtLU4gnkhGqQUQ6tucPJ/8
-						4fu2xH394cGVl3giPI6zZahTvks3OH4GizkELNF5/NYbxx6tilQDmYnijp5z+m88
-						58jIhUpEdUI/ZkwjA7Bgf/+1t8Q9ys2GC9xjBk46H537S7UlDJGwojUTsHPGceVD
-						mRjRzBOnlMe7YT8NEvKK16QvehZlwfnMosIlNFozGmhwVtWlJ+pJATGm0gu4vZDU
-						I64R7eQVc7Z6kw==
-					</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>
-						MIIDBjCCAe6gAwIBAgIJAMwsgNyzDRXNMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azAeFw0xMDExMDkxNTI5MDZaFw0yMDEx
-						MDYxNTI5MDZaMCAxHjAcBgNVBAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeI+dq6Q0k+EvCnXvyITtkxUYDS
-						+6b0GXkofMeMyDt+4fy0IznKXK46VncC1sfronjA5ah6Y2VXhDzZKrt/2TtPRNLQ
-						J7k9CfyYUTAXZ5B1pR4a1IevXcoQPFROmXxZsoqViuNXH+BzuIviv9f6TSPennW0
-						SX3plKCFAvnHiYPsPbdcBwTku6NVLOsgfeAV1XQUVHP0f3xBr2wk3TiELxEhbtTx
-						S2rNqgkHkx+eDKAfTBp7GzCh5Q7VsMfKNWmdgAq42HLpOnqvviPF/Fn9KLKCNuMA
-						TH01ypbb4vEL5xP/UbQKfER0Wa67isFpfkXgMeS66wmA6TlwNXCGOudrZIMCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVc3AtdGVzdC53b3J0ZWNoLmFjLnVrMB0GA1UdDgQW
-						BBSB03qpqS73R8ADFUKyCMvsO/7OozANBgkqhkiG9w0BAQUFAAOCAQEAxJctEFMq
-						SKsmQPuc/oudcQYsbC8IUzbVjJ6TsuC/s/Y9sVPKtCCmaCJFeymbx9yHRdH8k0dP
-						7n2pFmv7oHpohHniOzF/X5O3HZLTAKq077axk54ca4MtLU4gnkhGqQUQ6tucPJ/8
-						4fu2xH394cGVl3giPI6zZahTvks3OH4GizkELNF5/NYbxx6tilQDmYnijp5z+m88
-						58jIhUpEdUI/ZkwjA7Bgf/+1t8Q9ys2GC9xjBk46H537S7UlDJGwojUTsHPGceVD
-						mRjRzBOnlMe7YT8NEvKK16QvehZlwfnMosIlNFozGmhwVtWlJ+pJATGm0gu4vZDU
-						I64R7eQVc7Z6kw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Heart of Worcestershire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Worcester College of Technology Test Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wortech.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:itservices@wortech.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:itservices@wortech.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>