From 738d0afa59d3c3f6835baf6bf8a7df554d767c94 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 20 May 2015 21:49:46 +0200
Subject: Resolves SWAMIDOPS-7680 plus typo in GUs mdui

---
 swamid-2.0/play.gu.se.xml |  4 ++--
 swamid-2.0/play.sh.se.xml | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml        |  1 +
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 swamid-2.0/play.sh.se.xml

diff --git a/swamid-2.0/play.gu.se.xml b/swamid-2.0/play.gu.se.xml
index 18c09526..f24a8070 100644
--- a/swamid-2.0/play.gu.se.xml
+++ b/swamid-2.0/play.gu.se.xml
@@ -12,9 +12,9 @@
   <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">Gothenburg University Play service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Gothenburg Play service</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Göteborgs universitets Play tjänst</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is Gothenburg University's streaming service.</mdui:Description>
+        <mdui:Description xml:lang="en">This is the University of Gothenburg's streaming service.</mdui:Description>
         <mdui:Description xml:lang="sv">Detta är Göteborgs universitets play tjänst</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
diff --git a/swamid-2.0/play.sh.se.xml b/swamid-2.0/play.sh.se.xml
new file mode 100644
index 00000000..12785bfe
--- /dev/null
+++ b/swamid-2.0/play.sh.se.xml
@@ -0,0 +1,48 @@
+<?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.sh.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: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">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Södertörns högskola playtjänst</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Södertörn University play service</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Denna tjänst används för presentationer av video från Södertörns högskola</mdui:Description>
+        <mdui:Description xml:lang="en">This service is for presentation of videos from Södertörn University</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIJAJXnyhdCBNHCMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xJTAjBgNVBAoMHFPDg8K2ZGVydMODwrZybnMgaMODwrZnc2tvbGExIjAgBgNVBAsTGUtvbW11bmlrYXRpb25zYXZkZWxuaW5nZW4xDjAMBgNVBAMTBXNoLnNlMSIwIAYJKoZIhvcNAQkBFhN2aWN0b3IudGFrYWxhQHNoLnNlMB4XDTE1MDUxOTEzMDUwM1oXDTI1MDUxODEzMDUwM1owgbQxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTElMCMGA1UECgwcU8ODwrZkZXJ0w4PCtnJucyBow4PCtmdza29sYTEiMCAGA1UECxMZS29tbXVuaWthdGlvbnNhdmRlbG5pbmdlbjEOMAwGA1UEAxMFc2guc2UxIjAgBgkqhkiG9w0BCQEWE3ZpY3Rvci50YWthbGFAc2guc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDzKZvI68AvFpPB7gPGStjdoP3qNcZ+rRhja/g9bqHFG8I8dIIuZofQm90ocbcxgpN64jTJZeAEF/xuxQ9u/iYwn6Hj3GkE+iuSHNUabiCdVzXHe+cBLn/yS3KmNC6nCiPoU/5n7eq6Va5XBBmyuGI5C4j+S3tVoE0mdaFkNmu702sM614ZiKjfYRbiIdS6DiOzNPTt+5u/XTT5rLMZN7e03oC5azemOdsZg4+8l806o87IdYbup0hbWlYkxQ1OnZvSIAbELO7b+x5jUX9J/Ji7SNyeKczhCdrMchetZ9DBD6FMMfdUx1uSzsUL948dVOCQQZwDwHHtaqJCMoVvEAzAgMBAAGjggEdMIIBGTAdBgNVHQ4EFgQUC+B8XXvoeKf4T1Wfqiu5J0lH9hUwgekGA1UdIwSB4TCB3oAUC+B8XXvoeKf4T1Wfqiu5J0lH9hWhgbqkgbcwgbQxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTElMCMGA1UECgwcU8ODwrZkZXJ0w4PCtnJucyBow4PCtmdza29sYTEiMCAGA1UECxMZS29tbXVuaWthdGlvbnNhdmRlbG5pbmdlbjEOMAwGA1UEAxMFc2guc2UxIjAgBgkqhkiG9w0BCQEWE3ZpY3Rvci50YWthbGFAc2guc2WCCQCV58oXQgTRwjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAN48PSCUBP6gOhTIJotICpMDxnK2Nd8UdxnR4rlb7i4jEhMoFU4Z9AOyKxRFA9Z7j7f7vIiN64jORoIWV3VbSaQbz7Xk9j8YQSbnL1gNKVDJqqF8QtGViEYWop6RgvyH7E2ehxMZa6WyOhNM24Ag5mvHZxL9iMjI5y6aSxcMQXzCDNguV+CmXKb67pwzjdqhlMSuWwaKba3KH3orQHPdATNXNStayQLsVE/SjBc2AZryjp/FEEIVn/v6uuUJoPURXFjk5ut9FF24tZp+ysUcIYr5FkdNjglPB54LK2r6CidotZrL13iwANveSviwE7WtFKpZ3c+ouUFoEFLhgAYASV</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIJAJXnyhdCBNHCMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xJTAjBgNVBAoMHFPDg8K2ZGVydMODwrZybnMgaMODwrZnc2tvbGExIjAgBgNVBAsTGUtvbW11bmlrYXRpb25zYXZkZWxuaW5nZW4xDjAMBgNVBAMTBXNoLnNlMSIwIAYJKoZIhvcNAQkBFhN2aWN0b3IudGFrYWxhQHNoLnNlMB4XDTE1MDUxOTEzMDUwM1oXDTI1MDUxODEzMDUwM1owgbQxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTElMCMGA1UECgwcU8ODwrZkZXJ0w4PCtnJucyBow4PCtmdza29sYTEiMCAGA1UECxMZS29tbXVuaWthdGlvbnNhdmRlbG5pbmdlbjEOMAwGA1UEAxMFc2guc2UxIjAgBgkqhkiG9w0BCQEWE3ZpY3Rvci50YWthbGFAc2guc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDzKZvI68AvFpPB7gPGStjdoP3qNcZ+rRhja/g9bqHFG8I8dIIuZofQm90ocbcxgpN64jTJZeAEF/xuxQ9u/iYwn6Hj3GkE+iuSHNUabiCdVzXHe+cBLn/yS3KmNC6nCiPoU/5n7eq6Va5XBBmyuGI5C4j+S3tVoE0mdaFkNmu702sM614ZiKjfYRbiIdS6DiOzNPTt+5u/XTT5rLMZN7e03oC5azemOdsZg4+8l806o87IdYbup0hbWlYkxQ1OnZvSIAbELO7b+x5jUX9J/Ji7SNyeKczhCdrMchetZ9DBD6FMMfdUx1uSzsUL948dVOCQQZwDwHHtaqJCMoVvEAzAgMBAAGjggEdMIIBGTAdBgNVHQ4EFgQUC+B8XXvoeKf4T1Wfqiu5J0lH9hUwgekGA1UdIwSB4TCB3oAUC+B8XXvoeKf4T1Wfqiu5J0lH9hWhgbqkgbcwgbQxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTElMCMGA1UECgwcU8ODwrZkZXJ0w4PCtnJucyBow4PCtmdza29sYTEiMCAGA1UECxMZS29tbXVuaWthdGlvbnNhdmRlbG5pbmdlbjEOMAwGA1UEAxMFc2guc2UxIjAgBgkqhkiG9w0BCQEWE3ZpY3Rvci50YWthbGFAc2guc2WCCQCV58oXQgTRwjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAN48PSCUBP6gOhTIJotICpMDxnK2Nd8UdxnR4rlb7i4jEhMoFU4Z9AOyKxRFA9Z7j7f7vIiN64jORoIWV3VbSaQbz7Xk9j8YQSbnL1gNKVDJqqF8QtGViEYWop6RgvyH7E2ehxMZa6WyOhNM24Ag5mvHZxL9iMjI5y6aSxcMQXzCDNguV+CmXKb67pwzjdqhlMSuWwaKba3KH3orQHPdATNXNStayQLsVE/SjBc2AZryjp/FEEIVn/v6uuUJoPURXFjk5ut9FF24tZp+ysUcIYr5FkdNjglPB54LK2r6CidotZrL13iwANveSviwE7WtFKpZ3c+ouUFoEFLhgAYASV</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.sh.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.sh.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Södertörns högskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Södertörns högskola</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://play.sh.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 57771158..84fb8077 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -439,4 +439,5 @@
   <xi:include href="swamid-2.0/test-nais.i.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kau.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.gu.se.xml"/>
+  <xi:include href="swamid-2.0/play.sh.se.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3