From 2330113dd23b30f30de9eb0943c41cf191d263fe Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Fri, 6 Nov 2015 08:23:33 +0100
Subject: Resolves SWAMIDOPS-7878, replace play.mah.se

---
 swamid-2.0/play.mah.se-shibboleth.xml | 64 -----------------------------------
 swamid-sp-2.0.mxml                    |  2 +-
 2 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 swamid-2.0/play.mah.se-shibboleth.xml

diff --git a/swamid-2.0/play.mah.se-shibboleth.xml b/swamid-2.0/play.mah.se-shibboleth.xml
deleted file mode 100644
index 7bbf65a9..00000000
--- a/swamid-2.0/play.mah.se-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.mah.se/shibboleth">
-  <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>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://play.mah.se/Shibboleth.sso/DS/ds.sunet.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://play.mah.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Malmö University Play service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Malmö högskolas Play tjänst</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is the Malmö University streaming service</mdui:Description>
-        <mdui:Description xml:lang="sv">Detta är Malmö högskolas play tjänst</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>play.mah.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=play.mah.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAJ52xKQD6ay3MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC3BsYXkubWFoLnNlMB4XDTEyMDgyOTE0MDMzN1oXDTIyMDgyNzE0MDMzN1ow
-FjEUMBIGA1UEAxMLcGxheS5tYWguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDrgam1nuLBzhYJobwHV+vg7uJwRgsO7E0xfWhq/SyAQtODUW0CXZHN
-s7C6O7e/AFiqpMyLOuPzKr7K2PClY1ShRIm3//GFAMpS2S90F6qwkl67q4jVD/pP
-4zUGRwS8OP6gkIMInFiXrEnzz6nYU+/GNdbmqBsj9/8uLdJYdAbkZnlQkbrpCCkp
-nHwy7GETegUGX3mG+/uu+ELRoc4ZcSZKRCheSDy+kk0QGnH+vP0FdBtM/7RCXuIb
-LHH0Hr2SdknlC5yCgRN3btHZ0d2v2srkkR+6VyyVz64b57Gl4+YY4+NRoH6gmmMD
-qSd698RS1Nl8lNAfE0rBQmEVkP0LT82BAgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Bs
-YXkubWFoLnNlhgtwbGF5Lm1haC5zZTAdBgNVHQ4EFgQUr1PVojxYdezL39aUSZKD
-uaLlcvQwDQYJKoZIhvcNAQEFBQADggEBAJckuU+nW3Sz01q4LQNBVyhFaoHmVu1e
-ZmkSK7NaBquwoYe1VvAgGc4c7iPjM11NVCR/TUfhCn/J97VeQ4JldUaA0yIFVpEw
-0787mKe6bY7MimHrdaQLd4NVL9t2cVgI3zh2cDIeAEcxymEw3plzQIgpFE2u+PAc
-a/NnrvrHXSzY2eLmtCmpqe7EIG8IWl0ehpuKEqYSBjtbQr2NF5iwwPigP5BnOrWn
-sCeIp6hryi9ispKWFrfqlxNblBAFlLAeDtDlcxDB3e45AHamq2QMEfy3ddu566sO
-mjNx3LBpLI4AqwE4TzvxzUkL5k5ZSpVzESJHvb9ljx3jnzEZuWZpH4A=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mah.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mah.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.mah.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mah.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mah.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.mah.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mah.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://play.mah.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mah.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://play.mah.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.mah.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.mah.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 2daac6a1..60ab1812 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -204,7 +204,6 @@
   <xi:include href="swamid-2.0/mds2.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/cdn.nordunet.tv-shibboleth.xml"/>
   <xi:include href="swamid-2.0/gallus.scilifelab.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/play.mah.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ni.nordu.net-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml"/>
   <xi:include href="swamid-2.0/play.mdh.se-shibboleth.xml"/>
@@ -474,4 +473,5 @@
   <xi:include href="swamid-2.0/ubas.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/emrex.its.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-2.0/play.mah.se.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3