Resolved SWAMID-746 + updated 785

3 files changed, 1 insertions, 51 deletions

diff --git a/swamid-2.0/328-mediaspace.kaltura.nordu.net.xml b/swamid-2.0/328-mediaspace.kaltura.nordu.net.xml
deleted file mode 100644
index 18ac9ee3..00000000
--- a/swamid-2.0/328-mediaspace.kaltura.nordu.net.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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://328-mediaspace.kaltura.nordu.net">
-  <md:Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sophiahemmet University play service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Sophiahemmet Högskolas playtjänst</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is Sophiahemmet University’s streaming service.</mdui:Description>
-        <mdui:Description xml:lang="sv">Detta är Sophiahemmet Högskolas playtjänst</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFTCCA/2gAwIBAgIJAP2taPVBJTORMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHzAdBgNVBAoUFlNvcGhpYWhlbW1ldCBIw7Znc2tvbGExITAfBgNVBAsUGEbDtnJ2YWx0bmluZ3NhdmRlbG5pbmdlbjEUMBIGA1UEAxMLcGxheS5zaGguc2UxJjAkBgkqhkiG9w0BCQEWF2pvYWtpbS5sZWhuc3Ryb21Ac2hoLnNlMB4XDTE4MDYxMTA5MTYyNloXDTI4MDYxMDA5MTYyNlowgbcxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChQWU29waGlhaGVtbWV0IEjDtmdza29sYTEhMB8GA1UECxQYRsO2cnZhbHRuaW5nc2F2ZGVsbmluZ2VuMRQwEgYDVQQDEwtwbGF5LnNoaC5zZTEmMCQGCSqGSIb3DQEJARYXam9ha2ltLmxlaG5zdHJvbUBzaGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMgETbDyZeCfo14RJN0CmzN2QhWQc6yg16seF8LIsLWIjB3rjsJAuEJoQu89bcWmP5UP34cU6Q1MTATng4oDNJPxaD9Qcc+T42kyPnSQPXw/LvfIKr5jv6EvuZ/oEpuGnB7Zg4QiaWOdYYTxo47CcFFFqN837nffnR6UMLRt62bSG5wAH5c8ERXFdLPMr+PL79hsQDByuFcvC2X15RuKPUtVnHYOjIivdfYZssMsfoOGk6tC4nyaWiBRg4zldR1UZCdcXPVZiP3Mve3aoqRRf7olUEZErvesiRT/J2tEqMqnytIpol5s2K76QbVvJBL+ePyr27ztI+V5kbAti4qDU7AgMBAAGjggEgMIIBHDAdBgNVHQ4EFgQUjjz5ooBxJTlV9mXdjEmdEVc7spcwgewGA1UdIwSB5DCB4YAUjjz5ooBxJTlV9mXdjEmdEVc7spehgb2kgbowgbcxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChQWU29waGlhaGVtbWV0IEjDtmdza29sYTEhMB8GA1UECxQYRsO2cnZhbHRuaW5nc2F2ZGVsbmluZ2VuMRQwEgYDVQQDEwtwbGF5LnNoaC5zZTEmMCQGCSqGSIb3DQEJARYXam9ha2ltLmxlaG5zdHJvbUBzaGguc2WCCQD9rWj1QSUzkTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBWnjQaWqI+hZyS110KINZc/olLi7FbV953D7kM2vQN/bkaz3X8vlw7vrUfFdfTyEOALHM8uXMynTMW2QMdF5wpOM14+Rtt9it9fswB6Sa+qnXakuCCM/uRy9Fm5OXevPv0+squ2TbhK7lP2iJwVKB5vXVX9jz/RDrw/w7BeQ+8f0yjvk3a5OPp2jUyOP7rfSjn0XkrEe3Vpo8L2kLEiPnC+3bOF+y+WUYWFk/qBzsJ1aOKXz5UbG8SmuAv6BKECkVopkU/dPQtUmd/rqR4tGGFL7EJY9Q2q42uj3lQdNAWK6fryG3vv7Hs5lmVBXsyK9te3+NzLfomPEJoDZR4s47s</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFTCCA/2gAwIBAgIJAP2taPVBJTORMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHzAdBgNVBAoUFlNvcGhpYWhlbW1ldCBIw7Znc2tvbGExITAfBgNVBAsUGEbDtnJ2YWx0bmluZ3NhdmRlbG5pbmdlbjEUMBIGA1UEAxMLcGxheS5zaGguc2UxJjAkBgkqhkiG9w0BCQEWF2pvYWtpbS5sZWhuc3Ryb21Ac2hoLnNlMB4XDTE4MDYxMTA5MTYyNloXDTI4MDYxMDA5MTYyNlowgbcxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChQWU29waGlhaGVtbWV0IEjDtmdza29sYTEhMB8GA1UECxQYRsO2cnZhbHRuaW5nc2F2ZGVsbmluZ2VuMRQwEgYDVQQDEwtwbGF5LnNoaC5zZTEmMCQGCSqGSIb3DQEJARYXam9ha2ltLmxlaG5zdHJvbUBzaGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMgETbDyZeCfo14RJN0CmzN2QhWQc6yg16seF8LIsLWIjB3rjsJAuEJoQu89bcWmP5UP34cU6Q1MTATng4oDNJPxaD9Qcc+T42kyPnSQPXw/LvfIKr5jv6EvuZ/oEpuGnB7Zg4QiaWOdYYTxo47CcFFFqN837nffnR6UMLRt62bSG5wAH5c8ERXFdLPMr+PL79hsQDByuFcvC2X15RuKPUtVnHYOjIivdfYZssMsfoOGk6tC4nyaWiBRg4zldR1UZCdcXPVZiP3Mve3aoqRRf7olUEZErvesiRT/J2tEqMqnytIpol5s2K76QbVvJBL+ePyr27ztI+V5kbAti4qDU7AgMBAAGjggEgMIIBHDAdBgNVHQ4EFgQUjjz5ooBxJTlV9mXdjEmdEVc7spcwgewGA1UdIwSB5DCB4YAUjjz5ooBxJTlV9mXdjEmdEVc7spehgb2kgbowgbcxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChQWU29waGlhaGVtbWV0IEjDtmdza29sYTEhMB8GA1UECxQYRsO2cnZhbHRuaW5nc2F2ZGVsbmluZ2VuMRQwEgYDVQQDEwtwbGF5LnNoaC5zZTEmMCQGCSqGSIb3DQEJARYXam9ha2ltLmxlaG5zdHJvbUBzaGguc2WCCQD9rWj1QSUzkTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBWnjQaWqI+hZyS110KINZc/olLi7FbV953D7kM2vQN/bkaz3X8vlw7vrUfFdfTyEOALHM8uXMynTMW2QMdF5wpOM14+Rtt9it9fswB6Sa+qnXakuCCM/uRy9Fm5OXevPv0+squ2TbhK7lP2iJwVKB5vXVX9jz/RDrw/w7BeQ+8f0yjvk3a5OPp2jUyOP7rfSjn0XkrEe3Vpo8L2kLEiPnC+3bOF+y+WUYWFk/qBzsJ1aOKXz5UbG8SmuAv6BKECkVopkU/dPQtUmd/rqR4tGGFL7EJY9Q2q42uj3lQdNAWK6fryG3vv7Hs5lmVBXsyK9te3+NzLfomPEJoDZR4s47s</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://328-mediaspace.kaltura.nordu.net/user/logout"/>
-    <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://328-mediaspace.kaltura.nordu.net/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Sophiahemmet Högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sophiahemmet Högskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://328-mediaspace.kaltura.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NORDUnet</md:GivenName>
-    <md:SurName>SAML Admin</md:SurName>
-    <md:EmailAddress>saml@media.nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/337-mediaspace.kaltura.nordu.net.xml b/swamid-2.0/337-mediaspace.kaltura.nordu.net.xml
index 29016480..f57b131d 100644
--- a/swamid-2.0/337-mediaspace.kaltura.nordu.net.xml
+++ b/swamid-2.0/337-mediaspace.kaltura.nordu.net.xml
@@ -3,8 +3,7 @@
   <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f54d0902..221b96c6 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -716,7 +716,6 @@
   <xi:include href="swamid-2.0/hkrplay.hkr.se.xml"/>
   <xi:include href="swamid-2.0/app.sh.se.xml"/>
   <xi:include href="swamid-2.0/lubcat.lub.lu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/328-mediaspace.kaltura.nordu.net.xml"/>
   <xi:include href="swamid-2.0/play.shh.se.xml"/>
   <xi:include href="swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml"/>
   <xi:include href="swamid-2.0/337-mediaspace.kaltura.nordu.net.xml"/>