https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-1.0

9 files changed, 71 insertions, 84 deletions

diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index d6e2dd13..d1a3f8d3 100644
--- a/swamid-interfederations-1.0/.xml
+++ b/swamid-interfederations-1.0/.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2014-07-13T08:17:01Z" cacheDuration="PT345600S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2014-08-19T07:17:01Z" cacheDuration="PT345600S">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml b/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
index 3e67e901..7df78638 100644
--- a/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
+++ b/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
@@ -34,6 +34,36 @@ DSWPf8vQpQ==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQOWGPWke4DcPypq61jxi5UzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDcxMDAwMDAwMFoXDTE3MDcwOTIzNTk1OVowQTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNhZ3ctc3Bhcmtu
+ZXQudXR1LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvw38LEvp
+djnLwfGCyajCi1K1HPSphIC7giATYbMuYWQzp1e74nlM7MYm0rM/Czv7KjV2bvqA
+Cb0BGylc4JaISlab2ZFw1geHye/x5AF0kpyhVLwOg+zciExR7rNjrj1bVoO6zh+d
+x3LI+8w3stbS6be+fq/VWM/q34+3WGYQY0MY51W6A3Q9CgsOUrj02KNi/mUIrexH
+XuIPSmPe9Iko17DwOaRa4zdaXs67HuzCwXqn4iEsLxLJhb50SJs4ZxpXNY5ICtZg
+MaRhhVDgd8Eb5UfbkNSo5UmhYT31I1dPf3RubXRL3N21FftxRDPuVr//STBV5n1v
+7cHxhNXBVS+ZkQIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFKQCEfwC/cdgSYAfdae2dUQzjho6MA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNhZ3ctc3BhcmtuZXQudXR1
+LmZpMA0GCSqGSIb3DQEBBQUAA4IBAQApc0jVKsilWfjGxVMut0c7nn0tDMh30lGZ
+4PXpc6u8+HY4jGJccPLNEOA9ECqQBnxKcqN+xxvRI/XiiFOS6G/a/MaEPyYhQvcg
+foDsvA5LzyQyxLmf/yhYQbIBxhb1nVH1NOwsbwJWotYn0A/wFkWVYUGYxILmfu0Z
+8gg0SwCNooAwlQLG0wvbROgDYXqkomPuflWNeDSJl48OsAnRVnspMmqTdc3UFH8E
++IPl4VMqhboXM0LB9u97ubaAdR+2A3bws+wqC+GbdlUsHOrWV/BqNFcSjznn3Q/r
+6r8ROTllHa97gLvSaSYorIAj0//d8l5k7DU/afiUTXiX4/9rKRDy</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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agw-common.sparknet.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
diff --git a/swamid-interfederations-1.0/idp.csc.fi.xml b/swamid-interfederations-1.0/idp.csc.fi.xml
index c7c70c4c..b2285811 100644
--- a/swamid-interfederations-1.0/idp.csc.fi.xml
+++ b/swamid-interfederations-1.0/idp.csc.fi.xml
@@ -5,12 +5,12 @@
       <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
         <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
         <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
-        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
         <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
         <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index f1be275a..406d6f54 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -217,6 +217,8 @@
       <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nannestad.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">naustdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nb.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nes-ak.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nes-bu.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nesset.kommune.no</shibmd:Scope>
@@ -274,6 +276,7 @@
       <shibmd:Scope regexp="false">sfj.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skanland.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skiptvet.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skoler.alta.no</shibmd:Scope>
@@ -284,8 +287,10 @@
       <shibmd:Scope regexp="false">sola.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">solund.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sortland.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">spydeberg.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">stange.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">stavanger.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">steinkjer.kommune.no</shibmd:Scope>
@@ -306,6 +311,7 @@
       <shibmd:Scope regexp="false">tjome.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">tokke.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">torsken.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">trogstad.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">troms.vgs.no</shibmd:Scope>
       <shibmd:Scope regexp="false">tromso.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">trondheim.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/idp.uef.fi.xml b/swamid-interfederations-1.0/idp.uef.fi.xml
index 4f38e79a..5c0771e6 100644
--- a/swamid-interfederations-1.0/idp.uef.fi.xml
+++ b/swamid-interfederations-1.0/idp.uef.fi.xml
@@ -36,43 +36,7 @@ WGsRO8eC1kCnCdgVhnerPYdvl76LeqVtkqSwepNbrncvnyGIOh+jhD2yrwRV7oqQ</ds:X509Certifi
     <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-Redirect" Location="https://idp.uef.fi/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uef.fi/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uef.fi/idp/profile/Shibboleth/SSO"/>
   </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">uef.fi</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDjDCCAnSgAwIBAgICBA8wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAkZJ
-MQ8wDQYDVQQHDAZLdW9waW8xJjAkBgNVBAoMHVVuaXZlcnNpdHkgb2YgRWFzdGVy
-biBGaW5sYW5kMRAwDgYDVQQLDAdTaGliIENBMRQwEgYDVQQDDAtVRUYgU2hpYiBD
-QTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckB1ZWYuZmkwHhcNMTQwNDA5MTQx
-MTIzWhcNMjkwNDA1MTQxMTIzWjBZMQswCQYDVQQGEwJGSTEmMCQGA1UECgwdVW5p
-dmVyc2l0eSBvZiBFYXN0ZXJuIEZpbmxhbmQxDTALBgNVBAsMBFRpa2UxEzARBgNV
-BAMMCmlkcC51ZWYuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE
-JZ1AwVGJ2S7FOsjH/vsvo2SEsUwN9QFdz4Kf+QBR50NaOocbl6wV6spOt//d/Tbp
-M9qs4Z9EgfT8hvCjNLRhI4m8w6XhYlA/MmBcxgQBYn19xoUTJ3DcJJddLIQsMU2H
-qOKoiYWwLL1ZQgbFG5ilZ15ZWpUXRBdDt9Hn8eK2SF2dPNrUKuAOZyDkMSY9cfwR
-pWrSUwX7Mm9+8TceZHWHaoPR2nbBABqBNuhXvZl6yK+bGXFvbPNGbMJTwXY/LJvc
-4x+sSDuR7HM5tGFcwFjVfj2yEva9BwG8jXWB/RSj7eleHLLM7+PvvR5axVaPbQ/9
-CIJjgPh1r8P8arKs140LAgMBAAGjJjAkMCIGA1UdEQQbMBmCCmlkcC51ZWYuZmmC
-C2lkcDIudWVmLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQA9xGaMiAZM1Ivp3XcTeNn2
-2U/vcCD9fZ9FbrB9buJrECPFh31xJqCtY4gTqdJZl9Z9T3e3I8SqahRPdKX8QPed
-XpIjKfMDM9SBSzMFuSUWyVrbvNCrQScwX+qD5PlpsACQzAGC+Q2pF5lqVx9zERef
-fq7jOiSACuaC39ymek0Wok1k6Mes9krUmwJOdP4SjPmgzWCdeh9X/d3xHgUpg2x5
-Sami+WFaMgXxZxJhK+roCmH3hkSh3r8U7xlrnfckSfQ2es9PGYnFI6UlZJqqtrTc
-WGsRO8eC1kCnCdgVhnerPYdvl76LeqVtkqSwepNbrncvnyGIOh+jhD2yrwRV7oqQ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uef.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uef.fi:8443/idp/profile/SAML2/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="fi">Itä-Suomen yliopisto</md:OrganizationName>
     <md:OrganizationName xml:lang="en">University of Eastern Finland</md:OrganizationName>
diff --git a/swamid-interfederations-1.0/sso.utu.fi.xml b/swamid-interfederations-1.0/sso.utu.fi.xml
index 979f5b29..7b50bdbc 100644
--- a/swamid-interfederations-1.0/sso.utu.fi.xml
+++ b/swamid-interfederations-1.0/sso.utu.fi.xml
@@ -4,9 +4,9 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
       </mdui:UIInfo>
       <saml:Attribute Name="tags">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/tullbommen.arcada.fi.xml b/swamid-interfederations-1.0/tullbommen.arcada.fi.xml
index 3278feca..7e98ca78 100644
--- a/swamid-interfederations-1.0/tullbommen.arcada.fi.xml
+++ b/swamid-interfederations-1.0/tullbommen.arcada.fi.xml
@@ -11,39 +11,6 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE5jCCA86gAwIBAgIQa3vG7hzvE9YGrscDYuR+kDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMTExMTAwMDAwMFoXDTEzMTExMDIzNTk1OVowgbwxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMDU1MDEPMA0GA1UECBMGTnlsYW5kMRQwEgYDVQQH
-EwtIZWxzaW5nZm9yczEkMCIGA1UECRMbSmFuLU1hZ251cyBKYW5zc29ucyBQbGF0
-cyAxMRowGAYDVQQKExFTdGlmdGVsc2VuIEFyY2FkYTEVMBMGA1UECxMMSVQtY2Vu
-dHJhbGVuMR0wGwYDVQQDExR0dWxsYm9tbWVuLmFyY2FkYS5maTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANQH+aKmTtif/TJBr2ulDcAwaZHT3/jmQEnG
-izqdL10Js9n55/LR02e9wX+FcJu9udhceIBkmDVOMEU4k7qN482mXOzygNYiTkFX
-9hpaucrNme5rrqbh194UiotedOuWdHdsGs30Y51IMd0wS5Mie2b7Y5WeklSdUtMG
-wWOoZydYhKyTsPFJa8kkjlyKtrBD5ErfJ5dBKOD9VelZBhVNqEt73fxVpnstTZwt
-40nQ7aKm/ksRczmYtfspJsj79pI51eL7RZ0PtOFjOuMbVxbAhbxjBTUg0hm7XA6/
-Nz6vgvIiLHjAVooihE4eIav90xvGDP2g5oKRouXZl0rg4faHWf8CAwEAAaOCAWcw
-ggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRj
-DXjemf9WFryJPUYPpw1QPfpnFjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAW
-ghR0dWxsYm9tbWVuLmFyY2FkYS5maTANBgkqhkiG9w0BAQUFAAOCAQEAW0MOCRCS
-3BfMa0MKrfWtgWIbtQT9LxpIKEx9AE4C9cmBws8TLrwzXHVwnt7uTS5JMxSm2d35
-JSowjUXv+shLSw3d5DWxK/19Rl9mELZm5FyYOau0nGzMp53oA8n0snbgsnCAjYCI
-B394SK5MjW/MdE68L/5ZCm7ediMFdbEwabzTMCixHPaM9PYW6dGzujI4yQhAb+Eh
-vl55iqhWUxcWYGhm03x0VRPN6w7ICRoYCpM+SoemdR5EfXk0gB5tu2qLCKoH36+z
-+EC4Jn8FfKOqAY6L4xsGIJqlrQv8ObOz6q010EpbrXvBapKHiDVTcM9tc2Jg9MQ+
-zQgT271kaFblsw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIEdjCCA16gAwIBAgIRANjPKkKEQJwfMHea3kHeKBAwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMzEwMzAwMDAwMDBaFw0xNjExMDkyMzU5NTlaMEIxITAfBgNV
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index 896cc987..c4852dcb 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -81,8 +81,10 @@
       <shibmd:Scope regexp="false">dmi.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ism.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ens.minibib.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">fbo.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">fob.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">fsv.minibib.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">kuc.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kul.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ami.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sfi.minibib.dk</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/www.emeraldinsight.com.xml b/swamid-interfederations-1.0/www.emeraldinsight.com.xml
index ba3c1f16..07391e53 100644
--- a/swamid-interfederations-1.0/www.emeraldinsight.com.xml
+++ b/swamid-interfederations-1.0/www.emeraldinsight.com.xml
@@ -1,32 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/entity">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE8jCCA9qgAwIBAgISESHmB/1YUGeeJHspwyEmQou4MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMwMjE4MDkzMTM3WhcNMTUwMjI0MTYxMDEwWjBLMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAMTHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw5EIVTrlQBc3C7S1KuJ3pMncEEcnQg1Jn2RHGgUlmUgZVYGsbyID7f3z4fAv1QkVTfPk/FcwnAA0Z03KH9x0skkJ2jseMRCEkblUoJ4oOHABTq3zVwOvp5gKPbAT/yh1Oxm0Q4dxoHbO8CbnLLHG4Glk0Wehch7rpEOTg+5Z5uvnPXulTPHhHYomXZOdIt9loAoXsjG+4syQIOTsnzrMOznOTY1tCN4qYxDa+xsl1RhggKVGkggDhWq+plL9T91BEQSGXK+63RF6K7bCDnIU7+mBGeWU3hVL9zIaSvO++MKoQarWavLxfp+n8SYMvV5j1+K1fhO7MwSv71QJq+lhwwIDAQABo4IBwjCCAb4wDgYDVR0PAQH/BAQDAgWgMEwGA1UdIARFMEMwQQYJKwYBBAGgMgEKMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCgGA1UdEQQhMB+CHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBT60b17A1RwTyt94NQOm++yXTrfojAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAWOBI5SREMlWLRx5OONoICRxzjMQtF5lG94gTqlzD6DvU0svW1AAwDA3HUrgH9xagJDCNqHqrya1RS2LDtAwDenUir9/AE3RwrnsvNAucds/+htiHuUlYFNGlqOMr4WH6NxpZ1o3u4VIpELhOtrOPof0ba5PvA4dD2adyEJSKtESlgarUKulHAKeQeEFERxqrW9c6qP0lXc3SuukwHsmEiGniscQGQLj/bChTGzbCdYMPdS9ETF/uOqAocg+Hge8bBbUnZrm9tYidytJhpFaF+hEvfojlik6Z/LGVPykrJXBh7zMl4hWx1kJtNij0LE6dX9TFeYDjjUbD//0P7CmVsw==</ds:X509Certificate>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE8jCCA9qgAwIBAgISESHmB/1YUGeeJHspwyEmQou4MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMwMjE4MDkzMTM3WhcNMTUwMjI0MTYxMDEwWjBLMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAMTHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw5EIVTrlQBc3C7S1KuJ3pMncEEcnQg1Jn2RHGgUlmUgZVYGsbyID7f3z4fAv1QkVTfPk/FcwnAA0Z03KH9x0skkJ2jseMRCEkblUoJ4oOHABTq3zVwOvp5gKPbAT/yh1Oxm0Q4dxoHbO8CbnLLHG4Glk0Wehch7rpEOTg+5Z5uvnPXulTPHhHYomXZOdIt9loAoXsjG+4syQIOTsnzrMOznOTY1tCN4qYxDa+xsl1RhggKVGkggDhWq+plL9T91BEQSGXK+63RF6K7bCDnIU7+mBGeWU3hVL9zIaSvO++MKoQarWavLxfp+n8SYMvV5j1+K1fhO7MwSv71QJq+lhwwIDAQABo4IBwjCCAb4wDgYDVR0PAQH/BAQDAgWgMEwGA1UdIARFMEMwQQYJKwYBBAGgMgEKMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCgGA1UdEQQhMB+CHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBT60b17A1RwTyt94NQOm++yXTrfojAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAWOBI5SREMlWLRx5OONoICRxzjMQtF5lG94gTqlzD6DvU0svW1AAwDA3HUrgH9xagJDCNqHqrya1RS2LDtAwDenUir9/AE3RwrnsvNAucds/+htiHuUlYFNGlqOMr4WH6NxpZ1o3u4VIpELhOtrOPof0ba5PvA4dD2adyEJSKtESlgarUKulHAKeQeEFERxqrW9c6qP0lXc3SuukwHsmEiGniscQGQLj/bChTGzbCdYMPdS9ETF/uOqAocg+Hge8bBbUnZrm9tYidytJhpFaF+hEvfojlik6Z/LGVPykrJXBh7zMl4hWx1kJtNij0LE6dX9TFeYDjjUbD//0P7CmVsw==</ds:X509Certificate>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
     <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">EmeraldInsight</md:ServiceName>
-      <md:ServiceName xml:lang="da">EmeraldInsight</md:ServiceName>
+      <md:ServiceName xml:lang="en">Emerald Insight</md:ServiceName>
+      <md:ServiceName xml:lang="da">Emerald Insight</md:ServiceName>
       <md:ServiceDescription xml:lang="en">to provide personalized access to journals and papers on social sciences</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at give adgang til EmeraldInsights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at give adgang til Emerald Insights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Emerald Group Publishing</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Emerald Group Publishing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Atypon Systems Inc.</md:Company>
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:SurName>SSO-Support</md:SurName>
+    <md:EmailAddress>SSO-Support@atypon.com</md:EmailAddress>
+    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Atypon Systems Inc.</md:Company>
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:SurName>SSO-Tech</md:SurName>
+    <md:EmailAddress>SSO-Tech@atypon.com</md:EmailAddress>
+    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>