Remove old Kau test IdPs ; Add new Shib 3 IdP preprod

4 files changed, 223 insertions, 458 deletions

diff --git a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
deleted file mode 100644
index b1e1aa11..00000000
--- a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://weblogin-test.kau.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Karlstads universitet Shib 3.2 Test Extra Config</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karlstad University Shib 3.2 Test Extra Config</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Shib 3 Test Identity Provider för Karlstads universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Shib 3 Test Identity Provider for Karlstad University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
-        <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kau.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
-        <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUaN+mKKpQaU7v+8GzaBWQzDo7DBowDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMzEyMTIx
-MjQ5WhcNMzYwMzEyMTIxMjQ5WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKT6XhoTzvsMqo0A
-FRrC6YpUYOGW5iU9WHI5E7k6LwsGYxq7GITtomr6W9UcQOhQL0nGON3scGpcfh6J
-Ztdo1k9eVtTnzlNsrbbBYtV1rzlz7i66A6NMU9GP2ENOF5nGBxNcxivWohNZbrQa
-OKzEnZ70ST0Htmqi83Fc1jfHpAppj45N2vOaLbpkolb2Cj34N3kfyMQqEhcAaUDm
-NpcfxownvX5ixso6WVaIqt2hJeuw4YdQBKcEuuwRT4xQ8ufvmx3LoK0NE36B6PVb
-bsF9QZEbyegrM9JBzvK2gHUZoJoO0RBErcB7zNGX3JaHlNifBxcawzYN+blAXk/+
-ZZQJpQ0CAwEAAaNvMG0wHQYDVR0OBBYEFJuiJDrd3ObSxhevH12JPn43YVhiMEwG
-A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
-LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBf
-G3PVIs+ZwDNJ7pPxEWNFSZ2WZLzqMNI8KGt8Yf5qShx0lwCVzQze08UT/1AW4Qc5
-QWY+xLxABIrt6YObV3MWiw4TTt8xA9NduBvcl4bjmJ3dOnbi49fAxHc4aIszrjIj
-/PPizFmx8xMJrIt1UpjXqAEbu6gp7aieJL0uEmclp/qZOuqXs73rrOpuhrdp8EZX
-6iXLsGGGFGWNlN3n2MWi7NUa7hMrPSNPnKmjkUDorKr5ZwcG+KUI8claNUKvBdWi
-D5lvLIy+27xm3DjQehzUTKwva/nDhEyWL7+etkn2XvdmYzifwGlFDMKGomNbOeLO
-k/PMUydRWY4NsAGRdlW+
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUbQ2ZsdUwqDQ83lqCKSpybQD4L9IwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMzEyMTIx
-MjQ4WhcNMzYwMzEyMTIxMjQ4WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI9ied2RHMbRA8U
-zbxIjsbfemKxZZivBFuWw5GlP8dA8fJnWjCLiZ/B/YWy7QCI3sI8ZlFPK5KOl5jF
-khTca4EI6tfceohEhmJhZBuFCnBl70cVo5U2z03qFtKevjcSto2k063MtQ3msDNf
-jE8OXJeklNYX87ne4PPmI3G9PlZrMjVI97xbTkgwYgRj7uCB7zU9b0LxRackdV9y
-iTkHFRuPOak8OQPop9FHU+YjUUggZwiVn8S0yZpre2uREf0BfGkXwBdSQf2UllX6
-OY/U9aJuXNRwnEpVd5ALvcISECKtFZCmlKzerh6dEKON61q22PNLYnRARe6iTqZ/
-HKct+MUCAwEAAaNvMG0wHQYDVR0OBBYEFAnfCJ3mh+/1vIKJw9mRq6aPfVkFMEwG
-A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
-LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCG
-IDFdq7Gfja8LRuSDGAt4D8pwYvDGluEqxPdPfPvzLLzcQ87Ke072/Jlk6yk563v5
-fxFvOfeuelxHTUbUbeu7ig9maVzE4iyEzBwO+ideyIfagvKPAturkBxlXu9rmMCK
-OMLHz+IS4tfZ0hSEuVOf/n5vBdcsmEFvRBKl2SVaAhJIj2CqNc5S1xCTyj/2Xmox
-GU47J7GZkCdMrcaQEwgLW+ATKCBXRYhwfKIVRpoB+LpYrXGMmi9j4bfGHbHF0zxm
-k9MHz9eszrmTNiBWSbRfIH6N+XoooIZmgR/TSy9poJXNLYMWPy/BMKLi1eDY2Buz
-p7akttAl2GLD4OSXvCYA
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAKER/mP4HA9XsC+pd3aejETEODsHMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFHdlYmxvZ2luLXRlc3Qua2F1LnNlMB4XDTE2MDMxMjEy
-MTI0OVoXDTM2MDMxMjEyMTI0OVowHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5r
-YXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKv3unN9QyCPAa
-3uV7J+OMuyreCQn/xEtijZOLuikw6lZj2Yh2zmc4t11i5MTM9bMwLPfHZN8HRTeo
-ywwqYZMe8xNn45Jb8iDE4hMDKbHelqjvnQYZBOZsOK/nKMqfnvupuBq53qu8BfNM
-1EZplnx4znDE71LKW0PBWN8AVCjGF9SJnhwdeIs4/pm6Exz1tDLnUhTwmT1Pu0q3
-Eujl1OO9qhHc7QpNIbaVgwF/2c/4kd1R6rlJzXqh4yRZaYLtl4bfTVXPn+NGG3YU
-fH4Kk/qabHzwYW2OZ0nyiktUxUcsWtLsmF6D3eagpzS0GAiAHWS+ooxD7WctUuB+
-5zhex7YrAgMBAAGjbzBtMB0GA1UdDgQWBBSSJxYExMnKgHbNtx6m9Ds4tDln+jBM
-BgNVHREERTBDghR3ZWJsb2dpbi10ZXN0LmthdS5zZYYraHR0cHM6Ly93ZWJsb2dp
-bi10ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-cbhq9Slo24nOMUG5WImD3Q/nVWQk4JUrKaJVFEFDfVmvZnaRzoz7tnaSEoSXfShr
-K9fL64y98FLWMmL/Ps7noTls1H1T/B9FCgWRd1Ck40rnrPr3TkOZQE0OrZFXJUW2
-igZjna9pxb9LuJpo5uSuz1m3lKaiV8QFrolvpy705jETE5+qCNPfaU1fWCYhCDUw
-vnk2FNf07yLBGIiibleYd60rdP0uiyvtWYb4cNn5dMzrMSUILNwXjR7tHdXUZjqW
-dWxDXEgV+GOZVrYg8nnNmeQZ/16GO3EAuqMMN9n1qYlMQKkwEPIaX/WGeu0gIhlt
-OFd2AiNzPV7MdiKPOCUPXg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin-test.kau.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin-test.kau.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin-test.kau.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUaN+mKKpQaU7v+8GzaBWQzDo7DBowDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMzEyMTIx
-MjQ5WhcNMzYwMzEyMTIxMjQ5WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKT6XhoTzvsMqo0A
-FRrC6YpUYOGW5iU9WHI5E7k6LwsGYxq7GITtomr6W9UcQOhQL0nGON3scGpcfh6J
-Ztdo1k9eVtTnzlNsrbbBYtV1rzlz7i66A6NMU9GP2ENOF5nGBxNcxivWohNZbrQa
-OKzEnZ70ST0Htmqi83Fc1jfHpAppj45N2vOaLbpkolb2Cj34N3kfyMQqEhcAaUDm
-NpcfxownvX5ixso6WVaIqt2hJeuw4YdQBKcEuuwRT4xQ8ufvmx3LoK0NE36B6PVb
-bsF9QZEbyegrM9JBzvK2gHUZoJoO0RBErcB7zNGX3JaHlNifBxcawzYN+blAXk/+
-ZZQJpQ0CAwEAAaNvMG0wHQYDVR0OBBYEFJuiJDrd3ObSxhevH12JPn43YVhiMEwG
-A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
-LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBf
-G3PVIs+ZwDNJ7pPxEWNFSZ2WZLzqMNI8KGt8Yf5qShx0lwCVzQze08UT/1AW4Qc5
-QWY+xLxABIrt6YObV3MWiw4TTt8xA9NduBvcl4bjmJ3dOnbi49fAxHc4aIszrjIj
-/PPizFmx8xMJrIt1UpjXqAEbu6gp7aieJL0uEmclp/qZOuqXs73rrOpuhrdp8EZX
-6iXLsGGGFGWNlN3n2MWi7NUa7hMrPSNPnKmjkUDorKr5ZwcG+KUI8claNUKvBdWi
-D5lvLIy+27xm3DjQehzUTKwva/nDhEyWL7+etkn2XvdmYzifwGlFDMKGomNbOeLO
-k/PMUydRWY4NsAGRdlW+
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUbQ2ZsdUwqDQ83lqCKSpybQD4L9IwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMzEyMTIx
-MjQ4WhcNMzYwMzEyMTIxMjQ4WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
-dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI9ied2RHMbRA8U
-zbxIjsbfemKxZZivBFuWw5GlP8dA8fJnWjCLiZ/B/YWy7QCI3sI8ZlFPK5KOl5jF
-khTca4EI6tfceohEhmJhZBuFCnBl70cVo5U2z03qFtKevjcSto2k063MtQ3msDNf
-jE8OXJeklNYX87ne4PPmI3G9PlZrMjVI97xbTkgwYgRj7uCB7zU9b0LxRackdV9y
-iTkHFRuPOak8OQPop9FHU+YjUUggZwiVn8S0yZpre2uREf0BfGkXwBdSQf2UllX6
-OY/U9aJuXNRwnEpVd5ALvcISECKtFZCmlKzerh6dEKON61q22PNLYnRARe6iTqZ/
-HKct+MUCAwEAAaNvMG0wHQYDVR0OBBYEFAnfCJ3mh+/1vIKJw9mRq6aPfVkFMEwG
-A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
-LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCG
-IDFdq7Gfja8LRuSDGAt4D8pwYvDGluEqxPdPfPvzLLzcQ87Ke072/Jlk6yk563v5
-fxFvOfeuelxHTUbUbeu7ig9maVzE4iyEzBwO+ideyIfagvKPAturkBxlXu9rmMCK
-OMLHz+IS4tfZ0hSEuVOf/n5vBdcsmEFvRBKl2SVaAhJIj2CqNc5S1xCTyj/2Xmox
-GU47J7GZkCdMrcaQEwgLW+ATKCBXRYhwfKIVRpoB+LpYrXGMmi9j4bfGHbHF0zxm
-k9MHz9eszrmTNiBWSbRfIH6N+XoooIZmgR/TSy9poJXNLYMWPy/BMKLi1eDY2Buz
-p7akttAl2GLD4OSXvCYA
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAKER/mP4HA9XsC+pd3aejETEODsHMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFHdlYmxvZ2luLXRlc3Qua2F1LnNlMB4XDTE2MDMxMjEy
-MTI0OVoXDTM2MDMxMjEyMTI0OVowHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5r
-YXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKv3unN9QyCPAa
-3uV7J+OMuyreCQn/xEtijZOLuikw6lZj2Yh2zmc4t11i5MTM9bMwLPfHZN8HRTeo
-ywwqYZMe8xNn45Jb8iDE4hMDKbHelqjvnQYZBOZsOK/nKMqfnvupuBq53qu8BfNM
-1EZplnx4znDE71LKW0PBWN8AVCjGF9SJnhwdeIs4/pm6Exz1tDLnUhTwmT1Pu0q3
-Eujl1OO9qhHc7QpNIbaVgwF/2c/4kd1R6rlJzXqh4yRZaYLtl4bfTVXPn+NGG3YU
-fH4Kk/qabHzwYW2OZ0nyiktUxUcsWtLsmF6D3eagpzS0GAiAHWS+ooxD7WctUuB+
-5zhex7YrAgMBAAGjbzBtMB0GA1UdDgQWBBSSJxYExMnKgHbNtx6m9Ds4tDln+jBM
-BgNVHREERTBDghR3ZWJsb2dpbi10ZXN0LmthdS5zZYYraHR0cHM6Ly93ZWJsb2dp
-bi10ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-cbhq9Slo24nOMUG5WImD3Q/nVWQk4JUrKaJVFEFDfVmvZnaRzoz7tnaSEoSXfShr
-K9fL64y98FLWMmL/Ps7noTls1H1T/B9FCgWRd1Ck40rnrPr3TkOZQE0OrZFXJUW2
-igZjna9pxb9LuJpo5uSuz1m3lKaiV8QFrolvpy705jETE5+qCNPfaU1fWCYhCDUw
-vnk2FNf07yLBGIiibleYd60rdP0uiyvtWYb4cNn5dMzrMSUILNwXjR7tHdXUZjqW
-dWxDXEgV+GOZVrYg8nnNmeQZ/16GO3EAuqMMN9n1qYlMQKkwEPIaX/WGeu0gIhlt
-OFd2AiNzPV7MdiKPOCUPXg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KAU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Karlstads universitet Shib 3.2 Test Extra Config</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Karlstad University Shib 3.2 Test Extra Config</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>Karlstad University</Company>
-    <SurName>Paul Scott</SurName>
-    <EmailAddress>mailto:paul.scott@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen Karlstads universitet</SurName>
-    <EmailAddress>mailto:datasupport@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0/weblogin-test2.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test2.kau.se-idp-shibboleth.xml
deleted file mode 100644
index aa88c050..00000000
--- a/swamid-2.0/weblogin-test2.kau.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://weblogin-test2.kau.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Karlstads universitet Shib 3.2 Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karlstad University Shib 3.2 Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Shib 3 Test Identity Provider för Karlstads universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Shib 3 Test Identity Provider for Karlstad University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
-        <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>kau.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
-        <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIULKFv582yW+7nwnlV6miCwNM5+gswDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVd2VibG9naW4tdGVzdDIua2F1LnNlMB4XDTE2MDMwOTE2
-NTA1MloXDTM2MDMwOTE2NTA1MlowIDEeMBwGA1UEAwwVd2VibG9naW4tdGVzdDIu
-a2F1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhLq868nxQrZX
-eAkx/O6xyHnCeSXDUXgAVvlXc1xS/x44+hvZ4zZLtS62l5bLPLwlrzmAi0AzFxjF
-ESyV813sJEcftWiCR269kUSTaR5xs9AxaAXyMGMGIjVb/5eWb83uTmMy1nhTWHsD
-6DVrwSut1wm4SBB8QqdXElktZV00kW+i7Iot6Pu3eu/uVLF7fsfTEGeugyTu0pRX
-Ea0f0IrDtNwzF7grZWOMGvGGEyTodyoMcBkK+imswG0AGZrQ3kdww1Lcf08xdKFG
-g/rkYiIz6j5hP4zjJOw3zuPeYug19ze9nxukBALcoRAwn1sSqFYIGr9VWWhSHCJB
-3OAx64yaPQIDAQABo3EwbzAdBgNVHQ4EFgQUShZDYIT4n42L3ShcE54Y7XkvTx0w
-TgYDVR0RBEcwRYIVd2VibG9naW4tdGVzdDIua2F1LnNlhixodHRwczovL3dlYmxv
-Z2luLXRlc3QyLmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAAXgCjiDeTmwQa5l4SWldhSR7AM0JxDr4iSrGz48x60M+V2H4tVwlcTFQvRLa
-IYxXybvTvyb38nTCLPOQjQJJdFLL+A6YiYQwK9ZDZhz1ajCY85nSntG6xsBbvzN2
-F2o0WH4QMHkWZqBKACPBRfRaotSVaq4qcMp0SYBoUKkS+2zb4svbsTadek1o5osz
-3rjQsz2tvUOLsMihdcQJK8vxW29TrLispGeVCZngGROUKQDcVRnS7W5hcRj3sFAi
-q0+WEK9XrBuj+vLlOi/+MX+EwEx2rmtp9gEUj2dM6uuQJ2+V80LVHtZlOlqzZCch
-nV9Kpy0ZNxep1b7AIb2+zGuTAw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAMjUY6EPTpmvL13VIEEfp3oy1vxYMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3QyLmthdS5zZTAeFw0xNjAzMDkx
-NjUwNTFaFw0zNjAzMDkxNjUwNTFaMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3Qy
-LmthdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKT0+TVuk2yS
-QugObH9b8hZ9t7K7jhFK96Da851sQ5JgPj7KdO4U8WVlCVrAmlxOHFJJfg0jDLwe
-ocowhuT7eRxU6I6XZo8Lw9zoVHetMQPyxubcZMKSw7p6u5dGvORVNDmN35azSF+e
-KiQHaC3BaxQiKEXdYkygj9xq0jDJhX9W17bbHXnea93tqPGoYarFIexK8HE56rCj
-W+5d9atXEiy/Knsx1DobvQKYQAgvdSmiy9kQ42DF6c/QykVtzVnWq/CgStn/vBDI
-VjG5z3wi3zl3BgXNEpLezbNS+CEfF6NHyrjBWuxYB64dzUWz1Vm6tIxiXxJoS1oD
-W3gvW2Nk+N0CAwEAAaNxMG8wHQYDVR0OBBYEFGfystdfl5ePiZyJtcdJK7eeH1XT
-ME4GA1UdEQRHMEWCFXdlYmxvZ2luLXRlc3QyLmthdS5zZYYsaHR0cHM6Ly93ZWJs
-b2dpbi10ZXN0Mi5rYXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAEzvMHkk74OUd0YlmStjD7jD68R2g3zerzKQX2HYAVL/CW6nG8Vc2+GN7q9v
-qYJhzreM+wj/QveeB33bysu2N7uel781e2NV/GwvgtczOfWov1hue5tRpDe0Raio
-8XtQltWFmiT6/A/3QZ10KyLf5ffOwolSrfGiJcHSheEvcyIZ5HtHpLaq70AWcmhj
-bXt4mWapugsFlE8Z4tUmCk9qLjxK9OHl05zQQAwL7bGhVa9WaccfTw4zCzb4c8ud
-1mLrxa3HlV7lU34v13q+cGaLJy1AfZT/Q0eHubc4LR9hR5BXIEig7qPuLmqtMZ29
-vwis6DM4uwOtx2YJmQyRSiDBlws=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVALmfWHfhMu3Y3sCzR49H/oo5Tuq3MA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3QyLmthdS5zZTAeFw0xNjAzMDkx
-NjUwNTFaFw0zNjAzMDkxNjUwNTFaMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3Qy
-LmthdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcL48pPQicI
-B+0Hl9TTdZrDU4lBNyvC3yO31wupHtJFiQhonvouCyexGim6VuKtOhdd/G3FLTcp
-o8IKbFWZ5jtH8Po6P9djSlFYlI30WlMeC4SLvPD3eXGEW4KzXmoWIEmlYlsZW3+q
-iHDwqoBLt6aBjyyr/FMGhbP2N88JjoOje1vmiZlp7WAPx8p05LlJ1aaW7Y2h0u9T
-466o72UJl2bHPxMn+zr9wAr2yf95etBNuGFw4I9VEP0ruV6smjd3SZgTQJXiHtCU
-Hp0M3rY0C1e5zWw/quz1rkfKU2U1E3VlRkow+yvfpD7d7AtAqqoukR0EfWOHM8Ko
-Z7HHRbC3SuECAwEAAaNxMG8wHQYDVR0OBBYEFBtf1Muz/KnsSB7uwo//e9sv4fMw
-ME4GA1UdEQRHMEWCFXdlYmxvZ2luLXRlc3QyLmthdS5zZYYsaHR0cHM6Ly93ZWJs
-b2dpbi10ZXN0Mi5rYXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAFz074dEuL/dHvJbEJf5/T49ixnQMg3vD0WcT5ov2PDCh9QnUO06bg67etkC
-c+irCY0LMoauxfwD1ImEYUmTUw/JjOqxvhOqm6ThA/ovSMufunMK07h8Txrd3AX2
-RD0WSu8Cd02o51ltItNmoxuKLnJbBRk64jrOs15kKn6yqWYflo98jjFy6nnivlr8
-UC/aVcmaaZYkkAHklosfK/8Tom70Ytga9ftSK8VcD5R/JBWRW1955Fl6A751rbww
-GIpQ2zwTVgAm8HJCF9uQVP5xnYD31Kal0u/QH4XjAbioEt1ci86acVanLoErvpwc
-d3vJ61Fswk4paWfQlUhCh/M5sDY=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test2.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test2.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin-test2.kau.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin-test2.kau.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin-test2.kau.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIULKFv582yW+7nwnlV6miCwNM5+gswDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVd2VibG9naW4tdGVzdDIua2F1LnNlMB4XDTE2MDMwOTE2
-NTA1MloXDTM2MDMwOTE2NTA1MlowIDEeMBwGA1UEAwwVd2VibG9naW4tdGVzdDIu
-a2F1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhLq868nxQrZX
-eAkx/O6xyHnCeSXDUXgAVvlXc1xS/x44+hvZ4zZLtS62l5bLPLwlrzmAi0AzFxjF
-ESyV813sJEcftWiCR269kUSTaR5xs9AxaAXyMGMGIjVb/5eWb83uTmMy1nhTWHsD
-6DVrwSut1wm4SBB8QqdXElktZV00kW+i7Iot6Pu3eu/uVLF7fsfTEGeugyTu0pRX
-Ea0f0IrDtNwzF7grZWOMGvGGEyTodyoMcBkK+imswG0AGZrQ3kdww1Lcf08xdKFG
-g/rkYiIz6j5hP4zjJOw3zuPeYug19ze9nxukBALcoRAwn1sSqFYIGr9VWWhSHCJB
-3OAx64yaPQIDAQABo3EwbzAdBgNVHQ4EFgQUShZDYIT4n42L3ShcE54Y7XkvTx0w
-TgYDVR0RBEcwRYIVd2VibG9naW4tdGVzdDIua2F1LnNlhixodHRwczovL3dlYmxv
-Z2luLXRlc3QyLmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAAXgCjiDeTmwQa5l4SWldhSR7AM0JxDr4iSrGz48x60M+V2H4tVwlcTFQvRLa
-IYxXybvTvyb38nTCLPOQjQJJdFLL+A6YiYQwK9ZDZhz1ajCY85nSntG6xsBbvzN2
-F2o0WH4QMHkWZqBKACPBRfRaotSVaq4qcMp0SYBoUKkS+2zb4svbsTadek1o5osz
-3rjQsz2tvUOLsMihdcQJK8vxW29TrLispGeVCZngGROUKQDcVRnS7W5hcRj3sFAi
-q0+WEK9XrBuj+vLlOi/+MX+EwEx2rmtp9gEUj2dM6uuQJ2+V80LVHtZlOlqzZCch
-nV9Kpy0ZNxep1b7AIb2+zGuTAw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAMjUY6EPTpmvL13VIEEfp3oy1vxYMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3QyLmthdS5zZTAeFw0xNjAzMDkx
-NjUwNTFaFw0zNjAzMDkxNjUwNTFaMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3Qy
-LmthdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKT0+TVuk2yS
-QugObH9b8hZ9t7K7jhFK96Da851sQ5JgPj7KdO4U8WVlCVrAmlxOHFJJfg0jDLwe
-ocowhuT7eRxU6I6XZo8Lw9zoVHetMQPyxubcZMKSw7p6u5dGvORVNDmN35azSF+e
-KiQHaC3BaxQiKEXdYkygj9xq0jDJhX9W17bbHXnea93tqPGoYarFIexK8HE56rCj
-W+5d9atXEiy/Knsx1DobvQKYQAgvdSmiy9kQ42DF6c/QykVtzVnWq/CgStn/vBDI
-VjG5z3wi3zl3BgXNEpLezbNS+CEfF6NHyrjBWuxYB64dzUWz1Vm6tIxiXxJoS1oD
-W3gvW2Nk+N0CAwEAAaNxMG8wHQYDVR0OBBYEFGfystdfl5ePiZyJtcdJK7eeH1XT
-ME4GA1UdEQRHMEWCFXdlYmxvZ2luLXRlc3QyLmthdS5zZYYsaHR0cHM6Ly93ZWJs
-b2dpbi10ZXN0Mi5rYXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAEzvMHkk74OUd0YlmStjD7jD68R2g3zerzKQX2HYAVL/CW6nG8Vc2+GN7q9v
-qYJhzreM+wj/QveeB33bysu2N7uel781e2NV/GwvgtczOfWov1hue5tRpDe0Raio
-8XtQltWFmiT6/A/3QZ10KyLf5ffOwolSrfGiJcHSheEvcyIZ5HtHpLaq70AWcmhj
-bXt4mWapugsFlE8Z4tUmCk9qLjxK9OHl05zQQAwL7bGhVa9WaccfTw4zCzb4c8ud
-1mLrxa3HlV7lU34v13q+cGaLJy1AfZT/Q0eHubc4LR9hR5BXIEig7qPuLmqtMZ29
-vwis6DM4uwOtx2YJmQyRSiDBlws=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVALmfWHfhMu3Y3sCzR49H/oo5Tuq3MA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3QyLmthdS5zZTAeFw0xNjAzMDkx
-NjUwNTFaFw0zNjAzMDkxNjUwNTFaMCAxHjAcBgNVBAMMFXdlYmxvZ2luLXRlc3Qy
-LmthdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcL48pPQicI
-B+0Hl9TTdZrDU4lBNyvC3yO31wupHtJFiQhonvouCyexGim6VuKtOhdd/G3FLTcp
-o8IKbFWZ5jtH8Po6P9djSlFYlI30WlMeC4SLvPD3eXGEW4KzXmoWIEmlYlsZW3+q
-iHDwqoBLt6aBjyyr/FMGhbP2N88JjoOje1vmiZlp7WAPx8p05LlJ1aaW7Y2h0u9T
-466o72UJl2bHPxMn+zr9wAr2yf95etBNuGFw4I9VEP0ruV6smjd3SZgTQJXiHtCU
-Hp0M3rY0C1e5zWw/quz1rkfKU2U1E3VlRkow+yvfpD7d7AtAqqoukR0EfWOHM8Ko
-Z7HHRbC3SuECAwEAAaNxMG8wHQYDVR0OBBYEFBtf1Muz/KnsSB7uwo//e9sv4fMw
-ME4GA1UdEQRHMEWCFXdlYmxvZ2luLXRlc3QyLmthdS5zZYYsaHR0cHM6Ly93ZWJs
-b2dpbi10ZXN0Mi5rYXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAFz074dEuL/dHvJbEJf5/T49ixnQMg3vD0WcT5ov2PDCh9QnUO06bg67etkC
-c+irCY0LMoauxfwD1ImEYUmTUw/JjOqxvhOqm6ThA/ovSMufunMK07h8Txrd3AX2
-RD0WSu8Cd02o51ltItNmoxuKLnJbBRk64jrOs15kKn6yqWYflo98jjFy6nnivlr8
-UC/aVcmaaZYkkAHklosfK/8Tom70Ytga9ftSK8VcD5R/JBWRW1955Fl6A751rbww
-GIpQ2zwTVgAm8HJCF9uQVP5xnYD31Kal0u/QH4XjAbioEt1ci86acVanLoErvpwc
-d3vJ61Fswk4paWfQlUhCh/M5sDY=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test2.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KAU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Karlstads universitet Shib 3.2 Test</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Karlstad University Shib 3.2 Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>Karlstad University</Company>
-    <SurName>Paul Scott</SurName>
-    <EmailAddress>mailto:paul.scott@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen Karlstads universitet</SurName>
-    <EmailAddress>mailto:datasupport@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
new file mode 100644
index 00000000..fa0955e2
--- /dev/null
+++ b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://weblogin.kau.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Karlstads universitet (ny)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Karlstad University (new)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
+        <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>kau.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
+        <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
+        <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
+        <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
+        <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAKqRgJlUZAb1CREA2cmklaWM4Hs/MA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMjBa
+Fw0zNjAzMjUxMTAyMjBaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrfx2rTVhTB7Pm0oTIvfBpSwkLk
+D8U7RYZH8vx+tOKWZp2d6g6QBOxpaNAZRKpvJoj/vclG37HKjkNi8xQQSNAWqUqo
+Gg7HTbg7GP/Q4MR5SVKZNsxTg4y9xz18Z2+YmiU26XLZHg1S1Dpvz1QkP/bWK4Ci
+7hIcANs//xJnurUHkxOJELtsx3NgR/SGCS3THcZhzFd1kr8c6vnjO6FBywUkbcdP
+pnyRmJnP17PL6r51f29m8/PDXghA98m04mB6p4bCrHrEsXw5fkqsHxa5a2/T0ULu
+31Tsaqmri6s+pgCyZ4P2itaLw0JG0kOpF5wuGlH7abKFOt2/+julrk0osfsCAwEA
+AaNlMGMwHQYDVR0OBBYEFA0OLDhIJ0KBHqZuAWyDTXLllATDMEIGA1UdEQQ7MDmC
+D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHjo2rrBQJw4w2XerUZad9Bnnj/C
+E+gAidE2Xdz6UaQId+BJ8P4FexxjJbwOz+qEx8lYyWt3ooqIfAbvyebFCRKSjFny
+L1chS4B8WuTPP+8UfPOcSoiOyXHtNqsWWLAIOcFwUUx27hF3IL2DvYi9zebO0uFO
+PiCp6QE0qQ/0HeDbnDjNmS7F8HPgx2IsJyEiEgYdR70w8n1DQB5ccekzpUDCBBNq
+W3q6OazE9V8ZdHjEA8FAJZ7Fo3cjgvkiVtow0CTiB7Aidya8HJc1KTemqUAAwLsT
+J3tGPHwu/RoCjpTvgbZcfT7vb+rMHYjlAaGfAe+dwgLq0XGn+id/ZdMf510=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAKxgqy7GuYcvyA/bSKh2g6NFUiCOMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMTla
+Fw0zNjAzMjUxMTAyMTlaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLpj1x2QOzpy5P769ZzMDBWd/SB
+IamtFwi3yWpGNPFPxgFcRdH9srirVG/jCf8CV63xbqIFw5t5avllFx1sdGDexV0j
+xaikv3IEzUFuAdu1G/Y3gA6WT0Eaz3Wo539B6OMOWm/+S7LhtO92wEmD9QGEnzqK
+hWHafhLNIyatF6nRd8nW6qR1LIeWCJIc6+l9EIN7fgGv91F7qoUmdWWYFEbMaGjg
+aCU+G63qksrn8lme+qYu/mg7PLTkoGpWN5PDF1+ZJ+PWUauWF0BaHkZ1J/2oVBI9
+gTPRAcyapxI/vkbY76ntt9Tpds+ZnjgLt0UvglEHg62QfvjOqkDRn9INMr0CAwEA
+AaNlMGMwHQYDVR0OBBYEFMALZKbkq9w3sXzoVj19Ybn4iHoMMEIGA1UdEQQ7MDmC
+D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFcnLl3I15O+8P1nbTwrl3ON7lYd
+maRmTTShHl3lUH87aRHbiyyoufQ9IZUVx7/lYr9R0956SXUeiXgrBwxGA7GFBR2g
+cOR0d99zxb5O5fp98Q2AsrNsfYkdkufrM07ro5kPUlAvmQyJSjoJ6eN6jn2nOJaQ
+wc5T0ouk9m5goKUJRK7mw6tRTVOw+3sA7Q8R6KW5Hge4uCCJVCnYXLAy/LR117A/
+zAjX3Z+Ui+HQajRXgxc1HyYHWJRnAzE2lb5na1/T6II0rInH7PMeqoUpmFWOOD86
+ZPI4RtsDWZUL5YWyHEokiQxtD9wZmhXrTUiHoVwbFjK+zfFpH/K4vhnweyw=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUGpvwFdQDTd5OR/3tImBGs68ViIIwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMB4XDTE2MDMyNTExMDIyMFoX
+DTM2MDMyNTExMDIyMFowGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlWvlRN7Q3Mh8KriChoB80l1JXzQw
+MthELvY6wwzf3fJ4VVIKFn0Kqql0JgwD/VOuA+MPbaqZDNWVcD5EmYhAs4k5cxSq
+jtb7RHdmAfTrnqB8XqM6wGP23sqa7brz7FDpT2kdCHkVn5Reazvltc4aUWepiXu4
+zDOd4fvyTwKcG4R2al6vPPg1ocvYOpOaaskNhjKk7KKF1fm233yLSiZZt/6yGipw
+EB/Vaj6+0ZOzmVCv8RFS5GiHroDzDRFquyrMKNXoqIVgcdsdq1ajeVazOvz+5p7k
+DonBQ31iphDxI3177QPWNIFy5VjvZoHzpiSIOHB7PEpJUkdfxlTS5Q6R6wIDAQAB
+o2UwYzAdBgNVHQ4EFgQUJNaYAquqKRGvgUZVPiWrZ0OSJI8wQgYDVR0RBDswOYIP
+d2VibG9naW4ua2F1LnNlhiZodHRwczovL3dlYmxvZ2luLmthdS5zZS9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAbsPfGxOUvMCzNS+ZIa+1woB7wRJH
+UdvS+jdnC86qB7pcfeUgqC+hWGzEQjeBpL31lrplfJq5j+c5E4AC97J11cCG7XP7
+6vZniOszZEvPnjI34OL4NrAs4VGSLeF7F9ZC8jyPdWEK2nan3ivWb5tIcfJzd1zp
+1amHFcKAlLVl8kMkLY1GB4kA+/Tz8epC0QDrgRHCdtgKmwfr1vbmAa6KmdldaBAa
+Cn3WZ3K74iMQSSbaR9g9oX/Ag+jeXkBCdEKknolZ+6FWVinu3oeuRiqvWYkLCF0Q
+cHgs7D1QiqGixbmFlSZyPcCPcIzPDzRaoXyb+yKQy31QP/VEt8VGXH5H2A==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.kau.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.kau.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.kau.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAKqRgJlUZAb1CREA2cmklaWM4Hs/MA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMjBa
+Fw0zNjAzMjUxMTAyMjBaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrfx2rTVhTB7Pm0oTIvfBpSwkLk
+D8U7RYZH8vx+tOKWZp2d6g6QBOxpaNAZRKpvJoj/vclG37HKjkNi8xQQSNAWqUqo
+Gg7HTbg7GP/Q4MR5SVKZNsxTg4y9xz18Z2+YmiU26XLZHg1S1Dpvz1QkP/bWK4Ci
+7hIcANs//xJnurUHkxOJELtsx3NgR/SGCS3THcZhzFd1kr8c6vnjO6FBywUkbcdP
+pnyRmJnP17PL6r51f29m8/PDXghA98m04mB6p4bCrHrEsXw5fkqsHxa5a2/T0ULu
+31Tsaqmri6s+pgCyZ4P2itaLw0JG0kOpF5wuGlH7abKFOt2/+julrk0osfsCAwEA
+AaNlMGMwHQYDVR0OBBYEFA0OLDhIJ0KBHqZuAWyDTXLllATDMEIGA1UdEQQ7MDmC
+D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHjo2rrBQJw4w2XerUZad9Bnnj/C
+E+gAidE2Xdz6UaQId+BJ8P4FexxjJbwOz+qEx8lYyWt3ooqIfAbvyebFCRKSjFny
+L1chS4B8WuTPP+8UfPOcSoiOyXHtNqsWWLAIOcFwUUx27hF3IL2DvYi9zebO0uFO
+PiCp6QE0qQ/0HeDbnDjNmS7F8HPgx2IsJyEiEgYdR70w8n1DQB5ccekzpUDCBBNq
+W3q6OazE9V8ZdHjEA8FAJZ7Fo3cjgvkiVtow0CTiB7Aidya8HJc1KTemqUAAwLsT
+J3tGPHwu/RoCjpTvgbZcfT7vb+rMHYjlAaGfAe+dwgLq0XGn+id/ZdMf510=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAKxgqy7GuYcvyA/bSKh2g6NFUiCOMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTAeFw0xNjAzMjUxMTAyMTla
+Fw0zNjAzMjUxMTAyMTlaMBoxGDAWBgNVBAMMD3dlYmxvZ2luLmthdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLpj1x2QOzpy5P769ZzMDBWd/SB
+IamtFwi3yWpGNPFPxgFcRdH9srirVG/jCf8CV63xbqIFw5t5avllFx1sdGDexV0j
+xaikv3IEzUFuAdu1G/Y3gA6WT0Eaz3Wo539B6OMOWm/+S7LhtO92wEmD9QGEnzqK
+hWHafhLNIyatF6nRd8nW6qR1LIeWCJIc6+l9EIN7fgGv91F7qoUmdWWYFEbMaGjg
+aCU+G63qksrn8lme+qYu/mg7PLTkoGpWN5PDF1+ZJ+PWUauWF0BaHkZ1J/2oVBI9
+gTPRAcyapxI/vkbY76ntt9Tpds+ZnjgLt0UvglEHg62QfvjOqkDRn9INMr0CAwEA
+AaNlMGMwHQYDVR0OBBYEFMALZKbkq9w3sXzoVj19Ybn4iHoMMEIGA1UdEQQ7MDmC
+D3dlYmxvZ2luLmthdS5zZYYmaHR0cHM6Ly93ZWJsb2dpbi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFcnLl3I15O+8P1nbTwrl3ON7lYd
+maRmTTShHl3lUH87aRHbiyyoufQ9IZUVx7/lYr9R0956SXUeiXgrBwxGA7GFBR2g
+cOR0d99zxb5O5fp98Q2AsrNsfYkdkufrM07ro5kPUlAvmQyJSjoJ6eN6jn2nOJaQ
+wc5T0ouk9m5goKUJRK7mw6tRTVOw+3sA7Q8R6KW5Hge4uCCJVCnYXLAy/LR117A/
+zAjX3Z+Ui+HQajRXgxc1HyYHWJRnAzE2lb5na1/T6II0rInH7PMeqoUpmFWOOD86
+ZPI4RtsDWZUL5YWyHEokiQxtD9wZmhXrTUiHoVwbFjK+zfFpH/K4vhnweyw=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUGpvwFdQDTd5OR/3tImBGs68ViIIwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMB4XDTE2MDMyNTExMDIyMFoX
+DTM2MDMyNTExMDIyMFowGjEYMBYGA1UEAwwPd2VibG9naW4ua2F1LnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlWvlRN7Q3Mh8KriChoB80l1JXzQw
+MthELvY6wwzf3fJ4VVIKFn0Kqql0JgwD/VOuA+MPbaqZDNWVcD5EmYhAs4k5cxSq
+jtb7RHdmAfTrnqB8XqM6wGP23sqa7brz7FDpT2kdCHkVn5Reazvltc4aUWepiXu4
+zDOd4fvyTwKcG4R2al6vPPg1ocvYOpOaaskNhjKk7KKF1fm233yLSiZZt/6yGipw
+EB/Vaj6+0ZOzmVCv8RFS5GiHroDzDRFquyrMKNXoqIVgcdsdq1ajeVazOvz+5p7k
+DonBQ31iphDxI3177QPWNIFy5VjvZoHzpiSIOHB7PEpJUkdfxlTS5Q6R6wIDAQAB
+o2UwYzAdBgNVHQ4EFgQUJNaYAquqKRGvgUZVPiWrZ0OSJI8wQgYDVR0RBDswOYIP
+d2VibG9naW4ua2F1LnNlhiZodHRwczovL3dlYmxvZ2luLmthdS5zZS9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAbsPfGxOUvMCzNS+ZIa+1woB7wRJH
+UdvS+jdnC86qB7pcfeUgqC+hWGzEQjeBpL31lrplfJq5j+c5E4AC97J11cCG7XP7
+6vZniOszZEvPnjI34OL4NrAs4VGSLeF7F9ZC8jyPdWEK2nan3ivWb5tIcfJzd1zp
+1amHFcKAlLVl8kMkLY1GB4kA+/Tz8epC0QDrgRHCdtgKmwfr1vbmAa6KmdldaBAa
+Cn3WZ3K74iMQSSbaR9g9oX/Ag+jeXkBCdEKknolZ+6FWVinu3oeuRiqvWYkLCF0Q
+cHgs7D1QiqGixbmFlSZyPcCPcIzPDzRaoXyb+yKQy31QP/VEt8VGXH5H2A==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">KAU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Karlstads universitet (ny)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Karlstad University (new)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Karlstad University</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2200</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Karlstad University</Company>
+    <SurName>Paul Scott</SurName>
+    <EmailAddress>mailto:paul.scott@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Karlstad University</Company>
+    <SurName>IT-avdelningen Karlstads universitet</SurName>
+    <EmailAddress>mailto:datasupport@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index dde6c7e1..19ead7ff 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -47,8 +47,6 @@
   <xi:include href="swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.fhs.se-swamid.xml"/>
   <xi:include href="swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/weblogin-test2.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/testidp.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.bth.se-idp-shibboleth.xml"/>
@@ -68,4 +66,5 @@
   <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/ls00001.mah.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/weblogin.kau.se-idp-shibboleth.xml"/>
 </EntitiesDescriptor>