resolve conflicts and merge

1 files changed, 0 insertions, 174 deletions

diff --git a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml
deleted file mode 100644
index a9b8ae7a..00000000
--- a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ens-lyon.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-04-16T15:12:48Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lyon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENS de Lyon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
-BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
-wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
-eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
-EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
-Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
-OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
-4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
-H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
-U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
-XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
-fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypO2
-f6+uJhiZJuaWf1UR+oXBgxm+DnE5Os2ZdvPGiQnD2lWGj4UEAfh/EZzW0iNHY1KW
-tfNh9/2XHu/Et02238FkIvUymO6LOwWP9UDuCHQ4Wy7JvKa3lLYxnvh8Gal+NfEP
-I/U/DHx630t+8EimYAFZgcenWpbqkT9xjLChptj9qR5T3NbrD2hOBHwSm2G1F1D+
-p11116eELjJjePpiqOk3oL/NYtR9JiyM/5fEpfHIWEvBIfVXO5u2+cbFLttc//ZS
-WbTQGeRIfaJzPizv1jLVzwvGgl+FQr50tPleghThr/mJ3OxYwxjkh/RK6/awr0+z
-3ugq4lRl1Y06z0bJYQIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFJ7Argu6V5TSZhZ5LVnljAZDb4KxMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAF4crvTXRVC0lUVCOrGvozi2C2B+R/m0tiJUGXw1C32550RW2dM/q9hio
-Bld7tdjr2g6on8L2Sc46fjlBBC9fI0r2i1rukZ1ERlEmDNhvyrIaxHCG02jfNGij
-oCanvWoBa+NAyh4BHHuBenlOrqeXZjfw1RZPOrCtZ6JnPVRuoXqpl+gt+raM4ey1
-bQt3dofx0M7vegUNzfuOJcUEBTik/WBAXuuu1i9QIeIcIPzTYCzFPs7T2tZDRU7z
-y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
-3rKoIY8FKvLhu0jcNpr+QzAZX6s2yw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ens-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lyon.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
-BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
-wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
-eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
-EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
-Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
-OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
-4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
-H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
-U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
-XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
-fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypO2
-f6+uJhiZJuaWf1UR+oXBgxm+DnE5Os2ZdvPGiQnD2lWGj4UEAfh/EZzW0iNHY1KW
-tfNh9/2XHu/Et02238FkIvUymO6LOwWP9UDuCHQ4Wy7JvKa3lLYxnvh8Gal+NfEP
-I/U/DHx630t+8EimYAFZgcenWpbqkT9xjLChptj9qR5T3NbrD2hOBHwSm2G1F1D+
-p11116eELjJjePpiqOk3oL/NYtR9JiyM/5fEpfHIWEvBIfVXO5u2+cbFLttc//ZS
-WbTQGeRIfaJzPizv1jLVzwvGgl+FQr50tPleghThr/mJ3OxYwxjkh/RK6/awr0+z
-3ugq4lRl1Y06z0bJYQIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFJ7Argu6V5TSZhZ5LVnljAZDb4KxMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAF4crvTXRVC0lUVCOrGvozi2C2B+R/m0tiJUGXw1C32550RW2dM/q9hio
-Bld7tdjr2g6on8L2Sc46fjlBBC9fI0r2i1rukZ1ERlEmDNhvyrIaxHCG02jfNGij
-oCanvWoBa+NAyh4BHHuBenlOrqeXZjfw1RZPOrCtZ6JnPVRuoXqpl+gt+raM4ey1
-bQt3dofx0M7vegUNzfuOJcUEBTik/WBAXuuu1i9QIeIcIPzTYCzFPs7T2tZDRU7z
-y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
-3rKoIY8FKvLhu0jcNpr+QzAZX6s2yw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENS de Lyon</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENS de Lyon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Hugo Etievant</md:SurName>
-    <md:EmailAddress>hugo.etievant@ens-lyon.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sébastien Mei</md:SurName>
-    <md:EmailAddress>Sebastien.Mei@ens-lyon.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>