summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--swamid-interfederations-1.0.mxml3
-rw-r--r--swamid-interfederations-1.0/.xml4
-rw-r--r--swamid-interfederations-1.0/haka.saimia.fi.xml104
-rw-r--r--swamid-interfederations-1.0/idp.aalto.fi.xml70
-rw-r--r--swamid-interfederations-1.0/idp.csc.fi.xml8
-rw-r--r--swamid-interfederations-1.0/idp.feide.no.xml8
-rw-r--r--swamid-interfederations-1.0/moodle.utu.fi.xml32
-rw-r--r--swamid-interfederations-1.0/rr.funet.fi.xml8
-rw-r--r--swamid-interfederations-1.0/sp.korp.csc.fi.xml87
-rw-r--r--swamid-interfederations-1.0/sp.lat.csc.fi.xml10
-rw-r--r--swamid-interfederations-1.0/sso.utu.fi.xml4
-rw-r--r--swamid-interfederations-1.0/wayf.wayf.dk.xml7
12 files changed, 293 insertions, 52 deletions
diff --git a/swamid-interfederations-1.0.mxml b/swamid-interfederations-1.0.mxml
index 984e5c61..515f61b9 100644
--- a/swamid-interfederations-1.0.mxml
+++ b/swamid-interfederations-1.0.mxml
@@ -12,6 +12,8 @@
<xi:include href="swamid-interfederations-1.0/filesender.funet.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/foodl.org.xml"/>
<xi:include href="swamid-interfederations-1.0/fse.eduuni.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/haka.saimia.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.aalto.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.abo.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idp.csc.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/idpext.test.ek.sll.se.xml"/>
@@ -36,6 +38,7 @@
<xi:include href="swamid-interfederations-1.0/software.msdnaa.dk.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.catalog.clarin.eu.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.dev.clarin.inl.nl.xml"/>
+<xi:include href="swamid-interfederations-1.0/sp.korp.csc.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.lat.csc.fi.xml"/>
<xi:include href="swamid-interfederations-1.0/sp.lux17.mpi.nl.xml"/>
<xi:include href="swamid-interfederations-1.0/sso.utu.fi.xml"/>
diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index 9a416a86..f9baa997 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="2013-12-20T10:17:02Z" 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-02-22T14:17:01Z" cacheDuration="PT345600S">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:KeyDescriptor use="signing">
<ds:KeyInfo>
@@ -16,7 +16,7 @@
</ds:KeyInfo>
</md:KeyDescriptor>
<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://services.ibistic.net/redirector/saml/post/ac" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="0"/>
<md:AttributeConsumingService index="0">
<md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
<md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
diff --git a/swamid-interfederations-1.0/haka.saimia.fi.xml b/swamid-interfederations-1.0/haka.saimia.fi.xml
new file mode 100644
index 00000000..dadb29ea
--- /dev/null
+++ b/swamid-interfederations-1.0/haka.saimia.fi.xml
@@ -0,0 +1,104 @@
+<?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://haka.saimia.fi/idp/shibboleth">
+ <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 regexp="false">saimia.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>MIIEOzCCAyOgAwIBAgIQG5tFJqoAOg0tfJqHF23wQDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQG
+EwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTExMDUz
+MTEyNDYwNloXDTE0MDUzMDEyNDYwNlowgZsxCzAJBgNVBAYTAkZJMRUwEwYDVQQHDAxMYXBwZWVu
+cmFudGExKzApBgNVBAoMIkV0ZWxhLUthcmphbGFuIGtvdWx1dHVza3VudGF5aHR5bWExLzAtBgNV
+BAsMJlNhaW1hYW4gYW1tYXR0aWtvcmtlYWtvdWx1IElULXBhbHZlbHV0MRcwFQYDVQQDDA5oYWth
+LnNhaW1pYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANwog+tZrZLi7m6W7JZq
+ZiLb34PPi3zU76SRx24WWra9Ox8g6CTpdpaHoYC/vZ/XDQMbm2LD56Bey/8+krwx0o/exlPrqCTZ
+2M1A0WegCsqd16oc9+6/XjhWtAgXwLD6sqc0xhy+CCwRhyr9cWBVvvIaBoSkZ93Mjv7POmPruLwN
+fvnpa2gHIWjcSBuvWJmDWsUEtN0HcbfJiiEU1rpGFohkBOES0/bIcEfBNQqA60pdaZVZoWeALE1Y
+bGXc/M8cTXvTYeam24lB7rbso77VthVIocRjwVWU1n70Nw7+byD6lbDq7uFHQLe0q+quKgZiJzUE
+0+sl4YrIsv/NKC3oFr8CAwEAAaOB2zCB2DATBgNVHSMEDDAKgAhKoKpYhNNePDAZBgNVHSAEEjAQ
+MA4GDCsGAQQBgg8CAwEBAjByBgNVHR8EazBpMGegZaBjhmFsZGFwOi8vMTk0LjI1Mi4xMjQuMjQx
+OjM4OS9jbj1Tb25lcmElMjBDbGFzczIlMjBDQSxvPVNvbmVyYSxjPUZJP2NlcnRpZmljYXRlcmV2
+b2NhdGlvbmxpc3Q7YmluYXJ5MBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBTAKn7790r6
+rue5HERaCD9UIhaneDANBgkqhkiG9w0BAQUFAAOCAQEAQRcZw/94TbMLV12F00oMZy1dy9A6ds2v
+6Gc7DalfI4d2+0r4D9LTIG9Z4BHXYBiutnBgFPlN9dzzlEmaagARD/zFNgS9ytk9O/CJezSTXdhh
+iznhaKCwr2hx8u6vDCil6WZyIWDSg5kruK2T7e/1QaQOxEsTT5+hgUSIr9aZEa3iSVh+QxfWFlm6
+rxtt3+x31+aDvBWHF2OLR0EkuLYSsVZpB3+vZ26bGQQ1Xkz4zApdNrUgBuPtODNR/gc6mg2qvPxv
+r0N2fY6OHHOJvApQ3LnUu0FGgxC50zQ623Vcyxz8Y5sVbMQVkoSoOW2Yds0hVBXLPZyLrHEuarDE
+urebDA==</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://haka.saimia.fi/idp/profile/Shibboleth/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://haka.saimia.fi/idp/profile/SAML2/POST/SSO"/>
+ <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://haka.saimia.fi/idp/profile/SAML2/Redirect/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">saimia.fi</shibmd:Scope>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEOzCCAyOgAwIBAgIQG5tFJqoAOg0tfJqHF23wQDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQG
+EwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTExMDUz
+MTEyNDYwNloXDTE0MDUzMDEyNDYwNlowgZsxCzAJBgNVBAYTAkZJMRUwEwYDVQQHDAxMYXBwZWVu
+cmFudGExKzApBgNVBAoMIkV0ZWxhLUthcmphbGFuIGtvdWx1dHVza3VudGF5aHR5bWExLzAtBgNV
+BAsMJlNhaW1hYW4gYW1tYXR0aWtvcmtlYWtvdWx1IElULXBhbHZlbHV0MRcwFQYDVQQDDA5oYWth
+LnNhaW1pYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANwog+tZrZLi7m6W7JZq
+ZiLb34PPi3zU76SRx24WWra9Ox8g6CTpdpaHoYC/vZ/XDQMbm2LD56Bey/8+krwx0o/exlPrqCTZ
+2M1A0WegCsqd16oc9+6/XjhWtAgXwLD6sqc0xhy+CCwRhyr9cWBVvvIaBoSkZ93Mjv7POmPruLwN
+fvnpa2gHIWjcSBuvWJmDWsUEtN0HcbfJiiEU1rpGFohkBOES0/bIcEfBNQqA60pdaZVZoWeALE1Y
+bGXc/M8cTXvTYeam24lB7rbso77VthVIocRjwVWU1n70Nw7+byD6lbDq7uFHQLe0q+quKgZiJzUE
+0+sl4YrIsv/NKC3oFr8CAwEAAaOB2zCB2DATBgNVHSMEDDAKgAhKoKpYhNNePDAZBgNVHSAEEjAQ
+MA4GDCsGAQQBgg8CAwEBAjByBgNVHR8EazBpMGegZaBjhmFsZGFwOi8vMTk0LjI1Mi4xMjQuMjQx
+OjM4OS9jbj1Tb25lcmElMjBDbGFzczIlMjBDQSxvPVNvbmVyYSxjPUZJP2NlcnRpZmljYXRlcmV2
+b2NhdGlvbmxpc3Q7YmluYXJ5MBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBTAKn7790r6
+rue5HERaCD9UIhaneDANBgkqhkiG9w0BAQUFAAOCAQEAQRcZw/94TbMLV12F00oMZy1dy9A6ds2v
+6Gc7DalfI4d2+0r4D9LTIG9Z4BHXYBiutnBgFPlN9dzzlEmaagARD/zFNgS9ytk9O/CJezSTXdhh
+iznhaKCwr2hx8u6vDCil6WZyIWDSg5kruK2T7e/1QaQOxEsTT5+hgUSIr9aZEa3iSVh+QxfWFlm6
+rxtt3+x31+aDvBWHF2OLR0EkuLYSsVZpB3+vZ26bGQQ1Xkz4zApdNrUgBuPtODNR/gc6mg2qvPxv
+r0N2fY6OHHOJvApQ3LnUu0FGgxC50zQ623Vcyxz8Y5sVbMQVkoSoOW2Yds0hVBXLPZyLrHEuarDE
+urebDA==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://haka.saimia.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://haka.saimia.fi/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">Saimaan ammattikorkeakoulu</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Yrkehogskola Saimaa</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">Saimaan ammattikorkeakoulu</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Yrkehogskola Saimaa</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.saimia.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.saimia.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.saimia.fi</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Ilpo</md:GivenName>
+ <md:SurName>Olkkonen</md:SurName>
+ <md:EmailAddress>mailto:ilpo.olkkonen@saimia.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Saimaan amk</md:GivenName>
+ <md:SurName>IT-palvelut</md:SurName>
+ <md:EmailAddress>mailto:haka-admin@saimia.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Saimaan amk</md:GivenName>
+ <md:SurName>IT-palvelut</md:SurName>
+ <md:EmailAddress>mailto:haka@saimia.fi</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.aalto.fi.xml b/swamid-interfederations-1.0/idp.aalto.fi.xml
new file mode 100644
index 00000000..09d7ec24
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.aalto.fi.xml
@@ -0,0 +1,70 @@
+<?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.aalto.fi/idp/shibboleth">
+ <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <shibmd:Scope regexp="false">aalto.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>MIIEZTCCA02gAwIBAgIQfPk0tfjUFfPvbNYjMlu/rDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTExMTAwMDAwMFoXDTE2MTExMDIzNTk1OVowOjEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwxpZHAuYWFsdG8u
+ZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjQ14Y5ls9qgndtooF
+Z9tekHhuETMtovhozaCqvm6HwVE+jEo9ik4zwre42zTGz2QACBOldN5RlFw/A3kJ
+oGK5jEqQZFIw2XG22C+A7NNoZLqgGH7K3BYlYpI1Vpqpx+tk2/QpVUi4JqdIfVxT
+KHQZIW66dV4Zz+JMlAiPR/qzjLBYwUBllE5GG/BMBo7fQvMKqfrdAi3QcPdsiAQG
+Hl39WcchL53Y2tN8xOq2bkk6XOELBEe6byYdVgRzsGi6eyQHPvcWGb/Fl2JPahUj
+WM8Zz1w077omI4tzq/OLhnKAB/J25m9SAh23rq/lCFrnle528tE/nRBqX/yop8Hh
+n++dAgMBAAGjggFpMIIBZTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
+7TAdBgNVHQ4EFgQU7fL+WKGykn8q5Nden977Qx3neOEwDgYDVR0PAQH/BAQDAgWg
+MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
+A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
+oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
+CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
+Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
+cy50ZXJlbmEub3JnMBcGA1UdEQQQMA6CDGlkcC5hYWx0by5maTANBgkqhkiG9w0B
+AQUFAAOCAQEAMqh4jbB8O648lGCpqemnz15SXeHGdQAyfvC3xDwEVa7eplPzeSg1
+XW1MqufDwc6j7nO5fYtULdMuj7/GM9gXkiU2Zv+qPbymrdADan8zqHQ65Ph+JarH
+U+WwQBqDu5B4ZLpp1188FPxqX+cq/5AdJ0/yxiQjG5yC0o5iPV94AEnUBCrB7Kp1
+Y79B00ak/mPB48aieNaM+iyYfkmyrzg7qlaRcXhh0CsFlL9zDt7l8eUImkesv6UM
+Cxdagkq9pUvFaktXeSRZbrRFcaP2j/TqkPnCtuoK/oQxvwcnllp4PqGQHypWfHOd
+ZxL0Jnn1/d6adGsxw3M6+kdWZG8Iu+3Mzg==</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.aalto.fi/idp/profile/SAML2/Redirect/SSO"/>
+ </md:IDPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">Aalto-yliopisto</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Aalto University</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Aalto-universitetet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">Aalto-yliopisto</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Aalto University</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Aalto-universitetet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.aalto.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.aalto.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.aalto.fi</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Mika</md:GivenName>
+ <md:SurName>Niemi</md:SurName>
+ <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Timo</md:GivenName>
+ <md:SurName>Tunturi</md:SurName>
+ <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Timo</md:GivenName>
+ <md:SurName>Tunturi</md:SurName>
+ <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.csc.fi.xml b/swamid-interfederations-1.0/idp.csc.fi.xml
index e0ff75b4..e76de6b3 100644
--- a/swamid-interfederations-1.0/idp.csc.fi.xml
+++ b/swamid-interfederations-1.0/idp.csc.fi.xml
@@ -5,15 +5,15 @@
<shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
<shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
<mdui:UIInfo>
+ <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
<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: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="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</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:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
- <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
<mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
</mdui:UIInfo>
<mdui:DiscoHints>
<mdui:DomainHint>csc.fi</mdui:DomainHint>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index 9062a51b..1dd0a5c1 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -76,6 +76,7 @@
<shibmd:Scope regexp="false">feide.stranda.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">feide.trysil.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">fitjar.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">fjaler.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
@@ -92,12 +93,15 @@
<shibmd:Scope regexp="false">gaular.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">giske.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gjemnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">gjesdal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gloppen.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gol.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">gran.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">granvin.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">grimstad.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">grong.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gs.alesund.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">gs.haram.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gs.skodje.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gs.sula.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">gulen.kommune.no</shibmd:Scope>
@@ -161,6 +165,7 @@
<shibmd:Scope regexp="false">kvam.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">lardal.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>
@@ -168,6 +173,7 @@
<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">lunner.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">lybskole.no</shibmd:Scope>
<shibmd:Scope regexp="false">lyngdal.kommune.no</shibmd:Scope>
@@ -218,6 +224,7 @@
<shibmd:Scope regexp="false">rauma.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">rennebu.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">rennesoy.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">ringebu.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">rogfk.no</shibmd:Scope>
<shibmd:Scope regexp="false">rollag.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">romskog.kommune.no</shibmd:Scope>
@@ -263,6 +270,7 @@
<shibmd:Scope regexp="false">tingvoll.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">tinn.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">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/moodle.utu.fi.xml b/swamid-interfederations-1.0/moodle.utu.fi.xml
index c662c771..969b9461 100644
--- a/swamid-interfederations-1.0/moodle.utu.fi.xml
+++ b/swamid-interfederations-1.0/moodle.utu.fi.xml
@@ -11,38 +11,6 @@
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIIE2DCCA8CgAwIBAgIRAIzFEsSaNiwZ9NKWqNV1nEUwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDExMDMwMDAwMDBaFw0xMzExMDIyMzU5NTlaMIG0MQswCQYD
-VQQGEwJGSTEOMAwGA1UEERMFMjA1MDAxGDAWBgNVBAgTD1dlc3Rlcm4gRmlubGFu
-ZDEOMAwGA1UEBxMFVHVya3UxGjAYBgNVBAkTEUFzc2lzdGVudGlua2F0dSA1MRww
-GgYDVQQKExNVbml2ZXJzaXR5IG9mIFR1cmt1MRkwFwYDVQQLExBDb21wdXRpbmcg
-Q2VudHJlMRYwFAYDVQQDEw1tb29kbGUudXR1LmZpMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAu57V8S33XIdPWR0LrBU3P7BUaGjMQQXLIvyJG30hdL6L
-eVmhgdGLmquH4PstOhkovAyU2oRnV8qgRGTvS/dpyjiBgLBZ3bM2RHKYmPTzUxW6
-yYeQskZeRva28BZPtCo7cI6Z0tzrN0svt6hvQAvcQr0hpi4eYmflRcLN+Vogwvo2
-U67xxIxBEqUPC9ESsiIjh3AppAZcO8QzMIZO4CVhrWjyXSNpLtq7CS/n7xbw6/ky
-8bqFuaYsIBeyubsjp6nWbvMsuFRrUOh/Mjj3PLVe3kFOb7ueSjxcfAbl+Nd0T2Qa
-7KT7yY8zBI3JEoj19eTpSrZzPcBToA+LHUwiMfeM0wIDAQABo4IBYDCCAVwwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFHSb32e0HpXD
-gKuD31baDigtJobzMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDW1vb2Rs
-ZS51dHUuZmkwDQYJKoZIhvcNAQEFBQADggEBAMAInGTI7z6J5t8LBcGZPFRW8atX
-oaxMsYnrrM//+m3nuJXEZI3Bt/1/zOmQhd+Z7hwGiSLsVwaBlfdSCJwv33Oe4h7O
-SLXPtsPobOmhabdPtpyrwFE+9+Q+kRFgWNXzG2ljZqu0BXMawDIovMlyDu3Bwdu3
-xtXUgyN9ulirTItGNg6f6a0g7OglqdDTzNpB7d2FbznzGx3D9x9ywHw8HKAAEjxV
-HewGXyTGKlQg2OqGI9Pxl+JdUN1oby1ktstPHYPzhZlxjZZF90kqtBlTZ0ATZGVi
-Z/dJiMGOYt1I1CwOpyO8yRc8WeYZqbrKPxO/VsQ9b15tdADxcf+EMeuQNSs=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
<ds:X509Certificate>MIIEZzCCA0+gAwIBAgIQT5QLlkD90BQrkITUEnBTjzANBgkqhkiG9w0BAQUFADA2
MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
U1NMIENBMB4XDTEzMTEwMTAwMDAwMFoXDTE2MTAzMTIzNTk1OVowOzEhMB8GA1UE
diff --git a/swamid-interfederations-1.0/rr.funet.fi.xml b/swamid-interfederations-1.0/rr.funet.fi.xml
index e18fbed2..ef0b9a6a 100644
--- a/swamid-interfederations-1.0/rr.funet.fi.xml
+++ b/swamid-interfederations-1.0/rr.funet.fi.xml
@@ -4,13 +4,13 @@
<md:Extensions>
<idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
- <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
+ <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
<mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
+ <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
<mdui:Keywords xml:lang="en">attribute test</mdui:Keywords>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</mdui:PrivacyStatementURL>
- <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://confluence.csc.fi/x/6o4uAg</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>
diff --git a/swamid-interfederations-1.0/sp.korp.csc.fi.xml b/swamid-interfederations-1.0/sp.korp.csc.fi.xml
new file mode 100644
index 00000000..b6a85f66
--- /dev/null
+++ b/swamid-interfederations-1.0/sp.korp.csc.fi.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" 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.korp.csc.fi/">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
+ <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
+ <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
+ <mdui:Logo height="66" width="168">https://korp.csc.fi/img/korplogo.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">http://spraakbanken.gu.se/swe/korp-info</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.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>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTIxMzAwMDAwMFoXDTE2MTIxMjIzNTk1OVowOTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtrb3JwLmNzYy5m
+aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU16/1jE06KKH6uErmq
+e2wE5u+8SkWqR4Gks+iH67OiPTgoPSVfx1t55FHDUl1zQjijwcvejH26lYIpS7Ts
+js1MGcjcgEt1qFDDQ/eC6931hIg1jRa0PF/cxFjP9qEcd/I7UxuyM5QJga4pfl/o
+IHSL9oPYi5iCJ6qoC3dgNy0glMiisLkKyOKOHIXYzfAdMlIfRAMGCDAnDj3Kw4wK
+zv+RCWSGPEKHxfnPZwY8fgUs0vugICJBfQkSliUQm9P9l9Pt/8PP3XoIzgfXmxKK
+VQg/3EW+u2dnAzV1OKNrbJAajCJYL4VuGejWE7y8x+ixTqFCCPBT1cFZFWgFnzsh
+Yi0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+MB0GA1UdDgQWBBTkZV9BIXGhYb67UVmwNByxJxsAITAOBgNVHQ8BAf8EBAMCBaAw
+DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
+VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
+K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+LnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILa29ycC5jc2MuZmkwDQYJKoZIhvcNAQEF
+BQADggEBAJClAngseLp5qnRUj2iFSlNVccoP9KZKhLaeqiUk6vvwNdyetfMu9Txi
+vllrbfIaoVMvcA3nE5lfWEAlpvoqnQO/wmDv3ObX/XLJpXqSFpNpDOllhEbVeylT
+v8qqjG84Y4OUAd46zhiFpXr+6InhbkahABizqoXs2/aLm3nutf8rWzwFQqm+8YLE
+eLvEROIn209q+8M0V95avRxK1/wTTqwTnEGlGfRU5aTct+hLpJIRQS1DsAJpVDLU
+eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
+5G7muSfVNRBDgubGawMy3pYMrrCOxB4=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <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://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <md:AttributeConsumingService index="1" isDefault="true">
+ <md:ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</md:ServiceName>
+ <md:ServiceName xml:lang="en">Korp – search service for text material</md:ServiceName>
+ <md:ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+ <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>
+ <md:Organization>
+ <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Fin-Clarin</md:GivenName>
+ <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Martin</md:GivenName>
+ <md:SurName>Matthiesen</md:SurName>
+ <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:GivenName>Jyrki</md:GivenName>
+ <md:SurName>Niemi</md:SurName>
+ <md:EmailAddress>mailto:jyrki.niemi@helsinki.fi</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sp.lat.csc.fi.xml b/swamid-interfederations-1.0/sp.lat.csc.fi.xml
index 5bcd4bc3..6db70753 100644
--- a/swamid-interfederations-1.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-1.0/sp.lat.csc.fi.xml
@@ -4,16 +4,16 @@
<md:Extensions>
<idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">LAT – Language Archive Tools</mdui:DisplayName>
<mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
- <mdui:Description xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja käsitellä video- ja äänimateriaalia.</mdui:Description>
+ <mdui:DisplayName xml:lang="en">LAT – Language Archive Tools</mdui:DisplayName>
<mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
+ <mdui:Description xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja käsitellä video- ja äänimateriaalia.</mdui:Description>
<mdui:Logo height="41" width="100">https://lat.csc.fi/gif/LA.png</mdui:Logo>
- <mdui:InformationURL xml:lang="en">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
- <mdui:InformationURL xml:lang="sv">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
<mdui:InformationURL xml:lang="fi">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
+ <mdui:InformationURL xml:lang="sv">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
<mdui:PrivacyStatementURL xml:lang="sv">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
</mdui:UIInfo>
<saml:Attribute Name="tags">
diff --git a/swamid-interfederations-1.0/sso.utu.fi.xml b/swamid-interfederations-1.0/sso.utu.fi.xml
index 7802e846..abdc0a93 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="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:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="fi">Turun yliopisto</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/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index bce60fd1..30ab841d 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -11,7 +11,6 @@
<shibmd:Scope regexp="false">ucl.dk</shibmd:Scope>
<shibmd:Scope regexp="false">aau.dk</shibmd:Scope>
<shibmd:Scope regexp="false">viauc.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">phmetropol.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ihk.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ucc.dk</shibmd:Scope>
<shibmd:Scope regexp="false">drlund-gym.dk</shibmd:Scope>
@@ -128,8 +127,6 @@
<shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
<shibmd:Scope regexp="false">sosusj.dk</shibmd:Scope>
<shibmd:Scope regexp="false">kadk.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">iva.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">dansidpp.uniit.dk</shibmd:Scope>
<shibmd:Scope regexp="false">dtu.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ucn.dk</shibmd:Scope>
<shibmd:Scope regexp="false">gribskovgymnasium.dk</shibmd:Scope>
@@ -154,6 +151,7 @@
<shibmd:Scope regexp="false">vibkat.dk</shibmd:Scope>
<shibmd:Scope regexp="false">vghf.dk</shibmd:Scope>
<shibmd:Scope regexp="false">eucnord.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">phmetropol.dk</shibmd:Scope>
<shibmd:Scope regexp="false">horsensgym.dk</shibmd:Scope>
<shibmd:Scope regexp="false">eucvest.dk</shibmd:Scope>
<shibmd:Scope regexp="false">handelsskolen.com</shibmd:Scope>
@@ -162,9 +160,12 @@
<shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
<shibmd:Scope regexp="false">sosunord.dk</shibmd:Scope>
<shibmd:Scope regexp="false">eadania.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">mf-gym.dk</shibmd:Scope>
<shibmd:Scope regexp="false">techcollege.dk</shibmd:Scope>
<shibmd:Scope regexp="false">tradium.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">dansidp.stads.dk</shibmd:Scope>
<shibmd:Scope regexp="false">vucnordjylland.dk</shibmd:Scope>
+ <shibmd:Scope regexp="false">umit.dk</shibmd:Scope>
<shibmd:Scope regexp="false">wayf.dk</shibmd:Scope>
<saml:Attribute Name="tags">
<saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 07:36:08 +0000