From 1a5b475fd8242cebb1c39b6a4be14e7f52e0418b Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 12 Jan 2016 19:17:31 +0100
Subject: resolves SWAMIDOPS-7956

---
 swamid-2.0/vartuppdrag.learnways.com.xml | 75 --------------------------------
 swamid-2.0/vartuppdrag.se.xml            | 75 ++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 75 deletions(-)
 delete mode 100644 swamid-2.0/vartuppdrag.learnways.com.xml
 create mode 100644 swamid-2.0/vartuppdrag.se.xml

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/vartuppdrag.learnways.com.xml b/swamid-2.0/vartuppdrag.learnways.com.xml
deleted file mode 100644
index 36f413da..00000000
--- a/swamid-2.0/vartuppdrag.learnways.com.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://vartuppdrag.learnways.com">
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" 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">Vårt uppdrag - Webbutbildning från Learnways</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Vårt uppdrag - Webbutbildning från Learnways</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Utbildningsportal för studenter på Göteborg, Malmö and Uppsala Universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Online education portal for university students at Göteborg, Malmö and Uppsala University
-</mdui:Description>
-        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://vartuppdrag.learnways.com</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://vartuppdrag.learnways.com</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEjCCAnugAwIBAgIJAJghEValKNWEMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
-VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
-EjAQBgNVBAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxIjAgBgNVBAMMGXZhcnR1
-cHBkcmFnLmxlYXJud2F5cy5jb20xJDAiBgkqhkiG9w0BCQEWFWZyZWRyaWtAbGVh
-cm53YXlzLmNvbTAgFw0xNTEyMTYwMzMyNDhaGA8yMjg5MDkzMDAzMzI0OFowgaAx
-CzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2Nr
-aG9sbTESMBAGA1UECgwJTGVhcm53YXlzMQswCQYDVQQLDAJJVDEiMCAGA1UEAwwZ
-dmFydHVwcGRyYWcubGVhcm53YXlzLmNvbTEkMCIGCSqGSIb3DQEJARYVZnJlZHJp
-a0BsZWFybndheXMuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDTkxzm
-FSQRULcNSwHV5RsiYHeIvMFkNz/oKbvVUaC+7EZwXn+0tEo85W5w5jRjzo/8I5We
-5SN2ezbIUDbAIa6kh+xVCXWePTwlhPUAIaS7tYovFeI5/ot/LVq+lKh08t2BlKuh
-C/PdOUhQs0mP/dc9V0qg41IH8mhdMSWFTp81nQIDAQABo1AwTjAdBgNVHQ4EFgQU
-CaKeOZUnV9uZYkMGbRD48KexxH4wHwYDVR0jBBgwFoAUCaKeOZUnV9uZYkMGbRD4
-8KexxH4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQDH/1xQmt6YlX3U
-fS0ZiINOEoi3soCY2nl6BW7XdijI4sexKKU9LZHulIco5fsgtVvc15+4/Xwq5eaQ
-kzpcJcl6MlzJGyuIHyva41XoLoRjdIu9ovgEZTVARCmnU+LPhHgg1YTb4VV0mTYL
-4sit2HnYR4v+PdNiJH6ah9KXIE1AMg==
-	  </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEjCCAnugAwIBAgIJAJghEValKNWEMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
-VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
-EjAQBgNVBAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxIjAgBgNVBAMMGXZhcnR1
-cHBkcmFnLmxlYXJud2F5cy5jb20xJDAiBgkqhkiG9w0BCQEWFWZyZWRyaWtAbGVh
-cm53YXlzLmNvbTAgFw0xNTEyMTYwMzMyNDhaGA8yMjg5MDkzMDAzMzI0OFowgaAx
-CzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2Nr
-aG9sbTESMBAGA1UECgwJTGVhcm53YXlzMQswCQYDVQQLDAJJVDEiMCAGA1UEAwwZ
-dmFydHVwcGRyYWcubGVhcm53YXlzLmNvbTEkMCIGCSqGSIb3DQEJARYVZnJlZHJp
-a0BsZWFybndheXMuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDTkxzm
-FSQRULcNSwHV5RsiYHeIvMFkNz/oKbvVUaC+7EZwXn+0tEo85W5w5jRjzo/8I5We
-5SN2ezbIUDbAIa6kh+xVCXWePTwlhPUAIaS7tYovFeI5/ot/LVq+lKh08t2BlKuh
-C/PdOUhQs0mP/dc9V0qg41IH8mhdMSWFTp81nQIDAQABo1AwTjAdBgNVHQ4EFgQU
-CaKeOZUnV9uZYkMGbRD48KexxH4wHwYDVR0jBBgwFoAUCaKeOZUnV9uZYkMGbRD4
-8KexxH4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQDH/1xQmt6YlX3U
-fS0ZiINOEoi3soCY2nl6BW7XdijI4sexKKU9LZHulIco5fsgtVvc15+4/Xwq5eaQ
-kzpcJcl6MlzJGyuIHyva41XoLoRjdIu9ovgEZTVARCmnU+LPhHgg1YTb4VV0mTYL
-4sit2HnYR4v+PdNiJH6ah9KXIE1AMg==
-	  </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://vartuppdrag.learnways.com/saml2/slo"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://vartuppdrag.learnways.com/saml2/acs" index="1"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Fredrik</md:GivenName>
-    <md:SurName>Croneborg</md:SurName>
-    <md:EmailAddress>fredrik.croneborg@learnways.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/vartuppdrag.se.xml b/swamid-2.0/vartuppdrag.se.xml
new file mode 100644
index 00000000..2ca3f7e4
--- /dev/null
+++ b/swamid-2.0/vartuppdrag.se.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vartuppdrag.se">
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" 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">Vårt uppdrag - Webbutbildning från Learnways</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Vårt uppdrag - Webbutbildning från Learnways</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Utbildningsportal för studenter på Göteborg, Malmö and Uppsala Universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Online education portal for university students at Göteborg, Malmö and Uppsala University
+</mdui:Description>
+        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://vartuppdrag.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://vartuppdrag.se</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEjCCAnugAwIBAgIJAJghEValKNWEMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
+VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
+EjAQBgNVBAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxIjAgBgNVBAMMGXZhcnR1
+cHBkcmFnLmxlYXJud2F5cy5jb20xJDAiBgkqhkiG9w0BCQEWFWZyZWRyaWtAbGVh
+cm53YXlzLmNvbTAgFw0xNTEyMTYwMzMyNDhaGA8yMjg5MDkzMDAzMzI0OFowgaAx
+CzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2Nr
+aG9sbTESMBAGA1UECgwJTGVhcm53YXlzMQswCQYDVQQLDAJJVDEiMCAGA1UEAwwZ
+dmFydHVwcGRyYWcubGVhcm53YXlzLmNvbTEkMCIGCSqGSIb3DQEJARYVZnJlZHJp
+a0BsZWFybndheXMuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDTkxzm
+FSQRULcNSwHV5RsiYHeIvMFkNz/oKbvVUaC+7EZwXn+0tEo85W5w5jRjzo/8I5We
+5SN2ezbIUDbAIa6kh+xVCXWePTwlhPUAIaS7tYovFeI5/ot/LVq+lKh08t2BlKuh
+C/PdOUhQs0mP/dc9V0qg41IH8mhdMSWFTp81nQIDAQABo1AwTjAdBgNVHQ4EFgQU
+CaKeOZUnV9uZYkMGbRD48KexxH4wHwYDVR0jBBgwFoAUCaKeOZUnV9uZYkMGbRD4
+8KexxH4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQDH/1xQmt6YlX3U
+fS0ZiINOEoi3soCY2nl6BW7XdijI4sexKKU9LZHulIco5fsgtVvc15+4/Xwq5eaQ
+kzpcJcl6MlzJGyuIHyva41XoLoRjdIu9ovgEZTVARCmnU+LPhHgg1YTb4VV0mTYL
+4sit2HnYR4v+PdNiJH6ah9KXIE1AMg==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEjCCAnugAwIBAgIJAJghEValKNWEMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
+VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
+EjAQBgNVBAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxIjAgBgNVBAMMGXZhcnR1
+cHBkcmFnLmxlYXJud2F5cy5jb20xJDAiBgkqhkiG9w0BCQEWFWZyZWRyaWtAbGVh
+cm53YXlzLmNvbTAgFw0xNTEyMTYwMzMyNDhaGA8yMjg5MDkzMDAzMzI0OFowgaAx
+CzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2Nr
+aG9sbTESMBAGA1UECgwJTGVhcm53YXlzMQswCQYDVQQLDAJJVDEiMCAGA1UEAwwZ
+dmFydHVwcGRyYWcubGVhcm53YXlzLmNvbTEkMCIGCSqGSIb3DQEJARYVZnJlZHJp
+a0BsZWFybndheXMuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDTkxzm
+FSQRULcNSwHV5RsiYHeIvMFkNz/oKbvVUaC+7EZwXn+0tEo85W5w5jRjzo/8I5We
+5SN2ezbIUDbAIa6kh+xVCXWePTwlhPUAIaS7tYovFeI5/ot/LVq+lKh08t2BlKuh
+C/PdOUhQs0mP/dc9V0qg41IH8mhdMSWFTp81nQIDAQABo1AwTjAdBgNVHQ4EFgQU
+CaKeOZUnV9uZYkMGbRD48KexxH4wHwYDVR0jBBgwFoAUCaKeOZUnV9uZYkMGbRD4
+8KexxH4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQDH/1xQmt6YlX3U
+fS0ZiINOEoi3soCY2nl6BW7XdijI4sexKKU9LZHulIco5fsgtVvc15+4/Xwq5eaQ
+kzpcJcl6MlzJGyuIHyva41XoLoRjdIu9ovgEZTVARCmnU+LPhHgg1YTb4VV0mTYL
+4sit2HnYR4v+PdNiJH6ah9KXIE1AMg==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vartuppdrag.se/saml2/slo"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vartuppdrag.se/saml2/acs" index="1"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Fredrik</md:GivenName>
+    <md:SurName>Croneborg</md:SurName>
+    <md:EmailAddress>mailto:fredrik.croneborg@learnways.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3