resolve conflicts and merge

1 files changed, 97 insertions, 0 deletions

diff --git a/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml
new file mode 100644
index 00000000..13632cc2
--- /dev/null
+++ b/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lshtm-shib.hosted.exlibrisgroup.com/shib">
+  <!--
+		This is a "London School of Hygiene and Tropical Medicine - Primo" Shibboleth SP for Ex Libris (UK) Limited.
+	-->
+  <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-08-05T10:01:54Z">
+      <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://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">London School of Hygiene and Tropical Medicine - Primo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the London School of Hygiene and Tropical Medicine</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDMDCCAhigAwIBAgIJAJzvYQ51LpPDMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
+						BAMTI2xzaHRtLXNoaWIuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB4XDTE1MDYz
+						MDA4MTQzMFoXDTI1MDYyNzA4MTQzMFowLjEsMCoGA1UEAxMjbHNodG0tc2hpYi5o
+						b3N0ZWQuZXhsaWJyaXNncm91cC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQC32GeYKw8TF9cMM23p6fVihgQg8NjGIPKNLOOpcWzwSKQkJmSbroVF
+						WTEKuJElwjJE7X3XmqFcFzJdLSue7r03IoSKdIYFC14SUvpHXIWvVnwXp/QpPjgw
+						ifq44I9TlJkT/ivlVhBQ07ykOae/+bnzHzK2xNlgLjs2vzzWpHVUStjxTyaAgU/J
+						5awPu5JVtbPXitzt4hdd7Q96Ig0Xlaz+gn27ZMLRQR73jwAn3IiTKghScU7fB/w5
+						9OKpEW/1m8UnEyF9Dxk6zXOscCWz+0PeRQ92ca4zuDaAAFiIbCoO5FkzTnZbgAlH
+						lVoh/IC9Kf+o3I9JIdX6yb/NN6kX+Ha5AgMBAAGjUTBPMC4GA1UdEQQnMCWCI2xz
+						aHRtLXNoaWIuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQWBBTgnmqB
+						r5gxEx7iBUT8+9ZEH3s6hDANBgkqhkiG9w0BAQUFAAOCAQEApbLKd2sy7MFs5kE7
+						+ScntnbvXpKxGhV8wF2UDE+bzIRutPqunIE/vkw/S670dMu6aC4mHNTkZuYh5o2C
+						85bSlganpDzPM6+VHMQ1chozPJGi8jikXeD2Aexl0qQUk2ueZ99U1Y2e9iVbyZuy
+						zlaZz1ByzhVq107N8RdosrOR2xef4T2p72V5QZ90t7iRD8VjtsqkhJUsabzwIA8K
+						lkpee42ow4OY4FGUBQ4x1mMhwRk+hAy95SCgeI7KbCnNGPfleGDS7M+uLcXpM9u/
+						D6odUzgJfKEHsWMNdAdH6tlCC59+9aNixr+u3G6PkxJFHnboW6EQ1eTFnJnwmsXy
+						qrSsCw==
+					</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://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at London School of Hygiene and Tropical Medicine</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Benoit</GivenName>
+    <SurName>Ginestet</SurName>
+    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Benoit</GivenName>
+    <SurName>Ginestet</SurName>
+    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>