From a53f924f4cd613ba9a2f5ada2f9f054708cfa394 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Thu, 7 May 2020 11:02:57 +0200
Subject: Part 2 of SWAMID-2968

---
 swamid-2.0/play.hj.se.xml | 53 -----------------------------------------------
 swamid-sp-2.0.mxml        |  1 -
 2 files changed, 54 deletions(-)
 delete mode 100644 swamid-2.0/play.hj.se.xml

diff --git a/swamid-2.0/play.hj.se.xml b/swamid-2.0/play.hj.se.xml
deleted file mode 100644
index 17a0d79f..00000000
--- a/swamid-2.0/play.hj.se.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://play.hj.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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>
-        <mdui:DisplayName xml:lang="en">Jönköping University Play service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Jönköping Playtjänst</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service is for presentation of videos from Jönköping University.</mdui:Description>
-        <mdui:Description xml:lang="sv">Denna tjänst används för presentationer av video från Högskolan i Jönköping.</mdui:Description>
-        <mdui:Logo height="77" width="299">https://lpw.hj.se/images/hj/gfx/hj-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="77" width="299">https://lpw.hj.se/images/hj/gfx/hj-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="77" width="299">https://lpw.hj.se/images/hj/gfx/hj-sv.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID7TCCAtWgAwIBAgIJAJFR/iQU3htaMA0GCSqGSIb3DQEBBQUAMFcxEzARBgNVBAMTCnBsYXkuaGouc2UxEzARBgNVBAsTCklULVNlcnZpY2UxHjAcBgNVBAoTFUhvZ3Nrb2xhbiBpIEpvbmtvcGluZzELMAkGA1UEBhMCU0UwHhcNMTUwMzE2MTE1NzUyWhcNMjUwMzE1MTE1NzUyWjBXMRMwEQYDVQQDEwpwbGF5LmhqLnNlMRMwEQYDVQQLEwpJVC1TZXJ2aWNlMR4wHAYDVQQKExVIb2dza29sYW4gaSBKb25rb3BpbmcxCzAJBgNVBAYTAlNFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4lg0FIGgwxLaOQ5a4sHgTKv8L6doetY2f5oI3vpMGnDpgvGyrAFrcLURvqajrDf7bbdncByxv6YfQ68zAKa0/tdX+n4LTk0WEAnwFKJ5Xovv8EshmFBwViwMvlSIH0JEC7CCOdPSUCIAjZarN5L2YVdSMJmOvGEWiKN0OijyAybzLeJJHt3VVqKjLd3iHF6o5RKeBjue7d2nAzJHbidrEncfgc3bDuK5DOSqY8AY/QOocZwYGED3GNZa43Ma6iQ6GdtOXFCQRZ5D4FDhz2/MzTocSS6ZqxW6P8I2XpZuK4AcDyHWm2BLe6nwH0FxPJAoDkPluAkAoM2yyn8eu7xTHQIDAQABo4G7MIG4MB0GA1UdDgQWBBQg9qr8z5deQFfb5ZBjzQvdaaW8yDCBiAYDVR0jBIGAMH6AFCD2qvzPl15AV9vlkGPNC91ppbzIoVukWTBXMRMwEQYDVQQDEwpwbGF5LmhqLnNlMRMwEQYDVQQLEwpJVC1TZXJ2aWNlMR4wHAYDVQQKExVIb2dza29sYW4gaSBKb25rb3BpbmcxCzAJBgNVBAYTAlNFggkAkVH+JBTeG1owDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAa7DR/cTPaM+0fx/zYpqDF9+Xea5UPpBUlLCIbNrSwdl1ANz+XsPlR64PVV1TQb9y7v1y2IwHQzYwffp3ynNFiBJJ8cFPgYrkX16Fo9tTUaty2dwLRgKQdVol72EXuPN/SJUPhRsm860ILW0qyvCvHT5PETKv0tdHPxjPRWittVvG3Z+g8nHbSdOE6aENUQypTlB2lDAQ2nfSZFXxPqJdR2+Y8G2UO8ikh+osFsrnNPHw3/OnZ/DiK1ZLK/WWapMxf1gwhwGzVdCjj3omNS4byID4+HTUi245ufvY43LsAxcq4haoNFRgSxizwtD1p7uGdzZDHXO5yQkz3VMhySvXLw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID7TCCAtWgAwIBAgIJAJFR/iQU3htaMA0GCSqGSIb3DQEBBQUAMFcxEzARBgNVBAMTCnBsYXkuaGouc2UxEzARBgNVBAsTCklULVNlcnZpY2UxHjAcBgNVBAoTFUhvZ3Nrb2xhbiBpIEpvbmtvcGluZzELMAkGA1UEBhMCU0UwHhcNMTUwMzE2MTE1NzUyWhcNMjUwMzE1MTE1NzUyWjBXMRMwEQYDVQQDEwpwbGF5LmhqLnNlMRMwEQYDVQQLEwpJVC1TZXJ2aWNlMR4wHAYDVQQKExVIb2dza29sYW4gaSBKb25rb3BpbmcxCzAJBgNVBAYTAlNFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4lg0FIGgwxLaOQ5a4sHgTKv8L6doetY2f5oI3vpMGnDpgvGyrAFrcLURvqajrDf7bbdncByxv6YfQ68zAKa0/tdX+n4LTk0WEAnwFKJ5Xovv8EshmFBwViwMvlSIH0JEC7CCOdPSUCIAjZarN5L2YVdSMJmOvGEWiKN0OijyAybzLeJJHt3VVqKjLd3iHF6o5RKeBjue7d2nAzJHbidrEncfgc3bDuK5DOSqY8AY/QOocZwYGED3GNZa43Ma6iQ6GdtOXFCQRZ5D4FDhz2/MzTocSS6ZqxW6P8I2XpZuK4AcDyHWm2BLe6nwH0FxPJAoDkPluAkAoM2yyn8eu7xTHQIDAQABo4G7MIG4MB0GA1UdDgQWBBQg9qr8z5deQFfb5ZBjzQvdaaW8yDCBiAYDVR0jBIGAMH6AFCD2qvzPl15AV9vlkGPNC91ppbzIoVukWTBXMRMwEQYDVQQDEwpwbGF5LmhqLnNlMRMwEQYDVQQLEwpJVC1TZXJ2aWNlMR4wHAYDVQQKExVIb2dza29sYW4gaSBKb25rb3BpbmcxCzAJBgNVBAYTAlNFggkAkVH+JBTeG1owDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAa7DR/cTPaM+0fx/zYpqDF9+Xea5UPpBUlLCIbNrSwdl1ANz+XsPlR64PVV1TQb9y7v1y2IwHQzYwffp3ynNFiBJJ8cFPgYrkX16Fo9tTUaty2dwLRgKQdVol72EXuPN/SJUPhRsm860ILW0qyvCvHT5PETKv0tdHPxjPRWittVvG3Z+g8nHbSdOE6aENUQypTlB2lDAQ2nfSZFXxPqJdR2+Y8G2UO8ikh+osFsrnNPHw3/OnZ/DiK1ZLK/WWapMxf1gwhwGzVdCjj3omNS4byID4+HTUi245ufvY43LsAxcq4haoNFRgSxizwtD1p7uGdzZDHXO5yQkz3VMhySvXLw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.hj.se/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://play.hj.se/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Högskolan i Jönköping</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Högskolan i Jönköping</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://play.hj.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index cc80cf83..1b2e2274 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -232,7 +232,6 @@
   <xi:include href="swamid-2.0/account-utv.hh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kib-shib.hosted.exlibrisgroup.com-shib.xml"/>
   <xi:include href="swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml"/>
-  <xi:include href="swamid-2.0/play.hj.se.xml"/>
   <xi:include href="swamid-2.0/his.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ltu.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mah.hr.evry.se-shibboleth.xml"/>
-- 
cgit v1.2.3