From d81f8f5085e5512ce3f2748780a58eea91ac6ba6 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Mon, 12 Sep 2016 16:31:30 +0200
Subject: Resolves SWAMIDOPS-8322

---
 swamid-2.0/play.hv.se.xml      | 47 ++++++++++++++++++++++++++++++++++++++++++
 swamid-2.0/test.play.hv.se.xml | 47 ++++++++++++++++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml             |  2 ++
 3 files changed, 96 insertions(+)
 create mode 100644 swamid-2.0/play.hv.se.xml
 create mode 100644 swamid-2.0/test.play.hv.se.xml

diff --git a/swamid-2.0/play.hv.se.xml b/swamid-2.0/play.hv.se.xml
new file mode 100644
index 00000000..fad97ee0
--- /dev/null
+++ b/swamid-2.0/play.hv.se.xml
@@ -0,0 +1,47 @@
+<?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://play.hv.se">
+  <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="sv">HV play</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HV play</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är Högskolan Västs play tjänst</mdui:Description>
+        <mdui:Description xml:lang="en">This is University West's streaming service</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIExzCCA6+gAwIBAgIJAJ9aLWs3X8xXMA0GCSqGSIb3DQEBBQUAMIGdMQswCQYDVQQGEwJTRTEYMBYGA1UECBMPVkFTVFJBIEdPVEFMQU5EMRQwEgYDVQQHEwtUUk9MTEhBVFRBTjEYMBYGA1UEChMPVW5pdmVyc2l0eSBXZXN0MQswCQYDVQQLEwJJVDETMBEGA1UEAxMKcGxheS5odi5zZTEiMCAGCSqGSIb3DQEJARYTc2VydmljZWNlbnRlckBodi5zZTAeFw0xNjA5MTIwODQyNTRaFw0yNjA5MTIwODQyNTRaMIGdMQswCQYDVQQGEwJTRTEYMBYGA1UECBMPVkFTVFJBIEdPVEFMQU5EMRQwEgYDVQQHEwtUUk9MTEhBVFRBTjEYMBYGA1UEChMPVW5pdmVyc2l0eSBXZXN0MQswCQYDVQQLEwJJVDETMBEGA1UEAxMKcGxheS5odi5zZTEiMCAGCSqGSIb3DQEJARYTc2VydmljZWNlbnRlckBodi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJX4SUmfSUg3/yndiOhjwP8iVQHNgFbHhM1vq8k7lZxWvRFXyPABzF4LTJe5+QKJ0649IcHuY9y9vMbB8jFW56oadUCTZBqO72cv358m76fHGFLCMklhNrifZdSlpn9KY0K2ee/miT7Cuzgn+OlQ41II7IOtJ3V7h6bdWvtsL8pYmjOzFziw2keHRqJwtE3IV1UwhWS6AmK+ddob84dr2eTDg9SaNEmAMzhLejnP+h9LAfXoTHWxgoOXiNrAiEqHoKgG5gbT+PZT9ED37PAAXfCxXr3lVneX2v5g/lyBxJfForzR9c+mZ02ke4LTO7C1rfgEgbnwvJCcB2IXwsAyt7UCAwEAAaOCAQYwggECMB0GA1UdDgQWBBRUg7SaHmNZVkJCIvYB5q8QbwDjsTCB0gYDVR0jBIHKMIHHgBRUg7SaHmNZVkJCIvYB5q8QbwDjsaGBo6SBoDCBnTELMAkGA1UEBhMCU0UxGDAWBgNVBAgTD1ZBU1RSQSBHT1RBTEFORDEUMBIGA1UEBxMLVFJPTExIQVRUQU4xGDAWBgNVBAoTD1VuaXZlcnNpdHkgV2VzdDELMAkGA1UECxMCSVQxEzARBgNVBAMTCnBsYXkuaHYuc2UxIjAgBgkqhkiG9w0BCQEWE3NlcnZpY2VjZW50ZXJAaHYuc2WCCQCfWi1rN1/MVzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBKcBhFYSjxiLwln8UAHhJUlvmSPh12aEBRKPqQDSvosuvv0qZSksZncyTKrAunusYGuhqlXuYhS/VzPQbujC+ZxILbL2YtTmATv9tWptLWYQSp236h1cEh9qPra7reSt2d55cdP5NuGQSBObRf8/HA0FQNr6RMx5hdRaoTbEXiWxsxtvSLdtomyuAxHj5VDxE5WsqeD9ueVFphLnGRY/mN5pidVfEG/1Kk9XIl4O6HWq96NpXCnRHWkT2YfGoipF2WCcmBYQJe5nOflYex/ScWvqfJKE9aCimlCRU8Vjq2P+eFpC5TjL+oHZBgeuU52gfEVoM/tqgOkHYKJnhQGE0j</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIExzCCA6+gAwIBAgIJAJ9aLWs3X8xXMA0GCSqGSIb3DQEBBQUAMIGdMQswCQYDVQQGEwJTRTEYMBYGA1UECBMPVkFTVFJBIEdPVEFMQU5EMRQwEgYDVQQHEwtUUk9MTEhBVFRBTjEYMBYGA1UEChMPVW5pdmVyc2l0eSBXZXN0MQswCQYDVQQLEwJJVDETMBEGA1UEAxMKcGxheS5odi5zZTEiMCAGCSqGSIb3DQEJARYTc2VydmljZWNlbnRlckBodi5zZTAeFw0xNjA5MTIwODQyNTRaFw0yNjA5MTIwODQyNTRaMIGdMQswCQYDVQQGEwJTRTEYMBYGA1UECBMPVkFTVFJBIEdPVEFMQU5EMRQwEgYDVQQHEwtUUk9MTEhBVFRBTjEYMBYGA1UEChMPVW5pdmVyc2l0eSBXZXN0MQswCQYDVQQLEwJJVDETMBEGA1UEAxMKcGxheS5odi5zZTEiMCAGCSqGSIb3DQEJARYTc2VydmljZWNlbnRlckBodi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJX4SUmfSUg3/yndiOhjwP8iVQHNgFbHhM1vq8k7lZxWvRFXyPABzF4LTJe5+QKJ0649IcHuY9y9vMbB8jFW56oadUCTZBqO72cv358m76fHGFLCMklhNrifZdSlpn9KY0K2ee/miT7Cuzgn+OlQ41II7IOtJ3V7h6bdWvtsL8pYmjOzFziw2keHRqJwtE3IV1UwhWS6AmK+ddob84dr2eTDg9SaNEmAMzhLejnP+h9LAfXoTHWxgoOXiNrAiEqHoKgG5gbT+PZT9ED37PAAXfCxXr3lVneX2v5g/lyBxJfForzR9c+mZ02ke4LTO7C1rfgEgbnwvJCcB2IXwsAyt7UCAwEAAaOCAQYwggECMB0GA1UdDgQWBBRUg7SaHmNZVkJCIvYB5q8QbwDjsTCB0gYDVR0jBIHKMIHHgBRUg7SaHmNZVkJCIvYB5q8QbwDjsaGBo6SBoDCBnTELMAkGA1UEBhMCU0UxGDAWBgNVBAgTD1ZBU1RSQSBHT1RBTEFORDEUMBIGA1UEBxMLVFJPTExIQVRUQU4xGDAWBgNVBAoTD1VuaXZlcnNpdHkgV2VzdDELMAkGA1UECxMCSVQxEzARBgNVBAMTCnBsYXkuaHYuc2UxIjAgBgkqhkiG9w0BCQEWE3NlcnZpY2VjZW50ZXJAaHYuc2WCCQCfWi1rN1/MVzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBKcBhFYSjxiLwln8UAHhJUlvmSPh12aEBRKPqQDSvosuvv0qZSksZncyTKrAunusYGuhqlXuYhS/VzPQbujC+ZxILbL2YtTmATv9tWptLWYQSp236h1cEh9qPra7reSt2d55cdP5NuGQSBObRf8/HA0FQNr6RMx5hdRaoTbEXiWxsxtvSLdtomyuAxHj5VDxE5WsqeD9ueVFphLnGRY/mN5pidVfEG/1Kk9XIl4O6HWq96NpXCnRHWkT2YfGoipF2WCcmBYQJe5nOflYex/ScWvqfJKE9aCimlCRU8Vjq2P+eFpC5TjL+oHZBgeuU52gfEVoM/tqgOkHYKJnhQGE0j</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.hv.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.hv.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HV Play</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HV Play</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://play.hv.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/test.play.hv.se.xml b/swamid-2.0/test.play.hv.se.xml
new file mode 100644
index 00000000..6ae9137a
--- /dev/null
+++ b/swamid-2.0/test.play.hv.se.xml
@@ -0,0 +1,47 @@
+<?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://test.play.hv.se">
+  <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="sv">HV play test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HV play test</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är Högskolan Västs play tjänst</mdui:Description>
+        <mdui:Description xml:lang="en">This is University West's streaming service</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIErTCCA5WgAwIBAgIJAM9nUkfn5v/9MA0GCSqGSIb3DQEBBQUAMIGVMQswCQYDVQQGEwJTRTEYMBYGA1UECBMPVkFTVFJBIEdPVEFMQU5EMRQwEgYDVQQHEwtUUk9MTEhBVFRBTjEYMBYGA1UEChMPVW5pdmVyc2l0eSBXZXN0MRgwFgYDVQQDEw90ZXN0LnBsYXkuaHYuc2UxIjAgBgkqhkiG9w0BCQEWE3NlcnZpY2VjZW50ZXJAaHYuc2UwHhcNMTYwOTEyMDg0NDIyWhcNMjYwOTEyMDg0NDIyWjCBlTELMAkGA1UEBhMCU0UxGDAWBgNVBAgTD1ZBU1RSQSBHT1RBTEFORDEUMBIGA1UEBxMLVFJPTExIQVRUQU4xGDAWBgNVBAoTD1VuaXZlcnNpdHkgV2VzdDEYMBYGA1UEAxMPdGVzdC5wbGF5Lmh2LnNlMSIwIAYJKoZIhvcNAQkBFhNzZXJ2aWNlY2VudGVyQGh2LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzBniiRbEgWb2J0M23JBCnN1eV1Jwo7ADA2IGGIWBCnoMIXvwwV8MNPheiqGsyk9NACziYYHYrfI0TSEXYqoFazgSi3Scgi0DnDLsAC1SGLZ1YFe89zobTVa8UiA9BetILu/WWI3R2qRRyfs9I66xS/Ic1uJxEe0ficoP/PvSNNyw++xXEfPYGcW52wgFPXiRIo3jtPlqn5lp0TL3XHQMx46aDLTChbahRJ6DTOycgCH+xvIUVlmd+JSDFb9ibqhcaEIwrbMaB6CXj9jH29SFPbAC8wf610mRG61A4EV98ogXQQnfksVPHxFrpHY+6kXIW59skIpi4a/dI/SQgErg7wIDAQABo4H9MIH6MB0GA1UdDgQWBBQI+XDNsL+ccq9XBhVIGhjYWTL/JzCBygYDVR0jBIHCMIG/gBQI+XDNsL+ccq9XBhVIGhjYWTL/J6GBm6SBmDCBlTELMAkGA1UEBhMCU0UxGDAWBgNVBAgTD1ZBU1RSQSBHT1RBTEFORDEUMBIGA1UEBxMLVFJPTExIQVRUQU4xGDAWBgNVBAoTD1VuaXZlcnNpdHkgV2VzdDEYMBYGA1UEAxMPdGVzdC5wbGF5Lmh2LnNlMSIwIAYJKoZIhvcNAQkBFhNzZXJ2aWNlY2VudGVyQGh2LnNlggkAz2dSR+fm//0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAW/7q/k2hjhpLhjn1zIq7DODR8TBZC253953M6gxGdVdfgMmTJU6jtqzt1r1qNwqfb8KWFghT/pFHgh4l0vHZBcgquKINJfKSGHXXYVfVsZLcno6uQfoqBoKm58W3MfpYJi+ZbCFih3UWqzBlCet6ikf83lVnlD0dinM3vp8WXrJoasOWZm3MgQ2+f9CrCLCj+7HcmXbt7L+Qvk/HJnsFiIeNumEHXbdXskNNTvEWcCYhCP5fkton63ZyqrTgq/3nFYzh5nAVq6vS7QleHkF0J2gzgcEIxIOPjVezodvXOouLj6BDlBXjg1xi5YVfcLTtDSgAXYGmbyUG1xQR0aKlHw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIErTCCA5WgAwIBAgIJAM9nUkfn5v/9MA0GCSqGSIb3DQEBBQUAMIGVMQswCQYDVQQGEwJTRTEYMBYGA1UECBMPVkFTVFJBIEdPVEFMQU5EMRQwEgYDVQQHEwtUUk9MTEhBVFRBTjEYMBYGA1UEChMPVW5pdmVyc2l0eSBXZXN0MRgwFgYDVQQDEw90ZXN0LnBsYXkuaHYuc2UxIjAgBgkqhkiG9w0BCQEWE3NlcnZpY2VjZW50ZXJAaHYuc2UwHhcNMTYwOTEyMDg0NDIyWhcNMjYwOTEyMDg0NDIyWjCBlTELMAkGA1UEBhMCU0UxGDAWBgNVBAgTD1ZBU1RSQSBHT1RBTEFORDEUMBIGA1UEBxMLVFJPTExIQVRUQU4xGDAWBgNVBAoTD1VuaXZlcnNpdHkgV2VzdDEYMBYGA1UEAxMPdGVzdC5wbGF5Lmh2LnNlMSIwIAYJKoZIhvcNAQkBFhNzZXJ2aWNlY2VudGVyQGh2LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzBniiRbEgWb2J0M23JBCnN1eV1Jwo7ADA2IGGIWBCnoMIXvwwV8MNPheiqGsyk9NACziYYHYrfI0TSEXYqoFazgSi3Scgi0DnDLsAC1SGLZ1YFe89zobTVa8UiA9BetILu/WWI3R2qRRyfs9I66xS/Ic1uJxEe0ficoP/PvSNNyw++xXEfPYGcW52wgFPXiRIo3jtPlqn5lp0TL3XHQMx46aDLTChbahRJ6DTOycgCH+xvIUVlmd+JSDFb9ibqhcaEIwrbMaB6CXj9jH29SFPbAC8wf610mRG61A4EV98ogXQQnfksVPHxFrpHY+6kXIW59skIpi4a/dI/SQgErg7wIDAQABo4H9MIH6MB0GA1UdDgQWBBQI+XDNsL+ccq9XBhVIGhjYWTL/JzCBygYDVR0jBIHCMIG/gBQI+XDNsL+ccq9XBhVIGhjYWTL/J6GBm6SBmDCBlTELMAkGA1UEBhMCU0UxGDAWBgNVBAgTD1ZBU1RSQSBHT1RBTEFORDEUMBIGA1UEBxMLVFJPTExIQVRUQU4xGDAWBgNVBAoTD1VuaXZlcnNpdHkgV2VzdDEYMBYGA1UEAxMPdGVzdC5wbGF5Lmh2LnNlMSIwIAYJKoZIhvcNAQkBFhNzZXJ2aWNlY2VudGVyQGh2LnNlggkAz2dSR+fm//0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAW/7q/k2hjhpLhjn1zIq7DODR8TBZC253953M6gxGdVdfgMmTJU6jtqzt1r1qNwqfb8KWFghT/pFHgh4l0vHZBcgquKINJfKSGHXXYVfVsZLcno6uQfoqBoKm58W3MfpYJi+ZbCFih3UWqzBlCet6ikf83lVnlD0dinM3vp8WXrJoasOWZm3MgQ2+f9CrCLCj+7HcmXbt7L+Qvk/HJnsFiIeNumEHXbdXskNNTvEWcCYhCP5fkton63ZyqrTgq/3nFYzh5nAVq6vS7QleHkF0J2gzgcEIxIOPjVezodvXOouLj6BDlBXjg1xi5YVfcLTtDSgAXYGmbyUG1xQR0aKlHw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.play.hv.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://test.play.hv.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HV Play (Test)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HV Play (Test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://test.play.hv.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>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 9d9500ba..5f8e4f07 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -606,4 +606,6 @@
   <xi:include href="swamid-2.0/play.hhs.se.xml"/>
   <xi:include href="swamid-2.0/openexam.bmc.uu.se-simplesaml.xml"/>
   <xi:include href="swamid-2.0/rb.lbic.lu.se.xml"/>
+  <xi:include href="swamid-2.0/test.play.hv.se.xml"/>
+  <xi:include href="swamid-2.0/play.hv.se.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3