Merge branch 'master' of git.swamid.se:swamid-metadata

3 files changed, 48 insertions, 48 deletions

diff --git a/swamid-2.0/play.test.umu.se.xml b/swamid-2.0/play.test.umu.se.xml
new file mode 100644
index 00000000..56cee56b
--- /dev/null
+++ b/swamid-2.0/play.test.umu.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.test.umu.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">UMU Play TEST, Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">UMU Play TEST, Umeå University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Testmiljö för UMU Play video portal vid Umeå universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Test environment for UMU Play video portal at Umeå University</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICAjCCAWugAwIBAgIUYEbwpJ4cxcU0AES75Axk1t4u28kwDQYJKoZIhvcNAQEFBQAwLTEZMBcGA1UEAwwQcGxheS50ZXN0LnVtdS5zZTEQMA4GA1UECgwHa2FsdHVyYTAeFw0xODA0MTAwNzEzNTdaFw0xOTA0MTAwNzEzNTdaMC0xGTAXBgNVBAMMEHBsYXkudGVzdC51bXUuc2UxEDAOBgNVBAoMB2thbHR1cmEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPM+CTB0LmxgNUqs0ujpz8igBPrHapuDESOW3Y9gBNuTdXOjopZ9TbjUn0qxCOqOxKQCgEIoPfTJGrdNqwy9h3HEN6PIUFjzaW9ish4Uq3rxekJEY73H31CKaaXon/qACmkDuJknU+UJ6S2foek9MClQqOmCbBOGfiZT2k+/ff0LAgMBAAGjHzAdMBsGA1UdEQQUMBKCEHBsYXkudGVzdC51bXUuc2UwDQYJKoZIhvcNAQEFBQADgYEAJ/0PUk5khW30MK/zTXhT7F4D9cMqsVjnUy8/2auuPWV7EcIg3SkJq++5AUxF/AU2/+q4ynKz3HNY9KsF0vAgvgDv82oNA3V3GgMkLC5yRGriz/ab70VucLe1cEplNv5RTmzDmaPyDGk6z5b9PM0DCYS4KZ7dg54iFVRQCKK42pQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate/>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.test.umu.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.test.umu.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Umeå universitet (TEST)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Umeå universitet (TEST)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://play.test.umu.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-2.0/test.play.umu.se-sp-metadata.xml b/swamid-2.0/test.play.umu.se-sp-metadata.xml
deleted file mode 100644
index ef6d6aa5..00000000
--- a/swamid-2.0/test.play.umu.se-sp-metadata.xml
+++ /dev/null
@@ -1,47 +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://test.play.umu.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">UMU Play TEST, Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">UMU Play TEST, Umeå University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testmiljö för UMU Play video portal vid Umeå universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Test environment for UMU Play video portal at Umeå University</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJANuZJzaumGl5MA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJTRTENMAsGA1UECAwEVW1lYTENMAsGA1UEBwwEVW1lYTEbMBkGA1UECgwSVW1lw4PCpSBVbml2ZXJzaXR5MSAwHgYDVQQLDBdVSVRTIFVtZcODwqUgVW5pdmVyc2l0eTEZMBcGA1UEAwwQdGVzdC5wbGF5LnVtdS5zZTAeFw0xNjAyMTYwNzUxNTRaFw0yNjAyMTUwNzUxNTRaMIGFMQswCQYDVQQGEwJTRTENMAsGA1UECAwEVW1lYTENMAsGA1UEBwwEVW1lYTEbMBkGA1UECgwSVW1lw4PCpSBVbml2ZXJzaXR5MSAwHgYDVQQLDBdVSVRTIFVtZcODwqUgVW5pdmVyc2l0eTEZMBcGA1UEAwwQdGVzdC5wbGF5LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANPXTgaH55DxUu76/k7wCb8R3qpEFQt+YQbkwYAxsQV1os55/4wrtrEdF1HNWmd0F5PcXGJuwXdyZGvShjjN2V0UiXupWoQNgfglUh8rBC8jQsCeBjW46Ur5X5YFtJ1ffCMWX02ueb6kMQqxthjEqAhc3fuUEm3I2MKlRq1JvRB90TEyzGU6iLk+pVSaOUjvC/d4UulrX0miW2i+fXJIlWXOWTa3UpfKdzLN7GO42125SEGu7Bm1QS8PbK6+j+v7N74UODxuxc56w/IMzF+eaGLswhARD4nLSuvWWWV/fbDgvBvgn7kb2cnibDzZqHG8jo1gNjhZ41Fo3eF5nekj9HkCAwEAAaNQME4wHQYDVR0OBBYEFJQedZ17wBvl13/PCLkvnAgWxjfcMB8GA1UdIwQYMBaAFJQedZ17wBvl13/PCLkvnAgWxjfcMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAEKFqhbmSvvqPnFUzoXl+oObKHk5fZCsanFgCpZxzaLq1RtaL5LxFrPOYcQbox4rdzezINtMKEXr9zNdl2mqp6sTuq6fSTxxyuceFQuh6txNO6Ok1NGw7KQH/juOSazmdOuiNQTW2Fp905vB+yaTQi4jxR8Llo8Pr7gs9J3ddVsXI/BA/HyGMyfIwVHX5qeNWdQhZ6X8q5A6AjW5LbiHPQ5dlF7mST0rUFBeYhcD1jk1qlEujwvg/hRtvk6+SiJfjSPWHl4cvO6j/crf8DgrUCh9KLL5XmOyHzys/DMdYaKBjLajfnbzKL/D9pUtroPcPfVkzf/3gire5JG8sJmk4B4=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJANuZJzaumGl5MA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJTRTENMAsGA1UECAwEVW1lYTENMAsGA1UEBwwEVW1lYTEbMBkGA1UECgwSVW1lw4PCpSBVbml2ZXJzaXR5MSAwHgYDVQQLDBdVSVRTIFVtZcODwqUgVW5pdmVyc2l0eTEZMBcGA1UEAwwQdGVzdC5wbGF5LnVtdS5zZTAeFw0xNjAyMTYwNzUxNTRaFw0yNjAyMTUwNzUxNTRaMIGFMQswCQYDVQQGEwJTRTENMAsGA1UECAwEVW1lYTENMAsGA1UEBwwEVW1lYTEbMBkGA1UECgwSVW1lw4PCpSBVbml2ZXJzaXR5MSAwHgYDVQQLDBdVSVRTIFVtZcODwqUgVW5pdmVyc2l0eTEZMBcGA1UEAwwQdGVzdC5wbGF5LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANPXTgaH55DxUu76/k7wCb8R3qpEFQt+YQbkwYAxsQV1os55/4wrtrEdF1HNWmd0F5PcXGJuwXdyZGvShjjN2V0UiXupWoQNgfglUh8rBC8jQsCeBjW46Ur5X5YFtJ1ffCMWX02ueb6kMQqxthjEqAhc3fuUEm3I2MKlRq1JvRB90TEyzGU6iLk+pVSaOUjvC/d4UulrX0miW2i+fXJIlWXOWTa3UpfKdzLN7GO42125SEGu7Bm1QS8PbK6+j+v7N74UODxuxc56w/IMzF+eaGLswhARD4nLSuvWWWV/fbDgvBvgn7kb2cnibDzZqHG8jo1gNjhZ41Fo3eF5nekj9HkCAwEAAaNQME4wHQYDVR0OBBYEFJQedZ17wBvl13/PCLkvnAgWxjfcMB8GA1UdIwQYMBaAFJQedZ17wBvl13/PCLkvnAgWxjfcMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAEKFqhbmSvvqPnFUzoXl+oObKHk5fZCsanFgCpZxzaLq1RtaL5LxFrPOYcQbox4rdzezINtMKEXr9zNdl2mqp6sTuq6fSTxxyuceFQuh6txNO6Ok1NGw7KQH/juOSazmdOuiNQTW2Fp905vB+yaTQi4jxR8Llo8Pr7gs9J3ddVsXI/BA/HyGMyfIwVHX5qeNWdQhZ6X8q5A6AjW5LbiHPQ5dlF7mST0rUFBeYhcD1jk1qlEujwvg/hRtvk6+SiJfjSPWHl4cvO6j/crf8DgrUCh9KLL5XmOyHzys/DMdYaKBjLajfnbzKL/D9pUtroPcPfVkzf/3gire5JG8sJmk4B4=</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.umu.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.umu.se/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Umeå universitet (TEST)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå universitet (TEST)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://test.play.umu.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 80f4d814..d263e3ec 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -363,7 +363,6 @@
   <xi:include href="swamid-2.0/ni.sunet.se-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/luvit.education.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/test.play.umu.se-sp-metadata.xml"/>
   <xi:include href="swamid-2.0/www.test.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/scalear-staging2.herokuapp.com.xml"/>
   <xi:include href="swamid-2.0/test.scalable-learning.com.xml"/>
@@ -695,4 +694,5 @@
   <xi:include href="swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/acs-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
+  <xi:include href="swamid-2.0/play.test.umu.se.xml"/>
 </md:EntitiesDescriptor>