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

6 files changed, 209 insertions, 46 deletions

diff --git a/swamid-interfederations-1.0.mxml b/swamid-interfederations-1.0.mxml
index f94a7cd4..b222ce8a 100644
--- a/swamid-interfederations-1.0.mxml
+++ b/swamid-interfederations-1.0.mxml
@@ -8,6 +8,7 @@
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.umit.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml"/>
@@ -84,12 +85,14 @@
 <xi:include href="swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/infra.clarin.dk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-1.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml"/>
 <xi:include href="swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/moodle.helsinki.fi-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/openskos.meertens.knaw.nl-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/portal.clarin.inl.nl-.xml"/>
+<xi:include href="swamid-interfederations-1.0/repo.clarino.uib.no-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/repos.ids-mannheim.de-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/rr.funet.fi-attribute-test.xml"/>
 <xi:include href="swamid-interfederations-1.0/secure.huygens.knaw.nl.xml"/>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
new file mode 100644
index 00000000..1650f1a5
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/fs.dskd.dk/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-05-27T15:12:32Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:DisplayName xml:lang="da">Designskolen Kolding</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Design School Kolding</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL2Zz
+LmRza2QuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
+NTEyMzEyMzU5NTlaMDAxLjAsBgNVBAMMJWh0dHA6Ly9mcy5kc2tkLmRrL2FkZnMv
+c2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH
+iAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZ
+hrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSV
+jp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+
+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BH
+OZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joF
+cy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAi+Kah5zSB6
+KbsrjzAP15Lemsnnlfm01DTYdSnq0DvR8xtuZqg1OrU7jEQuD4aYAK8nyoLtPxmk
+6jPI6CCNAa/MvSgwxivD2hFR7ynKJrbI65DPP7Wo/6GRSr4vMD3xhKFNGS2061M1
+8majtXtIhwqhbEgmq5EAKeTQiUZM9GcJh86+r7Td9aJxiAa2jdn3UnTEfc5pDr71
+Wks1+XvQCZCvDytO08HrCK+2n42p5qVxKX2amKpWDuseBmpuTC9uTFbP2pJuJssN
+VOvL3ykvu7uuZW0/HdBtWE/eVi8dAKE/eV5SDo6p0QUF2GK2fT7a6Mlwl5tyYAoU
+dPcr9FHbXBQ=
+</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://birk.wayf.dk/birk.php/fs.dskd.dk/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Designskolen Kolding</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Design School Kolding</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Designskolen Kolding</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Design School Kolding</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www.designskolenkolding.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.designskolenkolding.dk/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>hng@dskd.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index d3bca761..91785c43 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -116,6 +116,7 @@
       <shibmd:Scope regexp="false">feide.verdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">fet.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fhs.mil.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>
@@ -152,6 +153,7 @@
       <shibmd:Scope regexp="false">gratangen.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">grue.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.orskog.kommune.no</shibmd:Scope>
@@ -289,6 +291,7 @@
       <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">nord-odal.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>
diff --git a/swamid-interfederations-1.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml b/swamid-interfederations-1.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml
new file mode 100644
index 00000000..c955fedb
--- /dev/null
+++ b/swamid-interfederations-1.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.exammonitor.dk/module.php/saml/sp/metadata.php/login">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-12-02T09:44:48Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at brugerne får adgang til at starte et system som overvåger deres digitale eksamen.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to enable users to start a system that will monitor their digital exam.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Exam Monitor</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Exam Monitor</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID7TCCAtWgAwIBAgIJAOCFGMmv3N1CMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYDVQQGEwJESzEMMAoGA1UECAwDRnluMQ8wDQYDVQQHDAZPZGVuc2UxHTAbBgNVBAoMFFN5ZGRhbnNrIFVuaXZlcnNpdGV0MSAwHgYDVQQLDBdJVC1zZXJ2aWNlLCBFeGFtbW9uaXRvcjEdMBsGA1UEAwwUbG9naW4uZXhhbW1vbml0b3IuZGswHhcNMTUxMTI1MDkzMzIxWhcNMjUxMTI0MDkzMzIxWjCBjDELMAkGA1UEBhMCREsxDDAKBgNVBAgMA0Z5bjEPMA0GA1UEBwwGT2RlbnNlMR0wGwYDVQQKDBRTeWRkYW5zayBVbml2ZXJzaXRldDEgMB4GA1UECwwXSVQtc2VydmljZSwgRXhhbW1vbml0b3IxHTAbBgNVBAMMFGxvZ2luLmV4YW1tb25pdG9yLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ZzCSgMEAeIP1sZa/imvZR6tYN78mZuIazkexv3Zhsd/KRTCPfbhtk/J0jicZ6JsqiEd9q2cOf/XKjCw8ejaqJrYqFPWyRLyWs2xgf3lGMTWaxhhJpbnPY6uyFLGKnNkNP9xLpPqB6JkvUiQ1eCSG493ZhWhWQIrMf629U3EEPnwhhbAQa0UYw005BYqK6/MhFB50M6PFZ9O57USna9zBwtv4durotcol6fjgOAQ5Crr2vema4Swd5j56lgftmhLo9VsD5Yqd5SLZaAWWV2U3GvpsJawix7RSkt8jt3Bv6EFgu4ClojhwMB7uJhsHrPbzujhoioPt/Audp27x+zr8wIDAQABo1AwTjAdBgNVHQ4EFgQUqzCIMzUSSz10ICvF8aUDSBacbgUwHwYDVR0jBBgwFoAUqzCIMzUSSz10ICvF8aUDSBacbgUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA4JBwcUBfByuoQBa4DVI/iwroNUlKcft6tXS4315MB7QRJRpT3EL3JKI9XVN52ygiQ7okMxQIHQJjpOEq5k1czPe5WnicO02np9mNnJVK6VVJ/GXi2C/Ucp8UniwG0dVQanFIrajoz93xa/1nvVpVNztSGEm2A7tSc2Ch78XyCUFjbVN/OYm3I+sK2rzKvLTzbpG0W7YzZxUkdsa9trYFnX/1wELsqrYgFQGisJ+cMXU6m5lKOSuxcgPZgcWab7JkqTiW91GwbdlKwpvHsFlr1O352KVG8OtY5fNFjodsqAQ/BCZ2ZhSlDJUK23aRbc1ntTl6USfXH7gEI/6pKbKqLw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.exammonitor.dk/module.php/saml/sp/saml2-logout.php/login"/>
+    <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://login.exammonitor.dk/module.php/saml/sp/saml2-acs.php/login" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.exammonitor.dk/module.php/saml/sp/saml1-acs.php/login" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.exammonitor.dk/module.php/saml/sp/saml2-acs.php/login" index="2"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">Exam Monitor</md:ServiceName>
+      <md:ServiceName xml:lang="en">Exam Monitor</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at brugerne får adgang til at starte et system som overvåger deres digitale eksamen.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to enable users to start a system that will monitor their digital exam.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <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" isRequired="true"/>
+      <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" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <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" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Syddansk Universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Southern Denmark</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Syddansk Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Southern Denmark</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sdu.dk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lasse Birnbaum Jensen</md:GivenName>
+    <md:EmailAddress>lasse@sdu.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
index c06a056c..b8217741 100644
--- a/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
@@ -1,9 +1,17 @@
 <?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://logout.uwasa.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" WantAuthnRequestsSigned="true">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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://logout.uwasa.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Vaasan yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Vaasa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Vasa Universitet</mdui:DisplayName>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>uwasa.fi</mdui:DomainHint>
+      </mdui:DiscoHints>
       <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>
@@ -40,53 +48,9 @@ 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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://logout.uwasa.fi/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logout.uwasa.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">student.uwasa.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
-    </md:Extensions>
-    <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>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="fi">Vaasan yliopisto</md:OrganizationName>
     <md:OrganizationName xml:lang="en">University of Vaasa</md:OrganizationName>
diff --git a/swamid-interfederations-1.0/repo.clarino.uib.no-shibboleth-sp.xml b/swamid-interfederations-1.0/repo.clarino.uib.no-shibboleth-sp.xml
new file mode 100644
index 00000000..ddc91122
--- /dev/null
+++ b/swamid-interfederations-1.0/repo.clarino.uib.no-shibboleth-sp.xml
@@ -0,0 +1,78 @@
+<?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://repo.clarino.uib.no/shibboleth/sp">
+  <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://repo.clarino.uib.no/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">CLARINO Bergen Repository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">CLARINO Bergen Repository</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The CLARINO Bergen Repository at the University of Bergen</mdui:Description>
+        <mdui:Logo height="165" width="460">https://clarino.uib.no/images/clarino_duo-460.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="fi">https://repo.clarino.uib.no/xmlui/page/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://repo.clarino.uib.no/xmlui/page/privacypolicy</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>MIIDADCCAeigAwIBAgIJAP5/Ri7rxa/LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3JlcG8uY2x
+hcmluby51aWIubm8wHhcNMTQxMjE4MDkwNTE1WhcNMjQxMjE1MDkwNTE1WjAeMRwwGgYDVQQDExNyZX
+BvLmNsYXJpbm8udWliLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2OVEwzYCig35I
+i37Buky/t7KWlNUEkGPE2WbfBiSPM2Iw+FIYGrpZ8KIt6qloN19vKwy8m53Asbba477R8CEx0zNQEHP
+fq35vPDxDj2xLN+xvRuk6s6KbZ2eKvV6Vov2vDtOt7kw8gDFUOJd+SdOe+ROdiuV/DbOjpwsW68GdD
+pLWHmKSqXqk8fwCdoc0Imwic5sSfc2LPjAqu95aIb7CiAh8sOg26XKik6Fjibj48l3aVxtIMGJf30Jt
+S1SqnKgqmQoO6opBGnaCF4huNa44JYUSF5CQZ3c4nRxupv2tp696H7lLH3XOI81dsrAVXEwt1q2D8Fz
+NlT+U0AeFaRhbwIDAQABo0EwPzAeBgNVHREEFzAVghNyZXBvLmNsYXJpbm8udWliLm5vMB0GA1UdDgQ
+WBBQaN4I1A6h9Jlo90nhGCWfw3EpT4jANBgkqhkiG9w0BAQUFAAOCAQEADsJ1zgUqZqgnq4gUz/z3N
++5bieEYEZUJnaQ78a3erdYYLETE/PBrN0QUIGR3M2DhjCi0s00QuVFa1JqXIK3dR4ndo5Yv4hV/fVhD
+IZ4mVIUQPBcTRk1om9/gl1fdmRD+YpvhUSzvheLRBsQOyz2syxGRIPwu6LexWb8YbZtcvtWU4ZGwm91
+KXDerV8J05m4X5rv4HZi0MAS349VztNRgm6CrMBfiQUxQw5Gqsiuyf3rpzQLslEWEmP4AuoiUvlXiWq
+W+fDKhDhj2vlc80jOCrQaG00xvCbXSg91K+Xxj1kXjArfX4R7aB1TquBqLoFbPo0lNooYBECv+bN2q
+rYzidg==</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://repo.clarino.uib.no/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">CLARINO Bergen Repository</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARINO Bergen Repository</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The CLARINO Bergen Repository at the University of Bergen</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <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:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Oyvind Liland</md:GivenName>
+    <md:SurName>Gjesdal</md:SurName>
+    <md:EmailAddress>mailto:dst@uib.no</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Oyvind Liland</md:GivenName>
+    <md:SurName>Gjesdal</md:SurName>
+    <md:EmailAddress>mailto:oyvind.gjesdal@uib.no</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hemed</md:GivenName>
+    <md:SurName>Al Ruwehy</md:SurName>
+    <md:EmailAddress>mailto:hemed.ruwehy@uib.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>