summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-interfederations-1.0.mxml1
-rw-r--r--swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml6
-rw-r--r--swamid-interfederations-1.0/idp.feide.no.xml5
-rw-r--r--swamid-interfederations-1.0/terena.org-sp.xml10
-rw-r--r--swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.lifeportal.xml113
-rw-r--r--swamid-interfederations-1.0/wayf.wayf.dk.xml11
6 files changed, 127 insertions, 19 deletions
diff --git a/swamid-interfederations-1.0.mxml b/swamid-interfederations-1.0.mxml
index b222ce8a..c1a4ff76 100644
--- a/swamid-interfederations-1.0.mxml
+++ b/swamid-interfederations-1.0.mxml
@@ -117,6 +117,7 @@
<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.xml"/>
<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml"/>
<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml"/>
+<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.lifeportal.xml"/>
<xi:include href="swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml"/>
<xi:include href="swamid-interfederations-1.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-interfederations-1.0/wayf.ordbogen.com.xml"/>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
index e8b45053..4047630b 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
@@ -14,7 +14,7 @@
<md:Extensions>
<shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
<mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
- <mdui:DisplayName xml:lang="da">University College Syddanmark</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="da">UC SYD</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">University College South Denmark</mdui:DisplayName>
</mdui:UIInfo>
</md:Extensions>
@@ -45,9 +45,9 @@ UFdljlsuM44ZHRRTQB7UThOzNtQaqFViwo1G86pznm4OQ5WhZqzFO8eoPb8bBtrk
<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/fg.ucsyd.dk/adfs/ls/"/>
</md:IDPSSODescriptor>
<md:Organization>
- <md:OrganizationName xml:lang="da">University College Syddanmark</md:OrganizationName>
+ <md:OrganizationName xml:lang="da">UC SYD</md:OrganizationName>
<md:OrganizationName xml:lang="en">University College South Denmark</md:OrganizationName>
- <md:OrganizationDisplayName xml:lang="da">University College Syddanmark</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="da">UC SYD</md:OrganizationDisplayName>
<md:OrganizationDisplayName xml:lang="en">University College South Denmark</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="da">http://www.ucsyd.dk/</md:OrganizationURL>
<md:OrganizationURL xml:lang="en">https://www.ucsyd.dk/international/welcome-to-university-college-south-denmark/</md:OrganizationURL>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index bf411468..658df086 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -130,6 +130,7 @@
<shibmd:Scope regexp="false">forde.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">forsand.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">fosnes.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">fossumkollektivet.no</shibmd:Scope>
<shibmd:Scope regexp="false">framnes.vgs.no</shibmd:Scope>
<shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">friskolen.no</shibmd:Scope>
@@ -285,6 +286,7 @@
<shibmd:Scope regexp="false">nesset.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">nfk.no</shibmd:Scope>
<shibmd:Scope regexp="false">nhh.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">nifu.no</shibmd:Scope>
<shibmd:Scope regexp="false">nih.no</shibmd:Scope>
<shibmd:Scope regexp="false">nissedal.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">nla.no</shibmd:Scope>
@@ -293,6 +295,7 @@
<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">nord.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>
@@ -372,6 +375,7 @@
<shibmd:Scope regexp="false">sonans.no</shibmd:Scope>
<shibmd:Scope regexp="false">songdalen.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">sor-fron.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">sortland.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
@@ -441,6 +445,7 @@
<shibmd:Scope regexp="false">vestvagoy.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
<shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
+ <shibmd:Scope regexp="false">vid.no</shibmd:Scope>
<shibmd:Scope regexp="false">vik.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">vindafjord.kommune.no</shibmd:Scope>
<shibmd:Scope regexp="false">vinje.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/terena.org-sp.xml b/swamid-interfederations-1.0/terena.org-sp.xml
index 449f6516..5d59b67f 100644
--- a/swamid-interfederations-1.0/terena.org-sp.xml
+++ b/swamid-interfederations-1.0/terena.org-sp.xml
@@ -18,11 +18,11 @@
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="en">TERENA Service Provider Proxy</mdui:DisplayName>
- <mdui:Description xml:lang="en">A service provider proxy for all TERENA federated services</mdui:Description>
- <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
- <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p</mdui:PrivacyStatementURL>
- <mdui:Logo width="350" height="94">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
+ <mdui:DisplayName xml:lang="en">GÉANT Service Provider Proxy</mdui:DisplayName>
+ <mdui:Description xml:lang="en">A service provider proxy for all GÉANT federated services</mdui:Description>
+ <mdui:InformationURL xml:lang="en">https://wiki.geant.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.geant.org/Policies</mdui:PrivacyStatementURL>
+ <mdui:Logo width="175" height="73">http://www.geant.org/Logo/PublishingImages/New_GEANT_logo.jpg</mdui:Logo>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.lifeportal.xml b/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.lifeportal.xml
new file mode 100644
index 00000000..f673c93d
--- /dev/null
+++ b/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.lifeportal.xml
@@ -0,0 +1,113 @@
+<?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="urn:mace:feide.no:services:no.uio.lifeportal">
+ <md:Extensions>
+ <mdrpi:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2016-01-06T10:35:34Z">
+ <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.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">norway</saml:AttributeValue>
+ </saml:Attribute>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
+ <md:Extensions>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="nb">Lifeportal</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Lifeportal</mdui:DisplayName>
+ <mdui:Description xml:lang="nb">Lifeportal er en Galaxy-basert dynamisk web-portal ment for å gi forskere i norsk UH-sektor og deres samarbeidspartnere enkel og god tilgang til tungregneressurser. Ut over tilgang til tungregneressurser gir også Lifeportal mulighet for arbeids-flyt støtte, enkel reproduserbarhets-sporing, en mulighet for publisering av applikasjoner i forbindelse med krav om tilgjengeliggjøring fra tidsskrift og ikke minst vil Lifeportal kunne fungere som en samarbeidsportal for forskningsmiljø.</mdui:Description>
+ <mdui:Description xml:lang="en">The Lifeportal is a Galaxy based dynamic web-portal designed to give researchers in Norwegian Univeristies and University Colleges, and their international collaborators, easy access to high-performance computing. In addition to access to high-performance computing the Lifeportal also gives workflow-support, reproducibility support, a collaboration arena and a place to publish applications when submitting manuscripts on them to peer-reviewed journals.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEhzCCA2+gAwIBAgIRAI1Se/8hShNwe4OT2qwVIDwwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA5MTkwMDAwMDBaFw0xNjA5MTgyMzU5NTlaMD8xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRbGlmZXBvcnRh
+bC51aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDW3LzucSwI
+wMRY2TzEjpdCvv17R7Fe+rxhMD0+LojsVsITpXJCsR+Opi7LK2xS3BD5efF3c1YU
+vw1VMZ1YKOc33H3pzUFVg4wYaDyQYfTcO3ec4PwXRqwR+t0Il6B0TXueDwkeOock
+fSpSm+I8GGfXLzS8k4EzPhKdZWXwVs0iS4VcXwfJ6Io6pO/XQmtX8jpSOtDj/Fjh
+bcWlaoI3gcu1ckLjQFB8AZFb0GTZL227X9qyxdFnxqXG6dKc8QJl9hElxkosyz9h
+YQC8CL5ss0icpWixyy7JimtrAiSm6JtWjKSUhLalaNR61dL0PQu/ZZJoM2cF1Xyc
+5IykxHtbKHs9AgMBAAGjggGFMIIBgTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUsQvf8ig/KTguE0/RM5nK57EcIrowDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMDMGA1UdEQQsMCqCEWxpZmVwb3J0YWwudWlvLm5v
+ghV3d3cubGlmZXBvcnRhbC51aW8ubm8wDQYJKoZIhvcNAQEFBQADggEBABqoP8YF
+0zGAC9gBTHwBdVRsSwD+YcEJl6+BmV6yBzt795hjMOkY+hxHv6Pe5rDOrmxbOAaN
+yy+am8fOAQfS8pjzz6Aq9dSlAR5klpg1KBv4rSU+VdBnDzGl2R6AusAM3wpkc9KI
+AjGTmtDwTtix0NCS0GyxSXNOZEzG3Pe50d+e+ggIg/pgScX+u4sZZ4LaDLn0cIdc
+PtkfW6ntXV2HSppYTJ+yB7BxMtWblz+InggYYRyf0pZm360sYXfBZsPfSpprR/VZ
+whlQjty+jzpMSX7CKddhDy+DCMHoNMusnM4bkC4yEqBqgRiqJxFpYj/ucAqnwkNT
+eC2H4sEjAoJSYzc=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEhzCCA2+gAwIBAgIRAI1Se/8hShNwe4OT2qwVIDwwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA5MTkwMDAwMDBaFw0xNjA5MTgyMzU5NTlaMD8xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRbGlmZXBvcnRh
+bC51aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDW3LzucSwI
+wMRY2TzEjpdCvv17R7Fe+rxhMD0+LojsVsITpXJCsR+Opi7LK2xS3BD5efF3c1YU
+vw1VMZ1YKOc33H3pzUFVg4wYaDyQYfTcO3ec4PwXRqwR+t0Il6B0TXueDwkeOock
+fSpSm+I8GGfXLzS8k4EzPhKdZWXwVs0iS4VcXwfJ6Io6pO/XQmtX8jpSOtDj/Fjh
+bcWlaoI3gcu1ckLjQFB8AZFb0GTZL227X9qyxdFnxqXG6dKc8QJl9hElxkosyz9h
+YQC8CL5ss0icpWixyy7JimtrAiSm6JtWjKSUhLalaNR61dL0PQu/ZZJoM2cF1Xyc
+5IykxHtbKHs9AgMBAAGjggGFMIIBgTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUsQvf8ig/KTguE0/RM5nK57EcIrowDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMDMGA1UdEQQsMCqCEWxpZmVwb3J0YWwudWlvLm5v
+ghV3d3cubGlmZXBvcnRhbC51aW8ubm8wDQYJKoZIhvcNAQEFBQADggEBABqoP8YF
+0zGAC9gBTHwBdVRsSwD+YcEJl6+BmV6yBzt795hjMOkY+hxHv6Pe5rDOrmxbOAaN
+yy+am8fOAQfS8pjzz6Aq9dSlAR5klpg1KBv4rSU+VdBnDzGl2R6AusAM3wpkc9KI
+AjGTmtDwTtix0NCS0GyxSXNOZEzG3Pe50d+e+ggIg/pgScX+u4sZZ4LaDLn0cIdc
+PtkfW6ntXV2HSppYTJ+yB7BxMtWblz+InggYYRyf0pZm360sYXfBZsPfSpprR/VZ
+whlQjty+jzpMSX7CKddhDy+DCMHoNMusnM4bkC4yEqBqgRiqJxFpYj/ucAqnwkNT
+eC2H4sEjAoJSYzc=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lifeportal.uio.no/user/logout_feide_user"/>
+ <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://lifeportal.uio.no/user/feide_auth" index="1"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="nb">Lifeportal</md:ServiceName>
+ <md:ServiceName xml:lang="en">Lifeportal</md:ServiceName>
+ <md:ServiceDescription xml:lang="nb">Lifeportal er en Galaxy-basert dynamisk web-portal ment for å gi forskere i norsk UH-sektor og deres samarbeidspartnere enkel og god tilgang til tungregneressurser. Ut over tilgang til tungregneressurser gir også Lifeportal mulighet for arbeids-flyt støtte, enkel reproduserbarhets-sporing, en mulighet for publisering av applikasjoner i forbindelse med krav om tilgjengeliggjøring fra tidsskrift og ikke minst vil Lifeportal kunne fungere som en samarbeidsportal for forskningsmiljø.</md:ServiceDescription>
+ <md:ServiceDescription xml:lang="en">The Lifeportal is a Galaxy based dynamic web-portal designed to give researchers in Norwegian Univeristies and University Colleges, and their international collaborators, easy access to high-performance computing. In addition to access to high-performance computing the Lifeportal also gives workflow-support, reproducibility support, a collaboration arena and a place to publish applications when submitting manuscripts on them to peer-reviewed journals.</md:ServiceDescription>
+ <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
+ <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
+ <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" 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:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" 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:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+ </md:AttributeConsumingService>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
+ <md:OrganizationName xml:lang="no">Universitetet i Oslo</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="no">Universitet i Oslo</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.uio.no/english/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="no">http://www.uio.no/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Nikolay</md:GivenName>
+ <md:SurName>Vazov</md:SurName>
+ <md:EmailAddress>n.a.vazov@usit.uio.no</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 1057424e..a0f5cf37 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -26,9 +26,7 @@
<shibmd:Scope regexp="false">itu.dk</shibmd:Scope>
<shibmd:Scope regexp="false">aip.itsf.dk</shibmd:Scope>
<shibmd:Scope regexp="false">gg.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">lg.itsf.dk</shibmd:Scope>
<shibmd:Scope regexp="false">mg.itsf.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sosur.itsf.dk</shibmd:Scope>
<shibmd:Scope regexp="false">sska.itsf.dk</shibmd:Scope>
<shibmd:Scope regexp="false">sss.itsf.dk</shibmd:Scope>
<shibmd:Scope regexp="false">its.itsf.dk</shibmd:Scope>
@@ -36,12 +34,8 @@
<shibmd:Scope regexp="false">ibc.dk</shibmd:Scope>
<shibmd:Scope regexp="false">rungsted-gym.dk</shibmd:Scope>
<shibmd:Scope regexp="false">ucsj.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sosuc.cphwest.dk</shibmd:Scope>
<shibmd:Scope regexp="false">dab.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">ism.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">fbo.minibib.dk</shibmd:Scope>
<shibmd:Scope regexp="false">fsv.minibib.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vfc.minibib.dk</shibmd:Scope>
<shibmd:Scope regexp="false">dsl.dk</shibmd:Scope>
<shibmd:Scope regexp="false">zbc.dk</shibmd:Scope>
<shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
@@ -61,13 +55,8 @@
<shibmd:Scope regexp="false">sde.dk</shibmd:Scope>
<shibmd:Scope regexp="false">eal.dk</shibmd:Scope>
<shibmd:Scope regexp="false">hrs.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">sceu.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">vgtgym.dk</shibmd:Scope>
- <shibmd:Scope regexp="false">odense.dk</shibmd:Scope>
<shibmd:Scope regexp="false">au.dk</shibmd:Scope>
<shibmd:Scope regexp="false">knord.dk</shibmd:Scope>
- <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">handelsskolen.com</shibmd:Scope>