summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--swamid-interfederations-1.0.mxml1
-rw-r--r--swamid-interfederations-1.0/.xml2
-rw-r--r--swamid-interfederations-1.0/agw-sparknet.utu.fi.xml33
-rw-r--r--swamid-interfederations-1.0/idp.csc.fi.xml2
-rw-r--r--swamid-interfederations-1.0/idp.feide.no.xml22
-rw-r--r--swamid-interfederations-1.0/idp.lapinamk.fi.xml2
-rw-r--r--swamid-interfederations-1.0/idp.metropolia.fi.xml50
-rw-r--r--swamid-interfederations-1.0/idp.oamk.fi.xml60
-rw-r--r--swamid-interfederations-1.0/logout.uwasa.fi.xml62
-rw-r--r--swamid-interfederations-1.0/sp.catalog.clarin.eu.xml18
-rw-r--r--swamid-interfederations-1.0/sp.lux17.mpi.nl.xml110
-rw-r--r--swamid-interfederations-1.0/wayf.wayf.dk.xml2
12 files changed, 193 insertions, 171 deletions
diff --git a/swamid-interfederations-1.0.mxml b/swamid-interfederations-1.0.mxml
index f1714091..a73aaa24 100644
--- a/swamid-interfederations-1.0.mxml
+++ b/swamid-interfederations-1.0.mxml
@@ -17,6 +17,7 @@
<xi:include href="swamid-interfederations-1.0/idp.ids-mannheim.de.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.lapinamk.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.metropolia.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.oamk.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.shh.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.tut.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.uef.fi.xml"/>
diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index 0d2bbd12..5848e6ac 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-09-07T09: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-11-02T18: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 7df78638..796e6c69 100644
--- a/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
+++ b/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
@@ -4,39 +4,6 @@
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIQbnMIzP8TsRk95w/HSxaw8TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMTEyMzAwMDAwMFoXDTEzMTEyMjIzNTk1OVowgboxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUyMDUwMDEYMBYGA1UECBMPV2VzdGVybiBGaW5sYW5k
-MQ4wDAYDVQQHEwVUdXJrdTEaMBgGA1UECRMRQXNzaXN0ZW50aW5rYXR1IDUxHDAa
-BgNVBAoTE1VuaXZlcnNpdHkgb2YgVHVya3UxGTAXBgNVBAsTEENvbXB1dGluZyBD
-ZW50cmUxHDAaBgNVBAMTE2Fndy1zcGFya25ldC51dHUuZmkwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC/DfwsS+l2OcvB8YLJqMKLUrUc9KmEgLuCIBNh
-sy5hZDOnV7vieUzsxibSsz8LO/sqNXZu+oAJvQEbKVzglohKVpvZkXDWB4fJ7/Hk
-AXSSnKFUvA6D7NyITFHus2OuPVtWg7rOH53Hcsj7zDey1tLpt75+r9VYz+rfj7dY
-ZhBjQxjnVboDdD0KCw5SuPTYo2L+ZQit7Ede4g9KY970iSjXsPA5pFrjN1pezrse
-7MLBeqfiISwvEsmFvnRImzhnGlc1jkgK1mAxpGGFUOB3wRvlR9uQ1KjlSaFhPfUj
-V09/dG5tdEvc3bUV+3FEM+5Wv/9JMFXmfW/twfGE1cFVL5mRAgMBAAGjggFmMIIB
-YjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUpAIR
-/AL9x2BJgB91p7Z1RDOOGjowDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYB
-BAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
-hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
-BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYIT
-YWd3LXNwYXJrbmV0LnV0dS5maTANBgkqhkiG9w0BAQUFAAOCAQEAQ09BWmqzKH3P
-ywMfrWMAShhiowX3us9JTTJ8HLlApPWjW0feHpzvPCv86J2Ryeg+tRqtsYGAenvL
-FLqYnD65FaKos7/RrwQuxrwsDDbCk0LLVyDhlms7aOSvKRCmK1oyK9MABnraFh8e
-m3ueojjatPYaUG+ivTalv5oWuYi/Ye6GRGBlhyx2u972UqngRYnHAHCYrRzRA/l8
-VRtAw/rJTS3Yj5kDUG3LYeBH5A4myDeIHghg7n0s7A9qDtepxZFYgDzrwUusEo/a
-NbLlYF90/H/wrBP9SogebSqmAAEd7V+vMe2+W7N03f80xajbIli0+P0sEolPPgrW
-DSWPf8vQpQ==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
<ds:X509Certificate>MIIEczCCA1ugAwIBAgIQOWGPWke4DcPypq61jxi5UzANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTE0MDcxMDAwMDAwMFoXDTE3MDcwOTIzNTk1OVowQTEhMB8GA1UE
diff --git a/swamid-interfederations-1.0/idp.csc.fi.xml b/swamid-interfederations-1.0/idp.csc.fi.xml
index b2285811..d75aeb63 100644
--- a/swamid-interfederations-1.0/idp.csc.fi.xml
+++ b/swamid-interfederations-1.0/idp.csc.fi.xml
@@ -8,9 +8,9 @@
<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 f18288de..5cce1aef 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -29,6 +29,7 @@
<shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
<shibmd:Scope regexp="false">bi.no</shibmd:Scope>
<shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">bo.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">boe.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
@@ -37,6 +38,7 @@
<shibmd:Scope regexp="false">diakonova.no</shibmd:Scope>
<shibmd:Scope regexp="false">dmmh.no</shibmd:Scope>
<shibmd:Scope regexp="false">donna.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">dovreskulane.no</shibmd:Scope>
<shibmd:Scope regexp="false">drammen.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">dvm.iktsenteret.no</shibmd:Scope>
<shibmd:Scope regexp="false">eid.kommune.no</shibmd:Scope>
@@ -136,7 +138,7 @@
<shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">hbv.no</shibmd:Scope>
<shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
- <shibmd:Scope regexp="false">hemnegs.fronter.com</shibmd:Scope>
+ <shibmd:Scope regexp="false">hemne.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
@@ -145,7 +147,6 @@
<shibmd:Scope regexp="false">hials.no</shibmd:Scope>
<shibmd:Scope regexp="false">hib.no</shibmd:Scope>
<shibmd:Scope regexp="false">hibu.no</shibmd:Scope>
- <shibmd:Scope regexp="false">hifm.no</shibmd:Scope>
<shibmd:Scope regexp="false">hig.no</shibmd:Scope>
<shibmd:Scope regexp="false">hih.no</shibmd:Scope>
<shibmd:Scope regexp="false">hihm.no</shibmd:Scope>
@@ -173,10 +174,12 @@
<shibmd:Scope regexp="false">hoylandet.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">hsh.no</shibmd:Scope>
<shibmd:Scope regexp="false">hurdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">hurum.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">hyllestad.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
<shibmd:Scope regexp="false">jolster.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">kafjord.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
<shibmd:Scope regexp="false">khib.no</shibmd:Scope>
<shibmd:Scope regexp="false">khio.no</shibmd:Scope>
@@ -192,14 +195,18 @@
<shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
<shibmd:Scope regexp="false">lardal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">larvik.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">lavangen.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">ldh.no</shibmd:Scope>
<shibmd:Scope regexp="false">leikanger.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">leirfjord.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">lenvik.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">lesjaskulane.no</shibmd:Scope>
<shibmd:Scope regexp="false">lier.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">lierne.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">lomskulane.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">loten.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">lunner.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">lybskole.no</shibmd:Scope>
@@ -210,11 +217,11 @@
<shibmd:Scope regexp="false">marker.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">masfjorden.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">meland.kommune.no</shibmd:Scope>
- <shibmd:Scope regexp="false">meldal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">melhus.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">meraker.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">met.no</shibmd:Scope>
<shibmd:Scope regexp="false">mf.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">mhs.no</shibmd:Scope>
<shibmd:Scope regexp="false">midsund.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
@@ -223,6 +230,7 @@
<shibmd:Scope regexp="false">namsos.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">nannestad.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">narvik.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>
@@ -236,8 +244,10 @@
<shibmd:Scope regexp="false">nla.no</shibmd:Scope>
<shibmd:Scope regexp="false">nmbu.no</shibmd:Scope>
<shibmd:Scope regexp="false">nmh.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nome.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">nordkapp.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nordreisa.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">notodden.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">notteroy.kommune.no</shibmd:Scope>
@@ -270,21 +280,26 @@
<shibmd:Scope regexp="false">romskog.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">royken.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">royrvik.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">salangen.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">saltdal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">samfunnsforskning.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sami.vgs.no</shibmd:Scope>
<shibmd:Scope regexp="false">samiskhs.no</shibmd:Scope>
<shibmd:Scope regexp="false">samnanger.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">sande.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">sandefjord.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">sandnes.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">sauda.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sauherad.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">selbu.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">selje.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">seljord.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">selskolene.no</shibmd:Scope>
<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">skjaakskulane.no</shibmd:Scope>
<shibmd:Scope regexp="false">skjervoy.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
<shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
@@ -321,6 +336,7 @@
<shibmd:Scope regexp="false">tinn.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">tjome.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">tokke.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">tonsberg.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>
diff --git a/swamid-interfederations-1.0/idp.lapinamk.fi.xml b/swamid-interfederations-1.0/idp.lapinamk.fi.xml
index 818d2020..e1e1e9e7 100644
--- a/swamid-interfederations-1.0/idp.lapinamk.fi.xml
+++ b/swamid-interfederations-1.0/idp.lapinamk.fi.xml
@@ -7,9 +7,9 @@
<shibmd:Scope regexp="false">ramk.fi</shibmd:Scope>
<shibmd:Scope regexp="false">tokem.fi</shibmd:Scope>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">Lapland UAS</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">Lapin ammattikorkeakoulu</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Lapplands YH</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Lapland UAS</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/idp.metropolia.fi.xml b/swamid-interfederations-1.0/idp.metropolia.fi.xml
index 0bd93690..840bd980 100644
--- a/swamid-interfederations-1.0/idp.metropolia.fi.xml
+++ b/swamid-interfederations-1.0/idp.metropolia.fi.xml
@@ -11,31 +11,6 @@
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIIECzCCAvOgAwIBAgIRAL+szgnI0qWlv5j0dv0UYtswDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
-BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMTEx
-MjQwNjQwMThaFw0xNDExMjMwNjQwMThaMFExCzAJBgNVBAYTAkZJMSYwJAYDVQQKDB1NZXRyb3Bv
-bGlhIEFtbWF0dGlrb3JrZWFrb3VsdTEaMBgGA1UEAwwRaWRwLm1ldHJvcG9saWEuZmkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS9Nz6Ju8uVYvBqzZq/HSzPL8yZzRRIexBXG7rsZEE
-ti0U+ERX/QJ7nDoQCCn4P8PQoGgZvl6A69F4TBxw27KcLEutuZfFAKhvd8P/X3+vbwDMIlJfMi2o
-oVWGxcIRfvuLoP5gsTJpmuDQE1xB6ZToA0xs5aIQOJFKzAznWOf8PPrUF7V2SE90xt4gE9OmpnOF
-w1gfp243SRnvxNJwai2+3L+FFAyygiCk4ao9IcdguXxpW42bLghb8GZAsla8ULvrNB+PaAMjYYkd
-EbvcoxbxynSE2LBrRlQ7cn769INlQkv7yVgo12zJ1GHBn2JgSdjiK/mPg68M24S5fAZXZVdBAgMB
-AAGjgfUwgfIwEwYDVR0jBAwwCoAISqCqWITTXjwwGQYDVR0gBBIwEDAOBgwrBgEEAYIPAgMBAQIw
-cgYDVR0fBGswaTBnoGWgY4ZhbGRhcDovLzE5NC4yNTIuMTI0LjI0MTozODkvY249U29uZXJhJTIw
-Q2xhc3MyJTIwQ0Esbz1Tb25lcmEsYz1GST9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0O2JpbmFy
-eTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgSwMB0GA1UdDgQW
-BBSetcs1P8mXrxv31HIiIZRlQ5pMizANBgkqhkiG9w0BAQUFAAOCAQEAJXlZQSERzZyIyD5t6zfC
-velNXend4z9jhUb3ZqFd86xAYNPRj+wNJBCSUJ3+mn1MWW5kV8D28jixtVvtqKZUgSCBBrxRJ5D9
-Hl7CRqNPubvcrxkXETZv0uEfnJaEK7wEWR0LP3r5RUjBc9AbSbsHOIX/sBxS/IMjTrb3PAwbAypT
-417lCgBzdpTIiDq+QF4bb4Tt/kjTRqPT21lporYTW+/NWFK02X+rgsABklvOQKSTEGvyDr6dLbSD
-tto9jTy1FzEicXFLvj36B+MB87UChYNTW7IJMJvJZgbuod76mjg9LkY+PHaxcn2kNmUYQKuuio0g
-LQc3QWj/dW5XWHUtjA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
<ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
@@ -76,31 +51,6 @@ G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</ds:X509Certificate>
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIIECzCCAvOgAwIBAgIRAL+szgnI0qWlv5j0dv0UYtswDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
-BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMTEx
-MjQwNjQwMThaFw0xNDExMjMwNjQwMThaMFExCzAJBgNVBAYTAkZJMSYwJAYDVQQKDB1NZXRyb3Bv
-bGlhIEFtbWF0dGlrb3JrZWFrb3VsdTEaMBgGA1UEAwwRaWRwLm1ldHJvcG9saWEuZmkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS9Nz6Ju8uVYvBqzZq/HSzPL8yZzRRIexBXG7rsZEE
-ti0U+ERX/QJ7nDoQCCn4P8PQoGgZvl6A69F4TBxw27KcLEutuZfFAKhvd8P/X3+vbwDMIlJfMi2o
-oVWGxcIRfvuLoP5gsTJpmuDQE1xB6ZToA0xs5aIQOJFKzAznWOf8PPrUF7V2SE90xt4gE9OmpnOF
-w1gfp243SRnvxNJwai2+3L+FFAyygiCk4ao9IcdguXxpW42bLghb8GZAsla8ULvrNB+PaAMjYYkd
-EbvcoxbxynSE2LBrRlQ7cn769INlQkv7yVgo12zJ1GHBn2JgSdjiK/mPg68M24S5fAZXZVdBAgMB
-AAGjgfUwgfIwEwYDVR0jBAwwCoAISqCqWITTXjwwGQYDVR0gBBIwEDAOBgwrBgEEAYIPAgMBAQIw
-cgYDVR0fBGswaTBnoGWgY4ZhbGRhcDovLzE5NC4yNTIuMTI0LjI0MTozODkvY249U29uZXJhJTIw
-Q2xhc3MyJTIwQ0Esbz1Tb25lcmEsYz1GST9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0O2JpbmFy
-eTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgSwMB0GA1UdDgQW
-BBSetcs1P8mXrxv31HIiIZRlQ5pMizANBgkqhkiG9w0BAQUFAAOCAQEAJXlZQSERzZyIyD5t6zfC
-velNXend4z9jhUb3ZqFd86xAYNPRj+wNJBCSUJ3+mn1MWW5kV8D28jixtVvtqKZUgSCBBrxRJ5D9
-Hl7CRqNPubvcrxkXETZv0uEfnJaEK7wEWR0LP3r5RUjBc9AbSbsHOIX/sBxS/IMjTrb3PAwbAypT
-417lCgBzdpTIiDq+QF4bb4Tt/kjTRqPT21lporYTW+/NWFK02X+rgsABklvOQKSTEGvyDr6dLbSD
-tto9jTy1FzEicXFLvj36B+MB87UChYNTW7IJMJvJZgbuod76mjg9LkY+PHaxcn2kNmUYQKuuio0g
-LQc3QWj/dW5XWHUtjA==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
<ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
diff --git a/swamid-interfederations-1.0/idp.oamk.fi.xml b/swamid-interfederations-1.0/idp.oamk.fi.xml
new file mode 100644
index 00000000..c2536800
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.oamk.fi.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.oamk.fi/idp/shibboleth">
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">oamk.fi</shibmd:Scope>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEJDCCAwygAwIBAgIRAJDZbv9JChO1v4c2PegLC3gwDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
+BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMjAx
+MjQwOTA0MjNaFw0xNTAxMjMwOTA0MjNaMGoxCzAJBgNVBAYTAmZpMSkwJwYDVQQKDCBPdWx1biBz
+ZXVkdW4ga291bHV0dXNrdW50YXlodHltYTEUMBIGA1UEAwwLaWRwLm9hbWsuZmkxGjAYBgkqhkiG
+9w0BCQEWC25vY0BvYW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz1pmmgwq
+ddeiMWmthZP0W34WIKx4g5csiP/9p6DigzhNGn5+sZgsh7gb6FS1VtXWhwCFnCZCb/f0vm0AEqc2
+H9IQHTKPWWeM33S3uCOUBh1Jf7B9/3ysa70gZIdPFMkt+tX0Fd8hByeybu8FDyRwq95la1L3kPuQ
+qX6do0Ks2kEmALSHwPP9aMfCB8Mr4hZx0YpECVheIS2NgISbCtvx5F9IvfUds7FNr5eVHbz5j1dm
+gSalDjSGZN2HAwMw8EW91d314SYDtwdEC2PdvUCdbjdOnTXoHsftcDtS9PoWGzqZjLoptDjalc1z
+j8Q3UUVyqXDX9HGwDq9p+ZdEaYokPwIDAQABo4H1MIHyMBMGA1UdIwQMMAqACEqgqliE0148MBkG
+A1UdIAQSMBAwDgYMKwYBBAGCDwIDAQECMHIGA1UdHwRrMGkwZ6BloGOGYWxkYXA6Ly8xOTQuMjUy
+LjEyNC4yNDE6Mzg5L2NuPVNvbmVyYSUyMENsYXNzMiUyMENBLG89U29uZXJhLGM9Rkk/Y2VydGlm
+aWNhdGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQUAuG1dJ173cm7/fePBi906Va3TdUwDQYJKoZIhvcN
+AQEFBQADggEBAHSh0AVK4D+979981GuW1T+gEsp7vGBH1x9TiFPc8WI25UJ46eSf14wSzB+f3irK
+T4s6CyvMJr2lZylvZF61orVJ/p2Ii21z8l/SEbk3ZbAT/vawdKU0dffypy4FhwWfTXADHAc9Li7z
+K3YfRLJLUxYw8nt/3XjqiZ0q6CkEu7ZOZ163ew27oGv8TpNTjQAFh1ZX5xkKrwMhrhaykpO2Ww3E
+Df2IYPvrPLtJYSHAn0aZ1UIn5dl8+/tFu9dpYn7p12/c9IBiBzyOUEn6uczxGlyf7NG35lscHuwR
+Ry8FNbWVwbylLohU2Ms9XOSxHmexafsdLuZYGASMnCUQQgdzX/E=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <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.oamk.fi/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.oamk.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.oamk.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.oamk.fi</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Panu</md:GivenName>
+ <md:SurName>Jylha</md:SurName>
+ <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Panu</md:GivenName>
+ <md:SurName>Jylha</md:SurName>
+ <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/logout.uwasa.fi.xml b/swamid-interfederations-1.0/logout.uwasa.fi.xml
index 5c2b029d..a5ba47cc 100644
--- a/swamid-interfederations-1.0/logout.uwasa.fi.xml
+++ b/swamid-interfederations-1.0/logout.uwasa.fi.xml
@@ -40,6 +40,37 @@ OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
+bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
+pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
+jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
+V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
+8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
+4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
+tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
+BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
+LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
+c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
+9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
+StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
++4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
+6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
+ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
+yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</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:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://logout.uwasa.fi/idp/profile/Shibboleth/SSO"/>
@@ -82,6 +113,37 @@ OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
+bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
+pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
+jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
+V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
+8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
+4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
+tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
+BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
+LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
+c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
+9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
+StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
++4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
+6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
+ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
+yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logout.uwasa.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
<md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logout.uwasa.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
<md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
diff --git a/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml
index eb77557b..071fb97a 100644
--- a/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml
@@ -3,13 +3,9 @@
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Catalog Clarin</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Catalog Clarin</mdui:DisplayName>
- <mdui:Description xml:lang="fi">Catalog Clarin</mdui:Description>
+ <mdui:DisplayName xml:lang="en">Clarin Catalog Service Provider</mdui:DisplayName>
<mdui:Description xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
- <mdui:Keywords xml:lang="en">Clarin Data Category Registry ISOcat Component Registry Virtual Language Observatory VLO</mdui:Keywords>
- <mdui:Keywords xml:lang="fi">Clarin Data Category Registry ISOcat Component Registry Virtual Language Observatory VLO</mdui:Keywords>
- <mdui:PrivacyStatementURL xml:lang="fi">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
+ <mdui:Keywords xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Keywords>
<mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
</mdui:UIInfo>
<saml:Attribute Name="tags">
@@ -45,14 +41,14 @@ gDLbA/e0dbDclBvxUIm9cemA</ds:X509Certificate>
</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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
<md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">Catalog Clarin</md:ServiceName>
- <md:ServiceName xml:lang="en">Catalog Clarin</md:ServiceName>
- <md:ServiceName xml:lang="sv">Catalog Clarin</md:ServiceName>
- <md:ServiceDescription xml:lang="fi">Catalog Clarin</md:ServiceDescription>
- <md:ServiceDescription xml:lang="en">CMDI Component Registry - web application for managing, creating and editing metadata components.</md:ServiceDescription>
+ <md:ServiceName xml:lang="fi">Clarin Catalog Service Provider</md:ServiceName>
+ <md:ServiceName xml:lang="en">Clarin Catalog Service Provider</md:ServiceName>
+ <md:ServiceName xml:lang="sv">Clarin Catalog Service Provider</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</md:ServiceDescription>
<md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
diff --git a/swamid-interfederations-1.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-1.0/sp.lux17.mpi.nl.xml
index 4f14f4fd..52390543 100644
--- a/swamid-interfederations-1.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-1.0/sp.lux17.mpi.nl.xml
@@ -1,83 +1,54 @@
<?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://sp.lux17.mpi.nl">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.lux17.mpi.nl">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics lux17 SP</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Max Planck Institute for Psycholinguistics lux17 SP</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics lux17 Service Provider for Linguistic Services aimed at researchers</mdui:Description>
+ <mdui:Logo height="90" width="90">https://lux17.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
+ <mdui:Keywords xml:lang="en">Max Planck Institute for Psycholinguistics Lux17 Service Provider Linguistic Services</mdui:Keywords>
+ <mdui:PrivacyStatementURL xml:lang="fi">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
+ </mdui:UIInfo>
+ <saml:Attribute Name="tags">
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+ <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxMzQ4
-MTBaFw0xNDAzMTcxMzQ4MTBaMHoxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
-dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0wTdnMTgPC8/x6+0reirYB
-bifyQwbOLHE0bOtHD6et5oT9WPRosJFpFxnxs2aF/SqR7Kar4Z/7lMBFbL3vdgrJ
-h6fCNVofBI/Zs7d8aCwfcc6aMJORJPlTtFElmNvZD8TE035qzRNfkwqPOYkmwqlC
-CP9pJwebt3kEJSHHOVngydBJaVzSDayJLp1WzQ2FyEVfbPyUaQ2z2RyPGG0C1yX4
-Thin64YaRlBH78INIlCf8NpQwc+CCG7SgVSuDq1DEZXbm7z789kUJtqnlNe2Nahj
-inYfMr4Jtc27TwD+We9cs14LjSst4L3gd0kT511Wycs53+BpMWRWVKD4tFMva+EC
-AwEAAaOCAX8wggF7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBRY3hAzheVZXJug0vL3ndQWl8CAjTAfBgNVHSME
-GDAWgBQC1h5uCau/WGWnCjxIM2HRzn3DWzB3BgNVHR8EcDBuMDWgM6Axhi9odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOg
-MYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NybC9jYWNybC5j
-cmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPwYIKwYBBQUH
-MAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbTiXJjoL5ulDq6yP3g2cBE4tpXN/
-LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
-3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
-A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
-7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
-0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>MIIFszCCBJugAwIBAgIHFy/fQCmDdDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
-MDE1MTNaFw0xOTAyMjcxMDE1MTNaMIGiMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
-R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
-Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
-ZXIgUHN5Y2hvbGluZ3Vpc3RpazEVMBMGA1UEAxMMbHV4MTcubXBpLm5sMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsJhlBpssTOOtNvBbnzE7VWsQfaOA
-LrwBcSNZbH928rPC75slLQpYTFeiHFhZ0ua3P7HzrHG/L4xxIYbmxBik2wI10xDQ
-sa+6lfOIOhttOTBoeciMni6eesRtPL1sVoBit6IHpthmL9+o0/t/erB+JOwAKnY7
-6eqCEO1Vx7gepyYAJEvXsIStPVQDhOGilTNlaRMykx89op97oQEwD1k/9sm9aGoU
-vVOiEuMVVfvRteboaJcC/MRNWQtRrN3lw9u3J77We5HTNcMESTLe7cTA7zY10pV1
-L4SwpraLaWtntQ7jtvgnmrCQF4UEjNuoyGdFqK1Cp0OU93oVsLCRJfNe/wIDAQAB
-o4ICLzCCAiswOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGB
-rSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFDo9I15dgi4VQw2g
-GDI0mzvjmtVrMB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMDQGA1Ud
-EQQtMCuCDGx1eDE3Lm1waS5ubIEbdG9iaWFzLnZhbnZhbGtlbmhvZWZAbXBpLm5s
-MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUHAQEEgbowgbcwMwYI
-KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NT
-UDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9tcGctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAMkKEc7OA0faJhU0gBJPc6BOb069aYUKYRWY0wfaLdGh/thMzdJQRC8Z
-YMN3BmqHUJukCcSPgxNKpd3KsiqxWODNpv3w7cOEDfJkOpWijbw+qRMvF83Tg9Bm
-9TuH80hWEn0AI+ECaWw7Lz8sSaPdEb+Qe4532JcLfDLiFo44RdFA8dFZepvwoKIg
-scv6u9W6FYUcQPEo9x0SmXMbC1Z8TEwXbICB/jp6w163B9zZ62o75gr0SJdlQvp6
-2tUUynz9p6HP8Qss2Ic1hyVjgSqzS3mcbbQvYOKWoQnWDKoZ0I5VTsP3pbrL4QIt
-IYFUWnGAtIjYcIIj3qFP/fJDyuZx9sA=</ds:X509Certificate>
+ <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
+bWluQG1waS5ubDAeFw0xNDA1MDIxMTI2MDZaFw0xOTA1MDExMTI2MDZaMHYxCzAJ
+BgNVBAYTAk5MMQwwCgYDVQQIEwNHTEQxETAPBgNVBAcTCE5pam1lZ2VuMQ8wDQYD
+VQQKEwZNUEktUEwxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDEeMBwGCSqGSIb3DQEJ
+ARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA3QaSP0LJ0mVZZIdEh7zFJW8lnkVGQFuueAiDfVVvGtGvJ5iz7CRoyrdTQDco
+oJjQDFub/uU6v0i+saVgI+LuzUlq28hrKF5hIjhWCLMRgYZzsnArcGK3etcChsNE
+OPfWNCOCGi90sIqNmJcVRoDw36tLiHXmIkhcy4ZE06SYXvT+qAwo4h30Z/IH2de/
+QlYEpkqF131p2lJGWx1Bi5l7IMeZtlwIzbJn08htAT/T8h6g9XvDfmQxS4xuiXGr
+uRwVhTTkTP9OsdrXkktJEkSE2p+qP0tYekb+ZPd4LzlSjnDWf3V1T/DrbL071eiC
+rx2iDW3n5Wy7so0iwmU5nr9QhwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAFSrqi
+HOMohDd4JXB3rjX8npCSTTeam84LTI1Twd8GXOmDQ8izcwsfUIILusEqd+66V/kh
+iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
+DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
+GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
+MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
+HFhkY9jzkGrcHMME</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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
<md:AttributeConsumingService index="1" isDefault="true">
- <md:ServiceName xml:lang="fi">IMDI Browsable Corpus</md:ServiceName>
- <md:ServiceName xml:lang="en">IMDI Browsable Corpus</md:ServiceName>
- <md:ServiceDescription xml:lang="en">Repository of Linguistic Resources. For Humanities and Social Sciences researchers.</md:ServiceDescription>
+ <md:ServiceName xml:lang="fi">Max Planck Institute for Psycholinguistics second Service Provider</md:ServiceName>
+ <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</md:ServiceName>
+ <md:ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</md:ServiceDescription>
<md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
<md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
<md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
@@ -95,8 +66,7 @@ IYFUWnGAtIjYcIIj3qFP/fJDyuZx9sA=</ds:X509Certificate>
<md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:GivenName>Tobias</md:GivenName>
- <md:SurName>van Valkenhoef</md:SurName>
- <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
+ <md:SurName>Technical support</md:SurName>
+ <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index c4852dcb..b4cacf95 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -105,7 +105,6 @@
<shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
<shibmd:Scope regexp="false">cbs.dk</shibmd:Scope>
<shibmd:Scope regexp="false">sosuesbjerg.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">deff.dk</shibmd:Scope>
<shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
<shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ku.dk</shibmd:Scope>
@@ -170,6 +169,7 @@
<shibmd:Scope regexp="false">campusvejle.dk</shibmd:Scope>
<shibmd:Scope regexp="false">rosborg-gym.dk</shibmd:Scope>
<shibmd:Scope regexp="false">fhavnhs.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">ah.dk</shibmd:Scope>
<shibmd:Scope regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
<shibmd:Scope regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 19:10:37 +0000