resolve conflicts and merge

1 files changed, 96 insertions, 0 deletions

diff --git a/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml
new file mode 100644
index 00000000..8c80f267
--- /dev/null
+++ b/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qa.esds.ac.uk/shibboleth-sp">
+  <!--
+		This is a "ESDS QA" Shibboleth SP for the University of Essex.
+	-->
+  <Extensions>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-23T11:54:20Z">
+      <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://qa.esds.ac.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://qa.esds.ac.uk/Shibboleth.sso/Login" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDxDCCAqygAwIBAgIJAIFv979CtniPMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNV
+						BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+						aWRnaXRzIFB0eSBMdGQxHDAaBgNVBAMME2RhcGxhdDIuZXNzZXguYWMudWswHhcN
+						MTMwOTA2MDgzOTI5WhcNMjMwOTA0MDgzOTI5WjBjMQswCQYDVQQGEwJBVTETMBEG
+						A1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkg
+						THRkMRwwGgYDVQQDDBNkYXBsYXQyLmVzc2V4LmFjLnVrMIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEA3ler7LUUd+O4SzG18ZOt3hnXvqPnF35l+uCoAP4U
+						/8UIglUqK7VPmQNjSIQUqqW04LtLpqJ6wCF4zzZx4yOzn5B7q3Ytu7awlYDDOoeT
+						S+E/9AaHbHIzgwSu64yHqIaGsiOfntVLVJVTVby5gnjtZk7BsLvEBbmRj/xQit2i
+						a4qoBbEfu2CV3JoikgEQ29ysaWL26BPGkPiMH4AJ8rbmkcuhsrrV4utjF6Y4XB7s
+						c5dSiCOmsiVk8qWvmvyRndUv+FqfFWKNTvhwjKUH6YPLT8fR3kya05PqP6MsfpME
+						rAK2prPIoCAq3O/5H3G8Uyv4qNXOKTlvWMeGSSrKXHne6wIDAQABo3sweTAJBgNV
+						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
+						Y2F0ZTAdBgNVHQ4EFgQUpCtjhsAZDcsg55nyc8m6G+rqmVkwHwYDVR0jBBgwFoAU
+						pCtjhsAZDcsg55nyc8m6G+rqmVkwDQYJKoZIhvcNAQEFBQADggEBAD27KL4LkToX
+						HnK4Ajmkn31e7OeB1IkDXbVU8yQmRBxQ/OVcHbf2r3dKUyVJh8kcC45eLX6CIa2S
+						YClmSnaixPYjpiu20jFV1SpglaQg3KM59qc7BvN/2a7jg7wDG6LU2d42uXPHFrtj
+						hi+kURBEMRtEPVDMjDslROkNZPEmQw8kI9cA/WWz5yW4NLqsRL2cc2rQZAUA/NUm
+						gG/+uv5UwFNZiXZVphq1ITLqgYzj4mxy9pPDT5DRu41/7tpeFgqQ1XA8gSzWh0zW
+						LD49UT6gUswxL81WggC8WDMvi5sq6xnHtq1JPxCeTWDeeafn0vCR4WAV2B2y6Iwj
+						ipl34THDqR4=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.esds.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Essex</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">ESDS QA</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://ukdataservice.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Helpdesk</GivenName>
+    <EmailAddress>mailto:helpdesk@ukdataservice.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>John</GivenName>
+    <SurName>Payne</SurName>
+    <EmailAddress>mailto:jmpayne@essex.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>