swamid-1.0* removed

nya-1.0* removed non-used metadata moved to swamid-2.0-obsolete swamid-1.0/* moved to swamid-2.0/ nya-1.0/* moved to swamid-2.0/ mxml cleaned from swamid-1.0 data Makefile cleaned from nya-1.0 and swamid-1.0 data
author: Fredrik Åslund <fredrik.aslund@umu.se> 2013-09-24 10:19:38 +0200
committer: Fredrik Åslund <fredrik.aslund@umu.se> 2013-09-24 10:19:38 +0200
commit: 46b6a83aaecbddd698972839c8470835ac7211d6 (patch)
tree: 1ae4425a981267795b13981f410e938dd0fa0953 /swamid-2.0-obsolete
parent: bca2bb6b51904fc80667281e16ac25a02e615e07 (diff)
30 files changed, 2084 insertions, 0 deletions
diff --git a/swamid-2.0-obsolete/downloads.channel8.msdn.com-shibboleth-sp.xml b/swamid-2.0-obsolete/downloads.channel8.msdn.com-shibboleth-sp.xml
new file mode 100644
index 00000000..ed639a43
--- /dev/null
+++ b/swamid-2.0-obsolete/downloads.channel8.msdn.com-shibboleth-sp.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://downloads.channel8.msdn.com/shibboleth-sp">
+  <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/eu-adequate-protection</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol http://schemas.xmlsoap.org/ws/2003/07/secext">
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.dreamspark.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIF+jCCBOKgAwIBAgIKLqDfHAAIAAGj6DANBgkqhkiG9w0BAQUFADCBizETMBEG CgmSJomT8ixkARkWA2NvbTEZMBcGCgmSJomT8ixkARkWCW1pY3Jvc29mdDEUMBIG CgmSJomT8ixkARkWBGNvcnAxFzAVBgoJkiaJk/IsZAEZFgdyZWRtb25kMSowKAYD VQQDEyFNaWNyb3NvZnQgU2VjdXJlIFNlcnZlciBBdXRob3JpdHkwHhcNMTAwNzMw MDAyMTA4WhcNMTEwNzMwMDAyMTA4WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK V2FzaGluZ3RvbjEQMA4GA1UEBxMHU2VhdHRsZTETMBEGA1UEChMKRmFzdCBUcmFj azEUMBIGA1UECxMLRHJlYW0gU3BhcmsxGzAZBgNVBAMTEnd3dy5kcmVhbXNwYXJr LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtsyFSuceS0RVGHD1Qbch DWIdIGfELS06JXkb6EJELGld5j4P50fGSqMXDcPIt3jHqjt9jnd5aqJP4Z5ROs5p hJ7fXtm56taeSVTfZSQRIzlVyaIG1QSKeqdlt6GWZrlV+Gy2cKAglMcKh5/y5ISP /TbQWeJtreT+Pi/Aj0IQcGUCAwEAAaOCAvAwggLsMAsGA1UdDwQEAwIEsDBEBgkq hkiG9w0BCQ8ENzA1MA4GCCqGSIb3DQMCAgIAgDAOBggqhkiG9w0DBAICAIAwBwYF Kw4DAgcwCgYIKoZIhvcNAwcwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB MB0GA1UdDgQWBBT2xedjpxaZG/9bcyw3cEROspTL0DAfBgNVHSMEGDAWgBQIQuPb ThFm87UIxUDbVXwzRhGDODCCAQoGA1UdHwSCAQEwgf4wgfuggfiggfWGWGh0dHA6 Ly9tc2NybC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL01pY3Jvc29mdCUy MFNlY3VyZSUyMFNlcnZlciUyMEF1dGhvcml0eSg4KS5jcmyGVmh0dHA6Ly9jcmwu bWljcm9zb2Z0LmNvbS9wa2kvbXNjb3JwL2NybC9NaWNyb3NvZnQlMjBTZWN1cmUl MjBTZXJ2ZXIlMjBBdXRob3JpdHkoOCkuY3JshkFodHRwOi8vY29ycHBraS9jcmwv TWljcm9zb2Z0JTIwU2VjdXJlJTIwU2VydmVyJTIwQXV0aG9yaXR5KDgpLmNybDCB vwYIKwYBBQUHAQEEgbIwga8wXgYIKwYBBQUHMAKGUmh0dHA6Ly93d3cubWljcm9z b2Z0LmNvbS9wa2kvbXNjb3JwL01pY3Jvc29mdCUyMFNlY3VyZSUyMFNlcnZlciUy MEF1dGhvcml0eSg4KS5jcnQwTQYIKwYBBQUHMAKGQWh0dHA6Ly9jb3JwcGtpL2Fp YS9NaWNyb3NvZnQlMjBTZWN1cmUlMjBTZXJ2ZXIlMjBBdXRob3JpdHkoOCkuY3J0 MD8GCSsGAQQBgjcVBwQyMDAGKCsGAQQBgjcVCIPPiU2t8gKFoZ8MgvrKfYHh+3SB T4PC7YUIjqnShWMCAWQCAQkwJwYJKwYBBAGCNxUKBBowGDAKBggrBgEFBQcDAjAK BggrBgEFBQcDATANBgkqhkiG9w0BAQUFAAOCAQEACAHi+mcrNHJ/W+uBtnzD3mAm ai3QiLWiJE3dKuNtHV8Ba64E2l69Q7pmnFCr1eM5wlvnQcOqbVyZjk/okp4aRxBw ARn3KtvkhbSOHjaDYv3FXvobBXgenbPFydPvNmQrPGdTRSUf+q4duaYVSx2YAqpr HnYDbddNBJuFzfyywu6WSsrwgqUUW3jAaNmcrX7U5Z/sN1CQVOcx4dQ3nqXTYbgm 5+nddJhnC9PDyK4A4epAO9CA7h9023fRh9AZx17dgpRtteb+8JlV1+iMRdG/VrJK Gmnt8WCQFfOSQNChmicJikdzGfjtDjOqKA5g5CxxrwKWO7S5DaDH7Q286CkSXg==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/NIM/Artifact"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AssertionConsumerService Binding="http://schemas.xmlsoap.org/ws/2003/07/secext" Location="https://www.dreamspark.com/Shibboleth.sso/ADFS" index="7"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Microsoft</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>DreamSpark Engineering Team</GivenName>
+    <EmailAddress>dsengt@microsoft.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Scott</GivenName>
+    <SurName>Blackwell</SurName>
+    <EmailAddress>scott.blackwell@microsoft.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/dwidp.antagning.se-dw-idp.xml b/swamid-2.0-obsolete/dwidp.antagning.se-dw-idp.xml
new file mode 100644
index 00000000..f96a3e32
--- /dev/null
+++ b/swamid-2.0-obsolete/dwidp.antagning.se-dw-idp.xml
@@ -0,0 +1,49 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dwidp.antagning.se/dw-idp">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">NyA DW-IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NyA DW-IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för DW-användare i NyA (UHR)</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider för DW-användare i NyA (UHR)</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIBsTCCAVugAwIBAgIJAKLW8BnDv4qgMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEmR3aWRwLmFudGFnbmluZy5zZTAeFw0xMTAxMjAxNzM4NTFaFw0yMTAxMTcxNzM4NTFaMB0xGzAZBgNVBAMTEmR3aWRwLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC3SHcbLV+BNfaJOb+jBVAxL8snvg/8M85YJR+hn2srvkeo4a5RLt2iY49PIXbEAqqNASVeZrQZ76jz3YMujBRdAgMBAAGjfjB8MB0GA1UdDgQWBBSGFxfUifschCgYSdCjsXoFZEbIkDBNBgNVHSMERjBEgBSGFxfUifschCgYSdCjsXoFZEbIkKEhpB8wHTEbMBkGA1UEAxMSZHdpZHAuYW50YWduaW5nLnNlggkAotbwGcO/iqAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJg+mYzJ0q5UjJCXgxPA57NCtSuiKhVXO/ucjAW10GhEXVqEN8hkYyX9l1cPe1vElWNVLjp18zyHYvkrOKoszJw=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.antagning.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://dwidp.antagning.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dwidp.antagning.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dwidp.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dwidp.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIBsTCCAVugAwIBAgIJAKLW8BnDv4qgMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEmR3aWRwLmFudGFnbmluZy5zZTAeFw0xMTAxMjAxNzM4NTFaFw0yMTAxMTcxNzM4NTFaMB0xGzAZBgNVBAMTEmR3aWRwLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC3SHcbLV+BNfaJOb+jBVAxL8snvg/8M85YJR+hn2srvkeo4a5RLt2iY49PIXbEAqqNASVeZrQZ76jz3YMujBRdAgMBAAGjfjB8MB0GA1UdDgQWBBSGFxfUifschCgYSdCjsXoFZEbIkDBNBgNVHSMERjBEgBSGFxfUifschCgYSdCjsXoFZEbIkKEhpB8wHTEbMBkGA1UEAxMSZHdpZHAuYW50YWduaW5nLnNlggkAotbwGcO/iqAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAJg+mYzJ0q5UjJCXgxPA57NCtSuiKhVXO/ucjAW10GhEXVqEN8hkYyX9l1cPe1vElWNVLjp18zyHYvkrOKoszJw=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dwidp.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dwidp.antagning.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/ecsidp.antagning.se-ecs-idp.xml b/swamid-2.0-obsolete/ecsidp.antagning.se-ecs-idp.xml
new file mode 100644
index 00000000..ddc03c28
--- /dev/null
+++ b/swamid-2.0-obsolete/ecsidp.antagning.se-ecs-idp.xml
@@ -0,0 +1,59 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ecsidp.antagning.se/ecs-idp">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">NyA Expert-IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NyA Expert-IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Expert-användare i NyA (UHR)</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider för Expert-användare i NyA (UHR)</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOwDbZrbG8naMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE2Vjc2lkcC5hbnRhZ25pbmcuc2UwHhcNMTMwMjA0MTMyODU0WhcNMjMwMjAyMTMyODU0WjAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPBW48pxe0oFiQ734yuWdFf/9PX1j4k0oZdpn+Rxijxa+6vUsw9wwYW5d8c/md146bJBHQxPOZU7KcIkUvtal4sCAwEAAaN/MH0wHQYDVR0OBBYEFJEfx9uenj5vD0UI0K79rIeRIdqIME4GA1UdIwRHMEWAFJEfx9uenj5vD0UI0K79rIeRIdqIoSKkIDAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlggkA7ANtmtsbydowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMHpR+JNUb++fOsiuksO9gEfSpXcZBY8WgEaSH2i76CV7IFtB08uW4TgEkIpMz0lyOw+lhz0f/qkkeDF4Gha4v4=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.antagning.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://ecsidp.antagning.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsidp.antagning.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsidp.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsidp.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ecsidp.antagning.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIBtDCCAV6gAwIBAgIJAOwDbZrbG8naMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE2Vjc2lkcC5hbnRhZ25pbmcuc2UwHhcNMTMwMjA0MTMyODU0WhcNMjMwMjAyMTMyODU0WjAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAPBW48pxe0oFiQ734yuWdFf/9PX1j4k0oZdpn+Rxijxa+6vUsw9wwYW5d8c/md146bJBHQxPOZU7KcIkUvtal4sCAwEAAaN/MH0wHQYDVR0OBBYEFJEfx9uenj5vD0UI0K79rIeRIdqIME4GA1UdIwRHMEWAFJEfx9uenj5vD0UI0K79rIeRIdqIoSKkIDAeMRwwGgYDVQQDExNlY3NpZHAuYW50YWduaW5nLnNlggkA7ANtmtsbydowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAMHpR+JNUb++fOsiuksO9gEfSpXcZBY8WgEaSH2i76CV7IFtB08uW4TgEkIpMz0lyOw+lhz0f/qkkeDF4Gha4v4=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsidp.antagning.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">UHR</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">NyA Expert-IdP</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">NyA Expert-IdP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Swedish Council for Higher Education</Company>
+    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/fs.liu.se-adfs-services-trust.xml b/swamid-2.0-obsolete/fs.liu.se-adfs-services-trust.xml
new file mode 100644
index 00000000..20d196c7
--- /dev/null
+++ b/swamid-2.0-obsolete/fs.liu.se-adfs-services-trust.xml
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://fs.liu.se/adfs/services/trust">
+  <RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se">
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIEczCCA1ugAwIBAgIRAIx+qgJAs6l/0gCkhAqJxJYwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAyMjgwMDAwMDBaFw0xNTAyMjcyMzU5NTlaMFQxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGbGl1LWl0MRIwEAYDVQQDEwlmcy5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwrSCTd2hy/LyqOIdNuhewGL4YSNp2CBV/ZjUcOZe/qvKVuze7G/BwV+hheJKfd6OOkpj23T64y50qscNv4D1ge04hC0xtbCGZwJbjioD8iP5hmKeTnGsGWYlvsb6AO4YQzpaTxT0XgmT0eRBVkZ7yW/afQg/AWS19UOpmiBptnFnvpCIO/K0/71Y1Xn/WcRrfVMSWgCDLxQUyMb1dR3zkz+lfQcxsy1SGd/V6GWWZVrBu4lCmZSxp26VzpFcQr1KpyRtrQAJtqh/qvDpzYN/j7kSkVfUu6mekh1bkmciiuQ1j844Px+l3192DezDABlodDzFG1t3n4UNrSbhoS+EXAgMBAAGjggFcMIIBWDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUuVihgvK1m0ssH/3DACxPZ0yqPNQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFAYDVR0RBA0wC4IJZnMubGl1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQCKLN9EqeM45DjWs9wQplYHFRocX7WNpvQ1cIh45UjsaThCAJL1kID5nvUYU5Y4JAb1EgqFIAGzT17G9xbX7KUhgFbgyRBCuI3MPErjL4ERxGDEPSMHRK2KiNuAJjuC5JLrHFUBtN9RkJvRVkfQApdVspCNEEXplqn0/CGCz+b39PzayHEqrLrJ+ecDdOaWIvhO1eiGi70oRZWk7KoxzW3xvEnBAXc35JX04zhPip6DGOyJyINK0hNhkNeWdoK7QXG+FVhIcFtwFpR2nUt957L+qFsjcj2OVFbWhemsMagqnrf3HeZiPwzWJ2WsbdAgPDeAWDdLnLCsCIbVwtJmXYwU</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <fed:ClaimTypesRequested>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
+      </auth:ClaimType>
+    </fed:ClaimTypesRequested>
+    <fed:TargetScopes>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/ls/</Address>
+      </EndpointReference>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>http://fs.liu.se/adfs/services/trust</Address>
+      </EndpointReference>
+    </fed:TargetScopes>
+    <fed:ApplicationServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
+      </EndpointReference>
+    </fed:ApplicationServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </RoleDescriptor>
+  <RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se">
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIEgTCCA2mgAwIBAgIRAISQTiee8BSp/9eebQq2YZswDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAxMjYwMDAwMDBaFw0xNTAxMjUyMzU5NTlaMFsxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGTGlVLUlUMRkwFwYDVQQDExBmc3NpZ25pbmcubGl1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJpMHOTDns/BTtMshB4C2J0Vqw+MjHpVcWc+u3PtFOjLjnZ6E4gN7zPuDvLJrVir9e2VnVNNOr0bUbVfdtd4JjGy/7GlSuXL5kcuynh4x6f6H6n4d5dtbtEtGLHIuQS9aIFdjTjtxqzQvQbYKyArIkVRdF/8tktF8rvFKseRKFjq2yfiE+0u9rgd0UYpItqc88sDdUUlA3O/C+WBxRty/TBobxNG8GsEk8E6/SSTgNNo4YSJRHQNjVSGXsZYgJPyVGiKIUga15Z91ZwK09Nyrm/Ua7mGmM+4hKRlm7K1RzScHfp5jGPwP/tGC/zkZ68NGeRtOVCGWgB7D1pUqGb5RQIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLr1wkvttaxyXSeux9OCnl9vHxmJMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGZzc2lnbmluZy5saXUuc2UwDQYJKoZIhvcNAQEFBQADggEBAG9DoHcG664W4dp8xRHvyJg5C9G2ekXR6Zvq0X/OnKf1RXaBT2rEjQ2rpQhsmBUeIxdUunLSaMEtLckVq8SlLEXsGmyGraATDJKXmn+/fwVJGTGyHzDH7s0R3LpNRK85EpvXmJ2H3TXyvA6nhyC5SRSW76WoikpTbyh6E20B8Nn0Ba4JOyJ1QjPvqOwWVrVKAJKLjzPjyXp/YCnattTaMv/6qxFA3uWIf8VxOF6+qdr7XhdrTQtGCs7ufzhTvvNNuTKiLgWQkcIIadJUbmaEgPSVHXpvReb4uagfQpldYK9186Jl7Dhp6yVdWTHNleWzJPycBrMeX05CYmlqXhhXHIg=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <fed:TokenTypesOffered>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
+      <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
+    </fed:TokenTypesOffered>
+    <fed:ClaimTypesOffered>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" Optional="true">
+        <auth:DisplayName>E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" Optional="true">
+        <auth:DisplayName>Given Name</auth:DisplayName>
+        <auth:Description>The given name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" Optional="true">
+        <auth:DisplayName>Name</auth:DisplayName>
+        <auth:Description>The unique name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" Optional="true">
+        <auth:DisplayName>UPN</auth:DisplayName>
+        <auth:Description>The user principal name (UPN) of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/CommonName" Optional="true">
+        <auth:DisplayName>Common Name</auth:DisplayName>
+        <auth:Description>The common name of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/EmailAddress" Optional="true">
+        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
+        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/Group" Optional="true">
+        <auth:DisplayName>Group</auth:DisplayName>
+        <auth:Description>A group that the user is a member of</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/claims/UPN" Optional="true">
+        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
+        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" Optional="true">
+        <auth:DisplayName>Role</auth:DisplayName>
+        <auth:Description>A role that the user has</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" Optional="true">
+        <auth:DisplayName>Surname</auth:DisplayName>
+        <auth:Description>The surname of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" Optional="true">
+        <auth:DisplayName>PPID</auth:DisplayName>
+        <auth:Description>The private identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" Optional="true">
+        <auth:DisplayName>Name ID</auth:DisplayName>
+        <auth:Description>The SAML name identifier of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" Optional="true">
+        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
+        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" Optional="true">
+        <auth:DisplayName>Authentication method</auth:DisplayName>
+        <auth:Description>The method used to authenticate the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" Optional="true">
+        <auth:DisplayName>Deny only group SID</auth:DisplayName>
+        <auth:Description>The deny-only group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" Optional="true">
+        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
+        <auth:Description>The deny-only primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" Optional="true">
+        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
+        <auth:Description>The deny-only primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" Optional="true">
+        <auth:DisplayName>Group SID</auth:DisplayName>
+        <auth:Description>The group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" Optional="true">
+        <auth:DisplayName>Primary group SID</auth:DisplayName>
+        <auth:Description>The primary group SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" Optional="true">
+        <auth:DisplayName>Primary SID</auth:DisplayName>
+        <auth:Description>The primary SID of the user</auth:Description>
+      </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" Optional="true">
+        <auth:DisplayName>Windows account name</auth:DisplayName>
+        <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
+      </auth:ClaimType>
+    </fed:ClaimTypesOffered>
+    <fed:SecurityTokenServiceEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/services/trust/2005/certificatemixed</Address>
+        <Metadata>
+          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex">
+            <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
+              <wsx:MetadataReference>
+                <Address xmlns="http://www.w3.org/2005/08/addressing">https://fs.liu.se/adfs/services/trust/mex</Address>
+              </wsx:MetadataReference>
+            </wsx:MetadataSection>
+          </Metadata>
+        </Metadata>
+      </EndpointReference>
+    </fed:SecurityTokenServiceEndpoint>
+    <fed:PassiveRequestorEndpoint>
+      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
+        <Address>https://fs.liu.se/adfs/ls/</Address>
+      </EndpointReference>
+    </fed:PassiveRequestorEndpoint>
+  </RoleDescriptor>
+  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIEczCCA1ugAwIBAgIRAIx+qgJAs6l/0gCkhAqJxJYwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAyMjgwMDAwMDBaFw0xNTAyMjcyMzU5NTlaMFQxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGbGl1LWl0MRIwEAYDVQQDEwlmcy5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwrSCTd2hy/LyqOIdNuhewGL4YSNp2CBV/ZjUcOZe/qvKVuze7G/BwV+hheJKfd6OOkpj23T64y50qscNv4D1ge04hC0xtbCGZwJbjioD8iP5hmKeTnGsGWYlvsb6AO4YQzpaTxT0XgmT0eRBVkZ7yW/afQg/AWS19UOpmiBptnFnvpCIO/K0/71Y1Xn/WcRrfVMSWgCDLxQUyMb1dR3zkz+lfQcxsy1SGd/V6GWWZVrBu4lCmZSxp26VzpFcQr1KpyRtrQAJtqh/qvDpzYN/j7kSkVfUu6mekh1bkmciiuQ1j844Px+l3192DezDABlodDzFG1t3n4UNrSbhoS+EXAgMBAAGjggFcMIIBWDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUuVihgvK1m0ssH/3DACxPZ0yqPNQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFAYDVR0RBA0wC4IJZnMubGl1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQCKLN9EqeM45DjWs9wQplYHFRocX7WNpvQ1cIh45UjsaThCAJL1kID5nvUYU5Y4JAb1EgqFIAGzT17G9xbX7KUhgFbgyRBCuI3MPErjL4ERxGDEPSMHRK2KiNuAJjuC5JLrHFUBtN9RkJvRVkfQApdVspCNEEXplqn0/CGCz+b39PzayHEqrLrJ+ecDdOaWIvhO1eiGi70oRZWk7KoxzW3xvEnBAXc35JX04zhPip6DGOyJyINK0hNhkNeWdoK7QXG+FVhIcFtwFpR2nUt957L+qFsjcj2OVFbWhemsMagqnrf3HeZiPwzWJ2WsbdAgPDeAWDdLnLCsCIbVwtJmXYwU</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIEgTCCA2mgAwIBAgIRAISQTiee8BSp/9eebQq2YZswDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAxMjYwMDAwMDBaFw0xNTAxMjUyMzU5NTlaMFsxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGTGlVLUlUMRkwFwYDVQQDExBmc3NpZ25pbmcubGl1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJpMHOTDns/BTtMshB4C2J0Vqw+MjHpVcWc+u3PtFOjLjnZ6E4gN7zPuDvLJrVir9e2VnVNNOr0bUbVfdtd4JjGy/7GlSuXL5kcuynh4x6f6H6n4d5dtbtEtGLHIuQS9aIFdjTjtxqzQvQbYKyArIkVRdF/8tktF8rvFKseRKFjq2yfiE+0u9rgd0UYpItqc88sDdUUlA3O/C+WBxRty/TBobxNG8GsEk8E6/SSTgNNo4YSJRHQNjVSGXsZYgJPyVGiKIUga15Z91ZwK09Nyrm/Ua7mGmM+4hKRlm7K1RzScHfp5jGPwP/tGC/zkZ68NGeRtOVCGWgB7D1pUqGb5RQIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLr1wkvttaxyXSeux9OCnl9vHxmJMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGZzc2lnbmluZy5saXUuc2UwDQYJKoZIhvcNAQEFBQADggEBAG9DoHcG664W4dp8xRHvyJg5C9G2ekXR6Zvq0X/OnKf1RXaBT2rEjQ2rpQhsmBUeIxdUunLSaMEtLckVq8SlLEXsGmyGraATDJKXmn+/fwVJGTGyHzDH7s0R3LpNRK85EpvXmJ2H3TXyvA6nhyC5SRSW76WoikpTbyh6E20B8Nn0Ba4JOyJ1QjPvqOwWVrVKAJKLjzPjyXp/YCnattTaMv/6qxFA3uWIf8VxOF6+qdr7XhdrTQtGCs7ufzhTvvNNuTKiLgWQkcIIadJUbmaEgPSVHXpvReb4uagfQpldYK9186Jl7Dhp6yVdWTHNleWzJPycBrMeX05CYmlqXhhXHIg=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.liu.se/adfs/ls/" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/" index="2"/>
+  </SPSSODescriptor>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIEczCCA1ugAwIBAgIRAIx+qgJAs6l/0gCkhAqJxJYwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAyMjgwMDAwMDBaFw0xNTAyMjcyMzU5NTlaMFQxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGbGl1LWl0MRIwEAYDVQQDEwlmcy5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwrSCTd2hy/LyqOIdNuhewGL4YSNp2CBV/ZjUcOZe/qvKVuze7G/BwV+hheJKfd6OOkpj23T64y50qscNv4D1ge04hC0xtbCGZwJbjioD8iP5hmKeTnGsGWYlvsb6AO4YQzpaTxT0XgmT0eRBVkZ7yW/afQg/AWS19UOpmiBptnFnvpCIO/K0/71Y1Xn/WcRrfVMSWgCDLxQUyMb1dR3zkz+lfQcxsy1SGd/V6GWWZVrBu4lCmZSxp26VzpFcQr1KpyRtrQAJtqh/qvDpzYN/j7kSkVfUu6mekh1bkmciiuQ1j844Px+l3192DezDABlodDzFG1t3n4UNrSbhoS+EXAgMBAAGjggFcMIIBWDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUuVihgvK1m0ssH/3DACxPZ0yqPNQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFAYDVR0RBA0wC4IJZnMubGl1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQCKLN9EqeM45DjWs9wQplYHFRocX7WNpvQ1cIh45UjsaThCAJL1kID5nvUYU5Y4JAb1EgqFIAGzT17G9xbX7KUhgFbgyRBCuI3MPErjL4ERxGDEPSMHRK2KiNuAJjuC5JLrHFUBtN9RkJvRVkfQApdVspCNEEXplqn0/CGCz+b39PzayHEqrLrJ+ecDdOaWIvhO1eiGi70oRZWk7KoxzW3xvEnBAXc35JX04zhPip6DGOyJyINK0hNhkNeWdoK7QXG+FVhIcFtwFpR2nUt957L+qFsjcj2OVFbWhemsMagqnrf3HeZiPwzWJ2WsbdAgPDeAWDdLnLCsCIbVwtJmXYwU</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIEgTCCA2mgAwIBAgIRAISQTiee8BSp/9eebQq2YZswDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMjAxMjYwMDAwMDBaFw0xNTAxMjUyMzU5NTlaMFsxCzAJBgNVBAYTAlNFMSAwHgYDVQQKDBdMaW5rw7ZwaW5ncyB1bml2ZXJzaXRldDEPMA0GA1UECxMGTGlVLUlUMRkwFwYDVQQDExBmc3NpZ25pbmcubGl1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJpMHOTDns/BTtMshB4C2J0Vqw+MjHpVcWc+u3PtFOjLjnZ6E4gN7zPuDvLJrVir9e2VnVNNOr0bUbVfdtd4JjGy/7GlSuXL5kcuynh4x6f6H6n4d5dtbtEtGLHIuQS9aIFdjTjtxqzQvQbYKyArIkVRdF/8tktF8rvFKseRKFjq2yfiE+0u9rgd0UYpItqc88sDdUUlA3O/C+WBxRty/TBobxNG8GsEk8E6/SSTgNNo4YSJRHQNjVSGXsZYgJPyVGiKIUga15Z91ZwK09Nyrm/Ua7mGmM+4hKRlm7K1RzScHfp5jGPwP/tGC/zkZ68NGeRtOVCGWgB7D1pUqGb5RQIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLr1wkvttaxyXSeux9OCnl9vHxmJMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGZzc2lnbmluZy5saXUuc2UwDQYJKoZIhvcNAQEFBQADggEBAG9DoHcG664W4dp8xRHvyJg5C9G2ekXR6Zvq0X/OnKf1RXaBT2rEjQ2rpQhsmBUeIxdUunLSaMEtLckVq8SlLEXsGmyGraATDJKXmn+/fwVJGTGyHzDH7s0R3LpNRK85EpvXmJ2H3TXyvA6nhyC5SRSW76WoikpTbyh6E20B8Nn0Ba4JOyJ1QjPvqOwWVrVKAJKLjzPjyXp/YCnattTaMv/6qxFA3uWIf8VxOF6+qdr7XhdrTQtGCs7ufzhTvvNNuTKiLgWQkcIIadJUbmaEgPSVHXpvReb4uagfQpldYK9186Jl7Dhp6yVdWTHNleWzJPycBrMeX05CYmlqXhhXHIg=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.liu.se/adfs/services/trust/artifactresolution" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="sv">Linköping University</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Linköpings Universitet (ADFS)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Linköping University (ADFS)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.liu.se/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Johan</GivenName>
+    <SurName>Peterson</SurName>
+    <EmailAddress>johan.peterson@liu.se</EmailAddress>
+    <TelephoneNumber>+46 (0)13-285730</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..3f9f3991
--- /dev/null
+++ b/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,52 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ft10.ladok.umu.se/shibboleth-idp">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDODCCAiCgAwIBAgIJAI0Ak//aNy/fMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTAubGFkb2sudW11LnNlMB4XDTEwMDQwODEzNTQxN1oXDTIwMDQwNTEzNTQxN1owHDEaMBgGA1UEAxMRZnQxMC5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxp4GiuW3utBqmBCv2V556oqGsvc6YHoPl5q9VGcXziVGxlA1D5UB2JN9WJjcxCXLc0LY0ac6rNceP4eICHEhwNOFkXu2RzTq7d7oSbqUZhmVsZXYYKou4IpBI6h9deXBcOV+tiOebF7kehXHb4PY2sfVBLIFRq8hAG3Y9TPMVHhpC2TdAeBl+C3/Daia41YKF+vc7F2ZtQcxBeD0/NB+BjhnhCcFM9JzgTu34R5rGiQL7+n3pxbl4FEbaqyGFaywn/mwCvdRNfkFrFppqnXPhGckky7nxyr1Gc43t1Ch5arUnhPLwiSHRAj4uVPvkHdUisJ13b5qXnBYmlDr7QR4tAgMBAAGjfTB7MB0GA1UdDgQWBBT9/fMaoR07yLfN15nj9pzO9EbhRTBMBgNVHSMERTBDgBT9/fMaoR07yLfN15nj9pzO9EbhRaEgpB4wHDEaMBgGA1UEAxMRZnQxMC5sYWRvay51bXUuc2WCCQCNAJP/2jcv3zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDJ1YAr17AOiEqmKkEeENksTZz038FNB+EHFYVT8iDyb4xPBOc9Z4H9SidSQ48/ngd9N0upsvA2FkLJP66lyRCt6Tj//EVvgM1AcmyYP6XjdEFTDQUAUDeAexmoB63r5kQ6tzGLnVX9fvO3MOo0gIGwKRG6ofN+MuwxARXMRbehJ4V11TKri7yi74iaJ3U5LpmjKBvOmZd7s1V/EEeQatnSvdfYieFeGmFjgbbcJT8IJqJC5bGYkQjNlKpLyrxye3V/0tg47rbarLWF2K9F173TEV+Tpu3Sw8E9oawpENAa1bYiEmd6gB/pxErjbBQY+P98ZHc9ClfZADCUOT4zJHMd
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft10.ladok.umu.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://ft10.ladok.umu.se:444/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft10.ladok.umu.se:444/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDODCCAiCgAwIBAgIJAI0Ak//aNy/fMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWZ0MTAubGFkb2sudW11LnNlMB4XDTEwMDQwODEzNTQxN1oXDTIwMDQwNTEzNTQxN1owHDEaMBgGA1UEAxMRZnQxMC5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxp4GiuW3utBqmBCv2V556oqGsvc6YHoPl5q9VGcXziVGxlA1D5UB2JN9WJjcxCXLc0LY0ac6rNceP4eICHEhwNOFkXu2RzTq7d7oSbqUZhmVsZXYYKou4IpBI6h9deXBcOV+tiOebF7kehXHb4PY2sfVBLIFRq8hAG3Y9TPMVHhpC2TdAeBl+C3/Daia41YKF+vc7F2ZtQcxBeD0/NB+BjhnhCcFM9JzgTu34R5rGiQL7+n3pxbl4FEbaqyGFaywn/mwCvdRNfkFrFppqnXPhGckky7nxyr1Gc43t1Ch5arUnhPLwiSHRAj4uVPvkHdUisJ13b5qXnBYmlDr7QR4tAgMBAAGjfTB7MB0GA1UdDgQWBBT9/fMaoR07yLfN15nj9pzO9EbhRTBMBgNVHSMERTBDgBT9/fMaoR07yLfN15nj9pzO9EbhRaEgpB4wHDEaMBgGA1UEAxMRZnQxMC5sYWRvay51bXUuc2WCCQCNAJP/2jcv3zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDJ1YAr17AOiEqmKkEeENksTZz038FNB+EHFYVT8iDyb4xPBOc9Z4H9SidSQ48/ngd9N0upsvA2FkLJP66lyRCt6Tj//EVvgM1AcmyYP6XjdEFTDQUAUDeAexmoB63r5kQ6tzGLnVX9fvO3MOo0gIGwKRG6ofN+MuwxARXMRbehJ4V11TKri7yi74iaJ3U5LpmjKBvOmZd7s1V/EEeQatnSvdfYieFeGmFjgbbcJT8IJqJC5bGYkQjNlKpLyrxye3V/0tg47rbarLWF2K9F173TEV+Tpu3Sw8E9oawpENAa1bYiEmd6gB/pxErjbBQY+P98ZHc9ClfZADCUOT4zJHMd
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft10.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">studera.nu</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">studera.nu (ft10)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.studera.nu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Umeå university</Company>
+    <EmailAddress>fredrik.aslund@ladok.umu.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-sp.xml b/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-sp.xml
new file mode 100644
index 00000000..764c6527
--- /dev/null
+++ b/swamid-2.0-obsolete/ft10.ladok.umu.se-shibboleth-sp.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ft10.ladok.umu.se/shibboleth-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ft10.ladok.umu.se/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ft10</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ft10</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAKXYiyKgoRIwMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+BAMTBGZ0MTAwHhcNMTAwMzI5MjEwNDExWhcNMjAwMzI2MjEwNDExWjAPMQ0wCwYD
+VQQDEwRmdDEwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3JRFv0tI
+AmWbQGB3nh/isslbrpsMyd3/71L8jVaDE7oM1Z+6lw7wFEoHvi5aIuEWX+wZH+Qz
+Tvas1ph4XwITIgWuw3has2+VTrV7CRd9j+VZqI89AD0WZb2A9i+YGtW+uu97g2Ge
+y610GdNyN6CVx1+/9yMQ2xG1NWnT2zFsyo/FNXFW7868zpVwnSFJj1HsBjn1mX11
+5iLRR2aKvI401PnDTDa17SO/oEHY1BN20lMiRkvy2fNnXOGgnmgnq1QUzkM+zq0O
+WPcxgBiJNMgF7oqofngEe7Aj4aUgdvftKZ3NWQqVT4ooX5zP6oOc2La/DrjKn7rZ
+r6oZCmDulHooYwIDAQABozIwMDAPBgNVHREECDAGggRmdDEwMB0GA1UdDgQWBBTh
+RU7zm4zArzyFQ/g3Wn+hQUUlEjANBgkqhkiG9w0BAQUFAAOCAQEAt8dwBFQvBDK7
+SwpZm23Yp6RPn6v5TrEMZB7bqY1uzsNav9jR8lJF+eGXFnSGzEsXlzqMqQDRSgm4
+FfYm+IwQfts+/uCClZbN4JqPS/HG3hR9eUx3dEAIcEFifmXiTUYX/Y8FaIrCT78x
++tc4bM12ZW6u/Dmdwc4VAJnaPoQa4n3cxRPgt5L2pSt5mgefJYAHaolg05U6RwB3
+pMe6RhCajPyyfKswPKOLf+eLBAa/0s98G6xepCoQYcb/IqxFIUSP2JhuMOOjnA1E
+kyW+UIfRS0B8rBKhspXYi5GIT+SQpJbLqfm7hvKo2IEQ+Xqc4JGmqD+Xivn7OpHB
+5CNmPfwS7A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ft10</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ft10</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAKXYiyKgoRIwMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+BAMTBGZ0MTAwHhcNMTAwMzI5MjEwNDExWhcNMjAwMzI2MjEwNDExWjAPMQ0wCwYD
+VQQDEwRmdDEwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3JRFv0tI
+AmWbQGB3nh/isslbrpsMyd3/71L8jVaDE7oM1Z+6lw7wFEoHvi5aIuEWX+wZH+Qz
+Tvas1ph4XwITIgWuw3has2+VTrV7CRd9j+VZqI89AD0WZb2A9i+YGtW+uu97g2Ge
+y610GdNyN6CVx1+/9yMQ2xG1NWnT2zFsyo/FNXFW7868zpVwnSFJj1HsBjn1mX11
+5iLRR2aKvI401PnDTDa17SO/oEHY1BN20lMiRkvy2fNnXOGgnmgnq1QUzkM+zq0O
+WPcxgBiJNMgF7oqofngEe7Aj4aUgdvftKZ3NWQqVT4ooX5zP6oOc2La/DrjKn7rZ
+r6oZCmDulHooYwIDAQABozIwMDAPBgNVHREECDAGggRmdDEwMB0GA1UdDgQWBBTh
+RU7zm4zArzyFQ/g3Wn+hQUUlEjANBgkqhkiG9w0BAQUFAAOCAQEAt8dwBFQvBDK7
+SwpZm23Yp6RPn6v5TrEMZB7bqY1uzsNav9jR8lJF+eGXFnSGzEsXlzqMqQDRSgm4
+FfYm+IwQfts+/uCClZbN4JqPS/HG3hR9eUx3dEAIcEFifmXiTUYX/Y8FaIrCT78x
++tc4bM12ZW6u/Dmdwc4VAJnaPoQa4n3cxRPgt5L2pSt5mgefJYAHaolg05U6RwB3
+pMe6RhCajPyyfKswPKOLf+eLBAa/0s98G6xepCoQYcb/IqxFIUSP2JhuMOOjnA1E
+kyW+UIfRS0B8rBKhspXYi5GIT+SQpJbLqfm7hvKo2IEQ+Xqc4JGmqD+Xivn7OpHB
+5CNmPfwS7A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft10.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft10.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft10.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft10.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.hgo.se-idp-shibboleth.xml b/swamid-2.0-obsolete/idp.hgo.se-idp-shibboleth.xml
new file mode 100644
index 00000000..ebf390a0
--- /dev/null
+++ b/swamid-2.0-obsolete/idp.hgo.se-idp-shibboleth.xml
@@ -0,0 +1,90 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hgo.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">hgo.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDWDCCAkCgAwIBAgIES4+8uzANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJT
+RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
+MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
+c2UwHhcNMTAwMzA0MTM1OTIzWhcNMjAwMzAxMTM1OTIzWjBuMQswCQYDVQQGEwJT
+RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
+MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
+c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZMqgS3wqDLOKVwYHG
+5FRrM13gk+lP+Alm45T0pK192Cl3OWildw4qNiMv10oocbZUoE9PFn6PESSwF6Nt
+2nm3um4ePSbzowYwGOuRLQJfXj4FK3Dj2PO1OLD7oK4VXgka+kG93/oyEaeSfe3t
+93eFgp8bb58b42ED/CAcxvGzcHHyG0WzFTtO3hSuscy/6BKEekVefQJfpPnCuuMN
+2NothDvL+IHO7+DXMeHfH56L1P4fLz+jSMCL2hXGuZxc1f/+l9b4VpegUQx9IGk2
+Rspt3CtOHDI7hhUu5xlbxad0uyAu34dMOz/6jB3UDHYTOEoCjBGhf8RE9zeWFT5D
+VXhtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZdx0R84klmPoZq7uMPh1pPJ76X
+2xpmzCoxhRqjq2Uy9HKfiu9pwo21H9w+PvXhUtdsTInAAhPl1khupPzV/uJeCybl
+mbgtQgNr5UnLtfNz7GQD0EXe0UuC+bP+Qrl6NrCke73MCOLITajJ4ggdfdF3C55e
+G1kXEv3DPMpB8tRlcf4W3fT9ZKR+6zzSOkvuMzLIzv1UBTxUas19DYYNzE3+u/9Q
+8IHjPqr0JsKZiNBRofXwLZ6y2xztQqBVDmV4yNoOLNUDDOFHYwiuR1aAJ2rNoOF7
+UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hgo.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://idp.hgo.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hgo.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hgo.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hgo.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">hgo.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDWDCCAkCgAwIBAgIES4+8uzANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJT
+RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
+MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
+c2UwHhcNMTAwMzA0MTM1OTIzWhcNMjAwMzAxMTM1OTIzWjBuMQswCQYDVQQGEwJT
+RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
+MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
+c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZMqgS3wqDLOKVwYHG
+5FRrM13gk+lP+Alm45T0pK192Cl3OWildw4qNiMv10oocbZUoE9PFn6PESSwF6Nt
+2nm3um4ePSbzowYwGOuRLQJfXj4FK3Dj2PO1OLD7oK4VXgka+kG93/oyEaeSfe3t
+93eFgp8bb58b42ED/CAcxvGzcHHyG0WzFTtO3hSuscy/6BKEekVefQJfpPnCuuMN
+2NothDvL+IHO7+DXMeHfH56L1P4fLz+jSMCL2hXGuZxc1f/+l9b4VpegUQx9IGk2
+Rspt3CtOHDI7hhUu5xlbxad0uyAu34dMOz/6jB3UDHYTOEoCjBGhf8RE9zeWFT5D
+VXhtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZdx0R84klmPoZq7uMPh1pPJ76X
+2xpmzCoxhRqjq2Uy9HKfiu9pwo21H9w+PvXhUtdsTInAAhPl1khupPzV/uJeCybl
+mbgtQgNr5UnLtfNz7GQD0EXe0UuC+bP+Qrl6NrCke73MCOLITajJ4ggdfdF3C55e
+G1kXEv3DPMpB8tRlcf4W3fT9ZKR+6zzSOkvuMzLIzv1UBTxUas19DYYNzE3+u/9Q
+8IHjPqr0JsKZiNBRofXwLZ6y2xztQqBVDmV4yNoOLNUDDOFHYwiuR1aAJ2rNoOF7
+UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hgo.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">HGO</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan på Gotland</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Högskolan på Gotland</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hgo.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Joacim</GivenName>
+    <SurName>Breiler</SurName>
+    <EmailAddress>joacim.breiler@hgo.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0-obsolete/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..ab880659
--- /dev/null
+++ b/swamid-2.0-obsolete/idp.kau.se-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.kau.se/simplesaml/saml2/idp/metadata.php">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID1DCCAz2gAwIBAgIJAOO/YGPtQsqaMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTAeFw0xMDAzMDIxMzA1MTVaFw0yMDAzMDExMzA1MTVaMIGjMQswCQYDVQQGEwJTRTERMA8GA1UECBMIVmFybWxhbmQxETAPBgNVBAcTCEthcmxzdGFkMR4wHAYDVQQKExVLYXJsc3RhZHMgdW5pdmVyc2l0ZXQxFzAVBgNVBAsTDklULWF2ZGVsbmluZ2VuMRMwEQYDVQQDEwppZHAua2F1LnNlMSAwHgYJKoZIhvcNAQkBFhF3ZWJidGVrbmlrQGthdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4Nhzs2PG23/d0EWILyMg0iRuKMJkLOenlaS1HmVoluhJ29QNvzBZatFQOmKvgmoOzYVSUGdTYA5PIECKZn3GQX4kRyv+U95y4/FEPhLcfVU9TLIUs/jv5ZPFpAB/QuLvusBs5iqmyqv3V9tGXdEqthvxs9sQYD1hQ0UJQtllmsCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSJI3Jb/t8UvPkaFLhrRuKSkTjfyTCB2AYDVR0jBIHQMIHNgBSJI3Jb/t8UvPkaFLhrRuKSkTjfyaGBqaSBpjCBozELMAkGA1UEBhMCU0UxETAPBgNVBAgTCFZhcm1sYW5kMREwDwYDVQQHEwhLYXJsc3RhZDEeMBwGA1UEChMVS2FybHN0YWRzIHVuaXZlcnNpdGV0MRcwFQYDVQQLEw5JVC1hdmRlbG5pbmdlbjETMBEGA1UEAxMKaWRwLmthdS5zZTEgMB4GCSqGSIb3DQEJARYRd2ViYnRla25pa0BrYXUuc2WCCQDjv2Bj7ULKmjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKkhBYb9qn9Sm05CD7ZNP0QDnvBX8Sr5uEsFCaYpqQmBlNT7fSxRUBpDnj5wfu0P40wNcZKHUCBmbhHA6bYctT6rR3bM1udT5WZcfngSqg8SX1J2xV5j9ONXPcyaWpRj7XrfLUKJpCbsQorJ4C23grQqB0KlYh0zHq4r4Hxicu+m</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kau.se/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kau.se/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KAU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Karlstad university (test)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kau.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Scott</md:SurName>
+    <md:EmailAddress>paul.scott@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.lhs.se-identity.xml b/swamid-2.0-obsolete/idp.lhs.se-identity.xml
new file mode 100644
index 00000000..d7b520c3
--- /dev/null
+++ b/swamid-2.0-obsolete/idp.lhs.se-identity.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lhs.se/identity">
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">lhs.se</shibmeta:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIByzCCATSgAwIBAgIBADANBgkqhkiG9w0BAQUFADAVMRMwEQYDVQQDEwppZHAubGhzLnNlMB4XDTA3MTAwMTExMjExOFoXDTA4MDkzMDExMjExOFowFTETMBEGA1UEAxMKaWRwLmxocy5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtSdeqn5nVMW4+ctoX2rGMh/o62G6qypOuVIWnKLK10B+pZ7bw8bqJ17zjVqjDKxNvX5QyPXD/mp+K1MPjCfw6Hgf6n2acXiXVXOZPQ+858dBmLzIl3fJAh+t7V3mdbT/PcjgMtgbCWZ48N0xquknoXS2KUOru0W7voTuHxqDOMUCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQAUAndrDJLIPtAmRnE1PmfQpMkO0Cn2HofaiWmmtG6n/IfGFql1cuyTSl9a2kMkHRNK1POUC7fypNmSFhBBxtvtdohCAJLoSKpZXd9KdE5tN2YgMlUFIfPd+2gVD4adgtKNspWQIp5uo83K5RQqSFdJrtQhmB8GjGbR3lRGzu46lg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lhs.se:8443/shibboleth-idp/AA"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">lhs.se</shibmeta:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIByzCCATSgAwIBAgIBADANBgkqhkiG9w0BAQUFADAVMRMwEQYDVQQDEwppZHAubGhzLnNlMB4XDTA3MTAwMTExMjExOFoXDTA4MDkzMDExMjExOFowFTETMBEGA1UEAxMKaWRwLmxocy5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtSdeqn5nVMW4+ctoX2rGMh/o62G6qypOuVIWnKLK10B+pZ7bw8bqJ17zjVqjDKxNvX5QyPXD/mp+K1MPjCfw6Hgf6n2acXiXVXOZPQ+858dBmLzIl3fJAh+t7V3mdbT/PcjgMtgbCWZ48N0xquknoXS2KUOru0W7voTuHxqDOMUCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQAUAndrDJLIPtAmRnE1PmfQpMkO0Cn2HofaiWmmtG6n/IfGFql1cuyTSl9a2kMkHRNK1POUC7fypNmSFhBBxtvtdohCAJLoSKpZXd9KdE5tN2YgMlUFIfPd+2gVD4adgtKNspWQIp5uo83K5RQqSFdJrtQhmB8GjGbR3lRGzu46lg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lhs.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lhs.se/shibboleth-idp/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">LHS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Lärarhögskolan</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.lhs.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Lärarhögskolan</Company>
+    <EmailAddress>info@lhs.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.secure.su.se-identity.xml b/swamid-2.0-obsolete/idp.secure.su.se-identity.xml
new file mode 100644
index 00000000..718248a3
--- /dev/null
+++ b/swamid-2.0-obsolete/idp.secure.su.se-identity.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.secure.su.se/identity">
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmeta:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEsjCCA5qgAwIBAgILAQAAAAABFxsEM3owDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA3MTIyNzA5NTIxNVoXDTEwMTIyNzA5NTIxNVowXTELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEZMBcGA1UEAxMQaWRwLnNlY3VyZS5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8J47onJaot9vYgL5d+VXRuBTlwy4quLRkcFDvAhy9YwzdDAZ0bio2qgVpXMK1aP1kvpOn6+Zy9jUKuwaUraJpE8Yp7dCzTXujrCQSS3sfy+pTwS/kcDUM/sBd16gXU4lfub56+Oiuvi9eRISDKTeZebgTskN2O7gZS91nLSo7xz/Fsrinp3oRWcqZ0VWzc0+zLIldU50ASZ/AqDQQ/JLaqI84b6Ft8JjWZKCGUqBBoRURjvDxqr2e19i2+2mu5Cbayq6IJ62yH+dP3pVd9UZntSXABaTnq2+v9dt/unhOXibzMwh87q+fI9w7SyM7Wy/r6V3qk/aes0bYI6Sj8DW0CAwEAAaOCAW8wggFrMFAGA1UdIARJMEcwRQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYEFMAf54GaLCmlAHIKbGBskYgJ64yTMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMwQTA/BggrBgEFBQcwAoYzaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZWR1Y2F0aW9uYWwuY3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHREEFDASghBpZHAuc2VjdXJlLnN1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQA2ZODtOolJMQNFz86urE/RM3LIwkaaRHv9WN743WEPVyrQ0s7XjYuHAuJCuLVhwteA0ODpbmYJHaesG1O4Hqilv/tRD+8MahGWqA2lk28T7mkx+/Hb2jsZWBIMGNNOf97sZUK100wbnsFvjvBsOAsznnRX2JKOBeemOnIPZR1EmA+VRxUaIHb2/SD63zSsa/+y8xkSYAo1Pxr9MU6jePNIPnMF7ixwfzTZElyoxKuNNbQAuxfvvbRElGs2YCmC9WBY8zGmyHfNWWblVt5tjeNH0pWu+qg1tVBSB9VZZ4xGuKgoMyoYKul4y3raQRiUCUaUmJCdAiQNqsSMpY3QpA+k</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.secure.su.se:8443/shibboleth-idp/AA"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmeta:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEsjCCA5qgAwIBAgILAQAAAAABFxsEM3owDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA3MTIyNzA5NTIxNVoXDTEwMTIyNzA5NTIxNVowXTELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEZMBcGA1UEAxMQaWRwLnNlY3VyZS5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8J47onJaot9vYgL5d+VXRuBTlwy4quLRkcFDvAhy9YwzdDAZ0bio2qgVpXMK1aP1kvpOn6+Zy9jUKuwaUraJpE8Yp7dCzTXujrCQSS3sfy+pTwS/kcDUM/sBd16gXU4lfub56+Oiuvi9eRISDKTeZebgTskN2O7gZS91nLSo7xz/Fsrinp3oRWcqZ0VWzc0+zLIldU50ASZ/AqDQQ/JLaqI84b6Ft8JjWZKCGUqBBoRURjvDxqr2e19i2+2mu5Cbayq6IJ62yH+dP3pVd9UZntSXABaTnq2+v9dt/unhOXibzMwh87q+fI9w7SyM7Wy/r6V3qk/aes0bYI6Sj8DW0CAwEAAaOCAW8wggFrMFAGA1UdIARJMEcwRQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYEFMAf54GaLCmlAHIKbGBskYgJ64yTMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMwQTA/BggrBgEFBQcwAoYzaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZWR1Y2F0aW9uYWwuY3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHREEFDASghBpZHAuc2VjdXJlLnN1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQA2ZODtOolJMQNFz86urE/RM3LIwkaaRHv9WN743WEPVyrQ0s7XjYuHAuJCuLVhwteA0ODpbmYJHaesG1O4Hqilv/tRD+8MahGWqA2lk28T7mkx+/Hb2jsZWBIMGNNOf97sZUK100wbnsFvjvBsOAsznnRX2JKOBeemOnIPZR1EmA+VRxUaIHb2/SD63zSsa/+y8xkSYAo1Pxr9MU6jePNIPnMF7ixwfzTZElyoxKuNNbQAuxfvvbRElGs2YCmC9WBY8zGmyHfNWWblVt5tjeNH0pWu+qg1tVBSB9VZZ4xGuKgoMyoYKul4y3raQRiUCUaUmJCdAiQNqsSMpY3QpA+k</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.secure.su.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.secure.su.se/shibboleth-idp/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">SUOLD</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Stockholms Universitet (gamla inloggningen)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Stockholm University (old)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Stockholm University</Company>
+    <EmailAddress>helpdesk@it.su.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.test.umu.se-identity.xml b/swamid-2.0-obsolete/idp.test.umu.se-identity.xml
new file mode 100644
index 00000000..9b301645
--- /dev/null
+++ b/swamid-2.0-obsolete/idp.test.umu.se-identity.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.test.umu.se/identity">
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">umu.se</shibmeta:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEOjCCAyKgAwIBAgICAd4wDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wODAzMTIxNDEwNDFaFw0wODExMDcxNDEwNDFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggG5MIIBtTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFLWJ/IUQTsdgSBj3xq+hTSN2qZk5MH8GA1UdIwR4MHaAFHaQAcfvra4Asfdp2f4VKKzmMs5AoVukWTBXMQswCQYDVQQGEwJTRTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRMwEQYDVQQLEwpTd1VQS0ktUENBMRkwFwYDVQQDExBTd1VQS0kgUG9saWN5IENBggERMCoGA1UdEgQjMCGBCWNhQHVtdS5zZYYUaHR0cDovL3d3dy5jYS51bXUuc2UwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL3d3dy5jYS51bXUuc2UvY3JsX3YyLmNybDB+BgNVHSAEdzB1MHMGCCqFcCsCAQEBMGcwJAYIKwYBBQUHAgEWGGh0dHA6Ly93d3cuY2EudW11LnNlL0NQUzA/BggrBgEFBQcCAjAzGjFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly93d3cuc3d1cGtpLnN1LnNlL0NQMA0GCSqGSIb3DQEBBQUAA4IBAQBjHF+0/RXKijMD2t6taOHp61TSP47fa/s9gD2H7mjlXKxwf2VHaN2mQ5Cy71atSzWpgfArCbND6lYLIaguDqkj+TtJAse3VBFe/nlaY5ewKxfaCLnnNGGNnoFaoVjTiZYrSYvSsqHjMmwIsgeAhVtAagkmB71B6QRL7nXwAJffNa1LVpVVI4e5T1tKa9BB5Z7LwqZSnC/MnBkNEU9h/Lw3gzIZyijNbnkOAVBnRf9gJwC8dHNafWhHyGj4urC2/GZIR+Mt+5HgQ2DKufHBjMv4a6edLS/gZFb4KfxmjgZDrb0ZC75Y9lcqiz8QZDXbu/4/ptMx7dNkEPfwJyuOD0TP</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.umu.se:9443/shibboleth-idp/AA"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">umu.se</shibmeta:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEOjCCAyKgAwIBAgICAd4wDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxGzAZBgNVBAMTElVtZWEgVW5pdmVyc2l0eSBDQTAeFw0wODAzMTIxNDEwNDFaFw0wODExMDcxNDEwNDFaMEIxCzAJBgNVBAYTAlNFMRkwFwYDVQQKExBVbWVhIHVuaXZlcnNpdGV0MRgwFgYDVQQDEw9pZHAudGVzdC51bXUuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKQGac7vCABvE1YFheXQHgAh1HVl6gFkekBpLJ8sEa6bNu/adQOW2xFI801HfgW3xqQYW48wLinru22nPUE3cF30ISIB/r8qL6mw6c1nkZB62g3Svy42mW7ay7Kio+W3gS9NxEHoiHvCLPVYFBtOKe3FVwV1mnBffEv9jvbGfYYfAgMBAAGjggG5MIIBtTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFLWJ/IUQTsdgSBj3xq+hTSN2qZk5MH8GA1UdIwR4MHaAFHaQAcfvra4Asfdp2f4VKKzmMs5AoVukWTBXMQswCQYDVQQGEwJTRTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRMwEQYDVQQLEwpTd1VQS0ktUENBMRkwFwYDVQQDExBTd1VQS0kgUG9saWN5IENBggERMCoGA1UdEgQjMCGBCWNhQHVtdS5zZYYUaHR0cDovL3d3dy5jYS51bXUuc2UwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL3d3dy5jYS51bXUuc2UvY3JsX3YyLmNybDB+BgNVHSAEdzB1MHMGCCqFcCsCAQEBMGcwJAYIKwYBBQUHAgEWGGh0dHA6Ly93d3cuY2EudW11LnNlL0NQUzA/BggrBgEFBQcCAjAzGjFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly93d3cuc3d1cGtpLnN1LnNlL0NQMA0GCSqGSIb3DQEBBQUAA4IBAQBjHF+0/RXKijMD2t6taOHp61TSP47fa/s9gD2H7mjlXKxwf2VHaN2mQ5Cy71atSzWpgfArCbND6lYLIaguDqkj+TtJAse3VBFe/nlaY5ewKxfaCLnnNGGNnoFaoVjTiZYrSYvSsqHjMmwIsgeAhVtAagkmB71B6QRL7nXwAJffNa1LVpVVI4e5T1tKa9BB5Z7LwqZSnC/MnBkNEU9h/Lw3gzIZyijNbnkOAVBnRf9gJwC8dHNafWhHyGj4urC2/GZIR+Mt+5HgQ2DKufHBjMv4a6edLS/gZFb4KfxmjgZDrb0ZC75Y9lcqiz8QZDXbu/4/ptMx7dNkEPfwJyuOD0TP</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.umu.se:9443/shibboleth-idp/Artifact" index="1" isDefault="true"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.test.umu.se:9443/shibboleth-idp/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">UU</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>UMDAC</Company>
+    <GivenName>Einar</GivenName>
+    <SurName>Hillbom</SurName>
+    <EmailAddress>einar.hillbom@umdac.umu.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp.umu.se-shib13-idp-metadata.php.xml b/swamid-2.0-obsolete/idp.umu.se-shib13-idp-metadata.php.xml
new file mode 100644
index 00000000..500b3a78
--- /dev/null
+++ b/swamid-2.0-obsolete/idp.umu.se-shib13-idp-metadata.php.xml
@@ -0,0 +1,33 @@
+<?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://idp.umu.se/shib13/idp/metadata.php">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.umu.se/shib13/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
+    <md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Umeå University (SAML1)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="se">Umeå universitet (SAML1)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Datordrift</md:SurName>
+    <md:EmailAddress>datordrift@umdac.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp1.irf.se-idp-shibboleth.xml b/swamid-2.0-obsolete/idp1.irf.se-idp-shibboleth.xml
new file mode 100644
index 00000000..3e14b10f
--- /dev/null
+++ b/swamid-2.0-obsolete/idp1.irf.se-idp-shibboleth.xml
@@ -0,0 +1,87 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.irf.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUc74js9dRvbf1KNNKFdoKAZ3Td2cwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwMS5pcmYuc2UwHhcNMTAwMzEwMTI1NzQxWhcNMzAw
+MzEwMTI1NzQxWjAWMRQwEgYDVQQDEwtpZHAxLmlyZi5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAK/A9Csx8DKOhm2POYJ+sXKTVSFKvkPBwylanX8R
+Zs231QpViJAGisUZe77pEgQriQi7IgKM7X0olaZspkzcLrK3170z5nXCTtcVB+jC
+beGfoqE5wgElSi53TCUWVGhVKOndklYLrGawurN4v8jdI6smaOQRKQAV+0NbbjI6
+uME1w9sqdvDPo0g9NAlr4jfPVz/NwVp6xnzs0IPZuYgxb1g2iY6lEgs1/W7H4Kit
+Hm+kTBPaWGEE5f38mGbFCqmyfnWM8l2W9nWwpf+vgtB9lK6CP255OjNhCALMOosR
+4TVoC/Htkr6+OukiA2xnGNXUxkzPilnpavbygEmMGwHleVECAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMS5pcmYuc2WGImh0dHBzOi8vaWRwMS5pcmYuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFKXU8NQrZt3kxcBNeMhPig237jUPMA0GCSqGSIb3
+DQEBBQUAA4IBAQCAn0jjiU08tmYmB9DwUZ1ZuMj+L/sAbqOyIRkcDwVD6HcB3HUD
+NwsqShpuG4ciggHH70/lRKXbKyhOc3/9L+yMGADivO2yFvG5cG++Z/AGhaOUMQEd
+jEp0q5N9H9yEHJEusx6CG+89neeXPYur2STexspPjOtdymkDla7Npgdnb61/3u9e
+O8AwyVHsB1XhyQ6sDiPhum5ZWXLz6SZc8AKrUFe3ZOk6osXO79u2xJp5K7o+ihKs
+pmmsdRKvHmnn0lzvLPkt4I0TjJ1mjC76HfMswn2LZF3sRDpU+O+dvJVJTdXgXD7C
+s8bdl69BX1bpjKcPiO5aQVzP1rPysa6vEfcr
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.irf.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://idp1.irf.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.irf.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.irf.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUc74js9dRvbf1KNNKFdoKAZ3Td2cwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwMS5pcmYuc2UwHhcNMTAwMzEwMTI1NzQxWhcNMzAw
+MzEwMTI1NzQxWjAWMRQwEgYDVQQDEwtpZHAxLmlyZi5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAK/A9Csx8DKOhm2POYJ+sXKTVSFKvkPBwylanX8R
+Zs231QpViJAGisUZe77pEgQriQi7IgKM7X0olaZspkzcLrK3170z5nXCTtcVB+jC
+beGfoqE5wgElSi53TCUWVGhVKOndklYLrGawurN4v8jdI6smaOQRKQAV+0NbbjI6
+uME1w9sqdvDPo0g9NAlr4jfPVz/NwVp6xnzs0IPZuYgxb1g2iY6lEgs1/W7H4Kit
+Hm+kTBPaWGEE5f38mGbFCqmyfnWM8l2W9nWwpf+vgtB9lK6CP255OjNhCALMOosR
+4TVoC/Htkr6+OukiA2xnGNXUxkzPilnpavbygEmMGwHleVECAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMS5pcmYuc2WGImh0dHBzOi8vaWRwMS5pcmYuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFKXU8NQrZt3kxcBNeMhPig237jUPMA0GCSqGSIb3
+DQEBBQUAA4IBAQCAn0jjiU08tmYmB9DwUZ1ZuMj+L/sAbqOyIRkcDwVD6HcB3HUD
+NwsqShpuG4ciggHH70/lRKXbKyhOc3/9L+yMGADivO2yFvG5cG++Z/AGhaOUMQEd
+jEp0q5N9H9yEHJEusx6CG+89neeXPYur2STexspPjOtdymkDla7Npgdnb61/3u9e
+O8AwyVHsB1XhyQ6sDiPhum5ZWXLz6SZc8AKrUFe3ZOk6osXO79u2xJp5K7o+ihKs
+pmmsdRKvHmnn0lzvLPkt4I0TjJ1mjC76HfMswn2LZF3sRDpU+O+dvJVJTdXgXD7C
+s8bdl69BX1bpjKcPiO5aQVzP1rPysa6vEfcr
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.irf.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IRF</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Mats</GivenName>
+    <SurName>Luspa</SurName>
+    <EmailAddress>matsl@irf.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/idp1.unit.liu.se-idp-shibboleth.xml b/swamid-2.0-obsolete/idp1.unit.liu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..02bffddc
--- /dev/null
+++ b/swamid-2.0-obsolete/idp1.unit.liu.se-idp-shibboleth.xml
@@ -0,0 +1,86 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.unit.liu.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUL9NrL6v4aXTO+WnTc/pTLVej0o8wDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQaWRwMS51bml0LmxpdS5zZTAeFw0wOTA2MjUwNjIxMTRa
+Fw0yOTA2MjUwNjIxMTRaMBsxGTAXBgNVBAMTEGlkcDEudW5pdC5saXUuc2UwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCByYjmpeGcN/HcpxCZEH1HSsZ3
+KyBS8xf8wac86C51yYtVj8Q/Xsb467VqwRbA/HeOMxtKxmuJXSO4nWHVCQQ7wDI2
+7q5/LJCXVJ/ruMLDykb2nSxM10Z0eiyxFIxJlnzUyHY+etPD2bZy2u2vQoS/X444
+RRhwMTOvHOw9fQpBngXXfxypv8YvSVQ9vIcKvRc9VlypiXXDqCBqG0FscwVuQGzU
+V8MaNhbMp02pjlAfuMg4S7yCP5Dt06N09gqXuvGB0A/rvVNJnyBbbrwaPy1RNxhP
+jQbbthT3ostMmaYpUITXX3mEzWlyU88jRhjRKn4lZDRnFCIovXs0VO9NkNZ7AgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcDEudW5pdC5saXUuc2WGJ2h0dHBzOi8vaWRw
+MS51bml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxohFt42mx6y6
+0tGVGwUT2QAnsGUwDQYJKoZIhvcNAQEFBQADggEBAGwXP3gyV2Aa6YxYAruv0Zdg
+DrKijhKsOFAAsWU1P42yW/gYf9na90cAxYwZ37CE2rzbNxz4MUKtko2/2aGKWSZh
+BdK2vJGCD8tyiJLmPpmJ4JoLV5gZHEZctAQ96r3+oj9Tqv/p/URoktAHIA4wmz+0
+sx+zkbDicFCvGJ2e3AHdxHklQK9Vs8njbmkKTxIFjU9iHntK1K4DIhIYbItd7pOw
+bZoWErCv/72HTScd6cjOwu6He4nAraDiTcqobdMUVQ61dm425OQFcdqpNx6uCC4F
+dUEqq3+CKSvEAMSbdXUY3cQClvE72Yr8fk2c7iM2dNChI1XyG1GcM5qDlrs4U0U=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.unit.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.unit.liu.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://idp1.unit.liu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.unit.liu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.unit.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.unit.liu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUL9NrL6v4aXTO+WnTc/pTLVej0o8wDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQaWRwMS51bml0LmxpdS5zZTAeFw0wOTA2MjUwNjIxMTRa
+Fw0yOTA2MjUwNjIxMTRaMBsxGTAXBgNVBAMTEGlkcDEudW5pdC5saXUuc2UwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCByYjmpeGcN/HcpxCZEH1HSsZ3
+KyBS8xf8wac86C51yYtVj8Q/Xsb467VqwRbA/HeOMxtKxmuJXSO4nWHVCQQ7wDI2
+7q5/LJCXVJ/ruMLDykb2nSxM10Z0eiyxFIxJlnzUyHY+etPD2bZy2u2vQoS/X444
+RRhwMTOvHOw9fQpBngXXfxypv8YvSVQ9vIcKvRc9VlypiXXDqCBqG0FscwVuQGzU
+V8MaNhbMp02pjlAfuMg4S7yCP5Dt06N09gqXuvGB0A/rvVNJnyBbbrwaPy1RNxhP
+jQbbthT3ostMmaYpUITXX3mEzWlyU88jRhjRKn4lZDRnFCIovXs0VO9NkNZ7AgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcDEudW5pdC5saXUuc2WGJ2h0dHBzOi8vaWRw
+MS51bml0LmxpdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxohFt42mx6y6
+0tGVGwUT2QAnsGUwDQYJKoZIhvcNAQEFBQADggEBAGwXP3gyV2Aa6YxYAruv0Zdg
+DrKijhKsOFAAsWU1P42yW/gYf9na90cAxYwZ37CE2rzbNxz4MUKtko2/2aGKWSZh
+BdK2vJGCD8tyiJLmPpmJ4JoLV5gZHEZctAQ96r3+oj9Tqv/p/URoktAHIA4wmz+0
+sx+zkbDicFCvGJ2e3AHdxHklQK9Vs8njbmkKTxIFjU9iHntK1K4DIhIYbItd7pOw
+bZoWErCv/72HTScd6cjOwu6He4nAraDiTcqobdMUVQ61dm425OQFcdqpNx6uCC4F
+dUEqq3+CKSvEAMSbdXUY3cQClvE72Yr8fk2c7iM2dNChI1XyG1GcM5qDlrs4U0U=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.unit.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.unit.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">LiU</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Linköping University (TEST IdP)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.liu.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Linköping University</Company>
+    <EmailAddress>jonathan.sussemilch.poulain@liu.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/medieportaltest.kau.se-shibboleth.xml b/swamid-2.0-obsolete/medieportaltest.kau.se-shibboleth.xml
new file mode 100644
index 00000000..fee019fe
--- /dev/null
+++ b/swamid-2.0-obsolete/medieportaltest.kau.se-shibboleth.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://medieportaltest.kau.se/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://medieportaltest.kau.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>mediaportaltest.kau.se</ds:KeyName>
+        <ds:KeyName>medieportaltest.kau.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=medieportaltest.kau.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAKDRtBQXxP+HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFm1lZGllcG9ydGFsdGVzdC5rYXUuc2UwHhcNMTExMDE2MDQyNjM0WhcNMjEx
+MDEzMDQyNjM0WjAhMR8wHQYDVQQDExZtZWRpZXBvcnRhbHRlc3Qua2F1LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwuChTNh0yraiIg2lZxckf3B1
+6C5X/dLrN5UADuCBSgGg7AkYxHR4OKf2mjYURDpb0ULVUUKSZmQ9j+mubvUlYPTl
+16zusB+uILVkt40Bz7bYNcyuL3Gqohy2M0EvuEtFQx4rA85Xhgeb2K1YSnAhA+rm
+HX9Z1Wr7+w7ogOVvXuk0QBSE1iKhYRmFArs0ggKtT0A2gi9GiXIXSoCk0J9bHCDa
+djalxYbvOmIXjHn7B/wI0u/SCVT+kp9dm/EDOFRsiK+JO7kIVrOFiNa1Uyupzi+P
+VmkfsFsVM/7vyzAcWiuAPX+N3gNaD8Mqc9xZVuRHWcpTIYEFQLh6am+XjrGVCQID
+AQABo1wwWjA5BgNVHREEMjAwghZtZWRpZXBvcnRhbHRlc3Qua2F1LnNlhhZtZWRp
+YXBvcnRhbHRlc3Qua2F1LnNlMB0GA1UdDgQWBBQ9J62qTGrTe6JgehYM3S0bK6AD
+JzANBgkqhkiG9w0BAQUFAAOCAQEAYv20nFTbODqZkvRZtJU/3ApoYR5mmudiM/Fw
+eIKlR3OcPZ6+qhynkvAVjRav9PL7xEwOQtbgUC/k/PHnVjK/TyDcgXDogdlYXXZW
+layAJyHHeo4pjF1msBH8RUi1LqLKatbL2/U6XuGq3oLV7Cha8FQwDaZLyPiNYK9t
+DPYtUI1uVdM2kQhU/ia1WCOtntRZ9qx/n+T+FX7Q8JWHhEoi46iEJ1AA4xMELSz2
+O+GySKfdTPfjd9jbUhHo/KHutxtVLWPh3BGR1RSEAAIzGsI9N5s+yFXXf/MVgieY
+GUwA19+wdyIxPgPJxJjsz6+zXMVTPRLexVBhGepW+c9w69YV3Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>mediaportaltest.kau.se</ds:KeyName>
+        <ds:KeyName>medieportaltest.kau.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=medieportaltest.kau.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAKDRtBQXxP+HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFm1lZGllcG9ydGFsdGVzdC5rYXUuc2UwHhcNMTExMDE2MDQyNjM0WhcNMjEx
+MDEzMDQyNjM0WjAhMR8wHQYDVQQDExZtZWRpZXBvcnRhbHRlc3Qua2F1LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwuChTNh0yraiIg2lZxckf3B1
+6C5X/dLrN5UADuCBSgGg7AkYxHR4OKf2mjYURDpb0ULVUUKSZmQ9j+mubvUlYPTl
+16zusB+uILVkt40Bz7bYNcyuL3Gqohy2M0EvuEtFQx4rA85Xhgeb2K1YSnAhA+rm
+HX9Z1Wr7+w7ogOVvXuk0QBSE1iKhYRmFArs0ggKtT0A2gi9GiXIXSoCk0J9bHCDa
+djalxYbvOmIXjHn7B/wI0u/SCVT+kp9dm/EDOFRsiK+JO7kIVrOFiNa1Uyupzi+P
+VmkfsFsVM/7vyzAcWiuAPX+N3gNaD8Mqc9xZVuRHWcpTIYEFQLh6am+XjrGVCQID
+AQABo1wwWjA5BgNVHREEMjAwghZtZWRpZXBvcnRhbHRlc3Qua2F1LnNlhhZtZWRp
+YXBvcnRhbHRlc3Qua2F1LnNlMB0GA1UdDgQWBBQ9J62qTGrTe6JgehYM3S0bK6AD
+JzANBgkqhkiG9w0BAQUFAAOCAQEAYv20nFTbODqZkvRZtJU/3ApoYR5mmudiM/Fw
+eIKlR3OcPZ6+qhynkvAVjRav9PL7xEwOQtbgUC/k/PHnVjK/TyDcgXDogdlYXXZW
+layAJyHHeo4pjF1msBH8RUi1LqLKatbL2/U6XuGq3oLV7Cha8FQwDaZLyPiNYK9t
+DPYtUI1uVdM2kQhU/ia1WCOtntRZ9qx/n+T+FX7Q8JWHhEoi46iEJ1AA4xMELSz2
+O+GySKfdTPfjd9jbUhHo/KHutxtVLWPh3BGR1RSEAAIzGsI9N5s+yFXXf/MVgieY
+GUwA19+wdyIxPgPJxJjsz6+zXMVTPRLexVBhGepW+c9w69YV3Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://medieportaltest.kau.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://medieportaltest.kau.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medieportaltest.kau.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medieportaltest.kau.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medieportaltest.kau.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://medieportaltest.kau.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medieportaltest.kau.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medieportaltest.kau.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medieportaltest.kau.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medieportaltest.kau.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-idp.xml b/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-idp.xml
new file mode 100644
index 00000000..2480663f
--- /dev/null
+++ b/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-idp.xml
@@ -0,0 +1,43 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://nb10.ladok.umu.se/shibboleth-idp">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDDjCCAfagAwIBAgIJAMpOmLHAAQ5bMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0xMDAyMTExNTIyMzRaFw0yMDAyMDkxNTIyMzRaMA4xDDAKBgNVBAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOp/Esl7gtsEeVP2c6s4HRMdLiy17FiqnVUShnaHIKtjXXxvWjBFvPcyKTyQeFxT9Kg1TjTrUed4DSnxefb7xPy/KqryfbheBzHbuLnEuv9EoMsOHbLvNY/FMFUidPcZhvpQq9yydpS62UY41EHDasywndoImIfvda5frHBTAs8+DlXPvHUWKsIFGssw5WCx5KpGspWgfWTlAVLAEA5EaDKKGhjRb+PgzVyjCLK6umrsOUhCcorC7c3Fp+aFJW0pO3wNGguUoLObJ4yazpENvuWQGUpfWFpS5E1jSeHqu66VYH+iFBxiP6PZ/Ikd2u+XT0Aj+9ye7cknD+LKXoLvCYECAwEAAaNvMG0wHQYDVR0OBBYEFIW+FvQoNa3MdXkHiigNh+ZyLhajMD4GA1UdIwQ3MDWAFIW+FvQoNa3MdXkHiigNh+ZyLhajoRKkEDAOMQwwCgYDVQQDEwNpZHCCCQDKTpixwAEOWzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfKIYeeE+X7YNbIp2NKTuR2wSgPT3j3iGXzQ9RXf+ntZVes4WNZaGx3aEG1C7Ku96CgGoewngvwM4cWMECTRTX82lWCK3ef4/Ds3uoqb/nDw+pz1UZcgyhyurfPyhPbvHxkpT19X+2MQovgYvtBLMeAqzjmYI+wWoWT/+i6blv81nEOLhR/V95KXSlzxcNVCBMM5p5AjohFT/XcaGM8X7oYT+pUcFmaLX4F5UbwIIMjvDmZSK10Ms9U+sIBTWbcW43m81wFA/xDPJ5/jTo3jF5J5nS9Uncn4asFYAPZcouSXzQO3nwrMWMvBv23STOgMvnb74zI630Rc6p3QJzP3EM
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se:8443/shibboleth-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://nb10.ladok.umu.se:444/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb10.ladok.umu.se:444/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">studera.nu</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDDjCCAfagAwIBAgIJAMpOmLHAAQ5bMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNVBAMTA2lkcDAeFw0xMDAyMTExNTIyMzRaFw0yMDAyMDkxNTIyMzRaMA4xDDAKBgNVBAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOp/Esl7gtsEeVP2c6s4HRMdLiy17FiqnVUShnaHIKtjXXxvWjBFvPcyKTyQeFxT9Kg1TjTrUed4DSnxefb7xPy/KqryfbheBzHbuLnEuv9EoMsOHbLvNY/FMFUidPcZhvpQq9yydpS62UY41EHDasywndoImIfvda5frHBTAs8+DlXPvHUWKsIFGssw5WCx5KpGspWgfWTlAVLAEA5EaDKKGhjRb+PgzVyjCLK6umrsOUhCcorC7c3Fp+aFJW0pO3wNGguUoLObJ4yazpENvuWQGUpfWFpS5E1jSeHqu66VYH+iFBxiP6PZ/Ikd2u+XT0Aj+9ye7cknD+LKXoLvCYECAwEAAaNvMG0wHQYDVR0OBBYEFIW+FvQoNa3MdXkHiigNh+ZyLhajMD4GA1UdIwQ3MDWAFIW+FvQoNa3MdXkHiigNh+ZyLhajoRKkEDAOMQwwCgYDVQQDEwNpZHCCCQDKTpixwAEOWzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfKIYeeE+X7YNbIp2NKTuR2wSgPT3j3iGXzQ9RXf+ntZVes4WNZaGx3aEG1C7Ku96CgGoewngvwM4cWMECTRTX82lWCK3ef4/Ds3uoqb/nDw+pz1UZcgyhyurfPyhPbvHxkpT19X+2MQovgYvtBLMeAqzjmYI+wWoWT/+i6blv81nEOLhR/V95KXSlzxcNVCBMM5p5AjohFT/XcaGM8X7oYT+pUcFmaLX4F5UbwIIMjvDmZSK10Ms9U+sIBTWbcW43m81wFA/xDPJ5/jTo3jF5J5nS9Uncn4asFYAPZcouSXzQO3nwrMWMvBv23STOgMvnb74zI630Rc6p3QJzP3EM
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-sp.xml b/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-sp.xml
new file mode 100644
index 00000000..09765aea
--- /dev/null
+++ b/swamid-2.0-obsolete/nb10.ladok.umu.se-shibboleth-sp.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nb10.ladok.umu.se/shibboleth-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>nb10</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nb10</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAPZ7n1Rwjq+5MA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+BAMTBG5iMTAwHhcNMTAwMzI2MTYxMjA0WhcNMjAwMzIzMTYxMjA0WjAPMQ0wCwYD
+VQQDEwRuYjEwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxJmbPVnm
+VHTONxF4zwYYFGe25BD7zRUNnODV3KPGybF0EM91hLyH4qPmucdnVmVkllMJym/N
+yRd0VNGmfEehlPWpUoBw5jYjTauncDJgbdApfRb6uZtPoVECI7+2BaArVMZoDBaF
+v0suy7jmASEx1WoxXRJg1uKb1oHk6jYSVgDKmEDHz93l/6b2zjEqBdOZ5qOjyv/c
+WVJXtzWgOwho8ZNfz9J2P8biFruhzpv/tf9QR+80nLY8hD2iCJ1jasuoQUCsw+fM
+Cgul/exYNFHkU+PSIn/uF8IIueD8xkUPehjhPI3uDmvYf8dnU+YLAHuGKLdRVpH6
++Cl4j7cugnu/UwIDAQABozIwMDAPBgNVHREECDAGggRuYjEwMB0GA1UdDgQWBBSQ
+wLix1r/0hsD4AqIz/3mWa1dbSDANBgkqhkiG9w0BAQUFAAOCAQEAZ9jKPHbRKSn7
+Ybz3ORxnw12vgOr5RoN82ITZGMylpJdSnuCC101wh+L5baa6YPZB+vh2yJRiys9j
+BGyT1Y0mHFxPrScsL8oJfX3wZJBFXkj1x1xGD5VzPae4KnkPdTig0hc0/bWTu+HU
+U19KXjxXlZj66d+fEyuqTf6M8AYWnkae1UCIEeABCKOskpbcq7HRJYYsxLOhJR2g
+JMGziVsjtffaPKOaFXMYWr3U3qF6P1j0XtgHec7mpOdqEjvzFXa67TXrogbPsrb+
+NzDd6GwWzSIZYROepS6fiAPNL/WwoKNRzbOl2j2Bm69N4w9Pa7Vuf4VxooBSnmpW
+KyI1tqS2gQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>nb10</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nb10</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAPZ7n1Rwjq+5MA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+BAMTBG5iMTAwHhcNMTAwMzI2MTYxMjA0WhcNMjAwMzIzMTYxMjA0WjAPMQ0wCwYD
+VQQDEwRuYjEwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxJmbPVnm
+VHTONxF4zwYYFGe25BD7zRUNnODV3KPGybF0EM91hLyH4qPmucdnVmVkllMJym/N
+yRd0VNGmfEehlPWpUoBw5jYjTauncDJgbdApfRb6uZtPoVECI7+2BaArVMZoDBaF
+v0suy7jmASEx1WoxXRJg1uKb1oHk6jYSVgDKmEDHz93l/6b2zjEqBdOZ5qOjyv/c
+WVJXtzWgOwho8ZNfz9J2P8biFruhzpv/tf9QR+80nLY8hD2iCJ1jasuoQUCsw+fM
+Cgul/exYNFHkU+PSIn/uF8IIueD8xkUPehjhPI3uDmvYf8dnU+YLAHuGKLdRVpH6
++Cl4j7cugnu/UwIDAQABozIwMDAPBgNVHREECDAGggRuYjEwMB0GA1UdDgQWBBSQ
+wLix1r/0hsD4AqIz/3mWa1dbSDANBgkqhkiG9w0BAQUFAAOCAQEAZ9jKPHbRKSn7
+Ybz3ORxnw12vgOr5RoN82ITZGMylpJdSnuCC101wh+L5baa6YPZB+vh2yJRiys9j
+BGyT1Y0mHFxPrScsL8oJfX3wZJBFXkj1x1xGD5VzPae4KnkPdTig0hc0/bWTu+HU
+U19KXjxXlZj66d+fEyuqTf6M8AYWnkae1UCIEeABCKOskpbcq7HRJYYsxLOhJR2g
+JMGziVsjtffaPKOaFXMYWr3U3qF6P1j0XtgHec7mpOdqEjvzFXa67TXrogbPsrb+
+NzDd6GwWzSIZYROepS6fiAPNL/WwoKNRzbOl2j2Bm69N4w9Pa7Vuf4VxooBSnmpW
+KyI1tqS2gQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb10.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb10.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb10.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb10.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/roundup.it.su.se.xml b/swamid-2.0-obsolete/roundup.it.su.se.xml
new file mode 100644
index 00000000..c1393c6c
--- /dev/null
+++ b/swamid-2.0-obsolete/roundup.it.su.se.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://roundup.it.su.se">
+  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbzCCA1egAwIBAgIRAOOIoW9xqDSfIltHyx8Jm8YwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTExMTgwMDAwMDBaFw0xMjExMTcyMzU5NTlaMEkxCzAJBgNV
+BAYTAlNFMR8wHQYDVQQKExZTdG9ja2hvbG1zIHVuaXZlcnNpdGV0MRkwFwYDVQQD
+ExByb3VuZHVwLml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyaa/LVY8eUxB/gK86emIR/C+7rG4sFaP7Jc3lNfRHQR/KmCdECwcQWShGsy1
+gnA2d5X7i/eXuWijk7dr7u5mVdCWrQ+rHBEE7DbX+9roDVIIM/eTDTo8HjpSX0pR
+3xmj8j33dJdjQUucdrfpx/1S1OwlvT7+Y5AqACyBoxH6XT4yGQHnxsPyK5JOBW1a
+S2DR3Fs3RDVkQjUFUZRdFey8YW2kmnIRKBAi1YTOi496wPpISovOmLASZZqVwMMF
+iDwLLWz6GbRvaPPa16kq9SQY2Bc4bNIqfEfXrOemqFmnvW4YUWxqAPaG1/qU3sRM
+2AW5eiGh3WYf0jC6rKHFmEY/vwIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2T
+aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKwiX0euXmkvdLT+lXwy8k4d+iCg
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEHJvdW5kdXAuaXQuc3Uuc2Uw
+DQYJKoZIhvcNAQEFBQADggEBABSYEIPbRorJTJHPaxXAwZU61CjKGSpTGOm6w1Eu
+kucMFRMFX+yxes/AmvgKNr+XcaWZcW1SYKd4FRIt2S6wghd0p1lMQBs2HGt6dNBO
+JDhCayjtfLhgSrAVc3aO8XLAdLqzBEL9FHHn0YJ489UL77+1qCtnt1KO4EWEHA7b
+TY93MXIatJgS0IpprD15gJ+2Tf2JEBMSv2Ne070GD/cpQ0S/mNhc0F8KZ9Dl+UBj
+TJFae2AdnxbUwP+Uyqgx3vA6xSEpHCezYy2f9KnDs77/AYQzFj2HTeyjS+CEfjfZ
+L3icoXenJnD8XOBe79BIPXkxxZCn+es6y1NoUK3d9U1iaEQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://roundup.it.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">SU</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Stockholm university</Company>
+    <GivenName>Joakim</GivenName>
+    <SurName>Lundin</SurName>
+    <EmailAddress>jolu@it.su.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/shib-sp-test.oru.se-shibboleth.xml b/swamid-2.0-obsolete/shib-sp-test.oru.se-shibboleth.xml
new file mode 100644
index 00000000..5f320eec
--- /dev/null
+++ b/swamid-2.0-obsolete/shib-sp-test.oru.se-shibboleth.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp-test.oru.se/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shib-sp-test.oru.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib-sp-test.oru.se</ds:X509SubjectName>
+          <ds:X509IssuerSerial>
+            <ds:X509IssuerName>CN=shib-sp-test.oru.se</ds:X509IssuerName>
+            <ds:X509SerialNumber>15204698817365748467</ds:X509SerialNumber>
+          </ds:X509IssuerSerial>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJANMB8QQ14yrzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3NoaWItc3AtdGVzdC5vcnUuc2UwHhcNMTAwNDE1MTEwNzM5WhcNMjAwNDEy
+MTEwNzM5WjAeMRwwGgYDVQQDExNzaGliLXNwLXRlc3Qub3J1LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr41GEPTp07h+gL5wv55qutEqaR0Qb9Yx
+XEXu/ph7oXrRS0UbuLb5LyDgHNf9hIwMC5rd9oGWusyxvDhNXXKnP1PusqyqHYB8
+RfBPExrrLhqv9AJjuk15BGCoryeyuByCTBA3OwEp7p8Vv11lMGO52igSmrL/5tAU
+ijh9nKCJWdlV/GmRqidcUHOlN5k1MNnLZSr3VqpE2ixHBx+31EFlZvH2doisPl05
+EL9sjL3rpRL2JUx0R31UIkjs7WrHMge6fmaR8blYBiTbDr7td/Mw+jI1i/40iBT3
+6qqCDp0hzhFVQGL0wbCdjSA+Fko8/HC2WESYyR3wR0b98dynZYHq4QIDAQABo0Ew
+PzAeBgNVHREEFzAVghNzaGliLXNwLXRlc3Qub3J1LnNlMB0GA1UdDgQWBBTRhstJ
+XhYfb4dGIfqAMiMSrRN5cTANBgkqhkiG9w0BAQUFAAOCAQEApDbCA7x/ZrZbeBW6
+Ulnh93k61QHCEHUI7lTAYURbelbvTJCR13Wo2yK7VIhK83eGYcRPuJfaZFx8ILMp
++ADWMEx4cdkG1aV0CrjRKy214pW1jtINOocaw/cI9T6XxyF6NQIRGrg0kcOjn/9B
+zIareRd4O9iioeVerfOY397kkP96U3osVhsPd4QuPMSQ0a3ixsMrK3U7KsrNb2ZU
+ehoMOCW85fFptZoo6VRtv7d+ivOBIDe+T4OwGmj0/KoCYT5iY4/047SRHWEtCQIO
+TqM7uwKSE3lL6DXewbrm2Nse+PXfS7odY/cCAdnHUompMNs468b6i/Eh7sC90QxV
+FJ5AlQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shib-sp-test.oru.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib-sp-test.oru.se</ds:X509SubjectName>
+          <ds:X509IssuerSerial>
+            <ds:X509IssuerName>CN=shib-sp-test.oru.se</ds:X509IssuerName>
+            <ds:X509SerialNumber>15204698817365748467</ds:X509SerialNumber>
+          </ds:X509IssuerSerial>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJANMB8QQ14yrzMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3NoaWItc3AtdGVzdC5vcnUuc2UwHhcNMTAwNDE1MTEwNzM5WhcNMjAwNDEy
+MTEwNzM5WjAeMRwwGgYDVQQDExNzaGliLXNwLXRlc3Qub3J1LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr41GEPTp07h+gL5wv55qutEqaR0Qb9Yx
+XEXu/ph7oXrRS0UbuLb5LyDgHNf9hIwMC5rd9oGWusyxvDhNXXKnP1PusqyqHYB8
+RfBPExrrLhqv9AJjuk15BGCoryeyuByCTBA3OwEp7p8Vv11lMGO52igSmrL/5tAU
+ijh9nKCJWdlV/GmRqidcUHOlN5k1MNnLZSr3VqpE2ixHBx+31EFlZvH2doisPl05
+EL9sjL3rpRL2JUx0R31UIkjs7WrHMge6fmaR8blYBiTbDr7td/Mw+jI1i/40iBT3
+6qqCDp0hzhFVQGL0wbCdjSA+Fko8/HC2WESYyR3wR0b98dynZYHq4QIDAQABo0Ew
+PzAeBgNVHREEFzAVghNzaGliLXNwLXRlc3Qub3J1LnNlMB0GA1UdDgQWBBTRhstJ
+XhYfb4dGIfqAMiMSrRN5cTANBgkqhkiG9w0BAQUFAAOCAQEApDbCA7x/ZrZbeBW6
+Ulnh93k61QHCEHUI7lTAYURbelbvTJCR13Wo2yK7VIhK83eGYcRPuJfaZFx8ILMp
++ADWMEx4cdkG1aV0CrjRKy214pW1jtINOocaw/cI9T6XxyF6NQIRGrg0kcOjn/9B
+zIareRd4O9iioeVerfOY397kkP96U3osVhsPd4QuPMSQ0a3ixsMrK3U7KsrNb2ZU
+ehoMOCW85fFptZoo6VRtv7d+ivOBIDe+T4OwGmj0/KoCYT5iY4/047SRHWEtCQIO
+TqM7uwKSE3lL6DXewbrm2Nse+PXfS7odY/cCAdnHUompMNs468b6i/Eh7sC90QxV
+FJ5AlQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-test.oru.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-test.oru.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-test.oru.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-test.oru.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp-test.oru.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/shibboleth.sys.kth.se-identity.xml b/swamid-2.0-obsolete/shibboleth.sys.kth.se-identity.xml
new file mode 100644
index 00000000..e200e851
--- /dev/null
+++ b/swamid-2.0-obsolete/shibboleth.sys.kth.se-identity.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.sys.kth.se/identity">
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kth.se</shibmeta:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIB6TCCAVKgAwIBAgIJAOWxnEiImxnuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTAeFw0wODAyMDcwMDI4MDFaFw0xMTAyMDYwMDI4MDFaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsoH589Je8tY9QKR4fdR5IMw+EOAsGNETKCdap9hqbSKSX5cG8xsJ3wjgxwbe9LbiboKk8GwxU/iSuxtzIa+myfeFkgL/IR0En6lyFvPnJxcNOV2fAVlForH2OPrt/WxeP9AzkzyjzrjOtH6mi4pT7jiHjxKWX7L6vB7rgyTJjHsCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQB3Ktsl6UYCV5YRwJ/gnHndiiUR/kOdaJaC0sv5C1f+uNdBGxJqz6h8W4rKXv6B4m/oDyZY0P7GYY1bZ2fMTnTfVF5MsCscURIIHz8bo+/LoYp/fRQSm/AG2Xz3vJFEMFtKXoGvi9VgcSS1BoBAn2I9oxZTNmTxlmkocYMYXdMopA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.sys.kth.se:8443/shibboleth-idp/AA"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">kth.se</shibmeta:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIB6TCCAVKgAwIBAgIJAOWxnEiImxnuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTAeFw0wODAyMDcwMDI4MDFaFw0xMTAyMDYwMDI4MDFaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguc3lzLmt0aC5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsoH589Je8tY9QKR4fdR5IMw+EOAsGNETKCdap9hqbSKSX5cG8xsJ3wjgxwbe9LbiboKk8GwxU/iSuxtzIa+myfeFkgL/IR0En6lyFvPnJxcNOV2fAVlForH2OPrt/WxeP9AzkzyjzrjOtH6mi4pT7jiHjxKWX7L6vB7rgyTJjHsCAwEAAaMrMCkwJwYDVR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQUFAAOBgQB3Ktsl6UYCV5YRwJ/gnHndiiUR/kOdaJaC0sv5C1f+uNdBGxJqz6h8W4rKXv6B4m/oDyZY0P7GYY1bZ2fMTnTfVF5MsCscURIIHz8bo+/LoYp/fRQSm/AG2Xz3vJFEMFtKXoGvi9VgcSS1BoBAn2I9oxZTNmTxlmkocYMYXdMopA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.sys.kth.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.sys.kth.se/shibboleth-idp/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">KTH</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Royal Institute of Technology</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Royal Institute of Technology</Company>
+    <EmailAddress>jbn@kth.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/staging.dreamspark.com-shibboleth-sp.xml b/swamid-2.0-obsolete/staging.dreamspark.com-shibboleth-sp.xml
new file mode 100644
index 00000000..c34cb206
--- /dev/null
+++ b/swamid-2.0-obsolete/staging.dreamspark.com-shibboleth-sp.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.dreamspark.com/shibboleth-sp">
+  <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/eu-adequate-protection</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>staging.dreamspark.com</ds:KeyName>
+        <ds:X509Data>
+          <!-- Serial No. 435, expires on Mon Sep 20 18:11:20 2010 GMT -->
+          <ds:X509Certificate>MIIFGTCCBAGgAwIBAgICAb4wDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
+HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA4MTAwNjE4MTQwNVoXDTEwMTAw
+NzE4MTQwNVowITEfMB0GA1UEAxMWc3RhZ2luZy5kcmVhbXNwYXJrLmNvbTCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvyt5Coj3UzRIAN4AMxfkCOJfldddhJjg
+7PEe/9HnY0GnXs3QExkFKoaLqdVa6BbGg8p5iOJvJ+hN8KW8rlEOdUaVhmPdE6y3
+ZHnErru6kmwwV/sFPQEqfsFKhENe7scfgfcMl4jx53PUkAn84itc1LSPhbJfsALu
+HurV5Nwk0+cCAwEAAaOCAqgwggKkMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUrQqs
+L1PyXk/vJ7oK+EACxDjcpwUwfgYDVR0jBHcwdYAUky3IYRitY+ObZbOd3Y2TuufK
+Y0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0
+aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIB
+ADCBsgYIKwYBBQUHAQEEgaUwgaIwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9pbmNvbW1v
+bmNhMS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0
+cy5wN2IwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9pbmNvbW1vbmNhMi5pbmNvbW1vbmZl
+ZGVyYXRpb24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwgY0GA1UdHwSB
+hTCBgjA/oD2gO4Y5aHR0cDovL2luY29tbW9uY3JsMS5pbmNvbW1vbmZlZGVyYXRp
+b24ub3JnL2NybC9lZWNybHMuY3JsMD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwy
+LmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwXgYDVR0gBFcw
+VTBTBgsrBgEEAa4jAQQBATBEMEIGCCsGAQUFBwIBFjZodHRwOi8vaW5jb21tb25j
+YS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL3ByYWN0aWNlcy5wZGYwIQYDVR0RBBow
+GIIWc3RhZ2luZy5kcmVhbXNwYXJrLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAgFob
+QMnMr7WedSIrpSek0jZoGdwW+Ih2y2ZaNP96ygFyIZTxnYDbY4wGoVPDbA+1uGew
+MoOigJlZkBeJyinRCAaOjRaOWAU91JxtJi/4kZrJbPDY8djyCbfSRAEXUSAPuBwx
+PBUwwjoz57LnhrgSNNU6X20uGOpzt9IYmcujZ/7t5P9u8/tzVBOpa62QAgFJVBwD
+Ucr+wB3H3RDSF0kBH94nAgOPXJToHWJM7gcOr+m8AEEI1YukftZVrwE9/3cI7SPe
+eEW5lxwrxpzVESmLHCr+HpdOsZqG6B4Nrt6UjjI9jB1rguPXKBjfUw7YAeCwx7jT
+05NcwImw3Hy1xQdZqQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.dreamspark.com/Shibboleth.sso/SAML/POST" index="1"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Microsoft</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>DreamSpark Engineering Team</GivenName>
+    <EmailAddress>dsengt@microsoft.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Scott Blackwell</GivenName>
+    <EmailAddress>Scott.Blackwell@microsoft.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0-obsolete/vhs-shib.no-ip.org-shibboleth-sp.xml b/swamid-2.0-obsolete/vhs-shib.no-ip.org-shibboleth-sp.xml
new file mode 100644
index 00000000..f943c860
--- /dev/null
+++ b/swamid-2.0-obsolete/vhs-shib.no-ip.org-shibboleth-sp.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vhs-shib.no-ip.org/shibboleth-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ip-10-228-21-235.eu-west-1.compute.internal</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ip-10-228-21-235.eu-west-1.compute.internal</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAOOKwExQhI7MMA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
+BAMTK2lwLTEwLTIyOC0yMS0yMzUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
+HhcNMTAxMDA2MDg0MjExWhcNMjAxMDAzMDg0MjExWjA2MTQwMgYDVQQDEytpcC0x
+MC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv11UTIKVlVN7DfY78bJ187coQZmLt3ey
+J1Qf1EkSufI1Iyz49XkCZslWEMBJiNcH0bcjdLIqm9NCuJtd+Bk0fZxg1yZJ1qAA
+2nt7fQ/wZrnkMlnbOkpzDLh0+CSynD76Z4Iv5BeSOUxSQuqzxB5+pGqDjdrX7NHZ
+vb13fYoMy76zAJnnRBjwnTCNnQiuzsisC9bdEJmFZEzWy0/QZYS8/RNanI8yOpPk
+hEXCm2YToWA+8vWiTo5qKzYwwDjsOwTAh4+NJhSIHS2QVKa3yIDR/LSRsSJHhVT+
+BOr/H+41m3FHebryU+OyM+nr02onkpDDIqAe1BAo1Ae6BlHukkd8jQIDAQABo1kw
+VzA2BgNVHREELzAtgitpcC0xMC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRl
+LmludGVybmFsMB0GA1UdDgQWBBQIudTe1ZcxpNPgLs9PaX2TtzBxvjANBgkqhkiG
+9w0BAQUFAAOCAQEAgr6asZTswOFw7iBfD5mWu2Yon2IRMnEZDmq3aIvbzqeM2K6X
++CQzlmyP36Ctt3F3yMDfl4AyA4thju3wsCH50sD2g8CACFMUvIk2v8/cbpbURNoV
+1mZwqVS7xQ+CmwWTVgqmPKk7WXQ9kqbknA5jVYzJmRBhylS6kwFGkjQUKlVaS29j
+Ou/sOMAgf9ub7LI0tWT1e6Mz83uFx+vdTuzvUVc+ufuUIDTdVeV9ZdjBRusc/FQe
+OrhnrrEum5QGmuXYb1mFs/TAqiQrGKbLoHAOqqAvDKOg5rX774JGnuv9DSVaeawB
+wcg2i07qM4SR0O7n7fkIYQvX5IUeicF8SLu++A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ip-10-228-21-235.eu-west-1.compute.internal</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ip-10-228-21-235.eu-west-1.compute.internal</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAOOKwExQhI7MMA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
+BAMTK2lwLTEwLTIyOC0yMS0yMzUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
+HhcNMTAxMDA2MDg0MjExWhcNMjAxMDAzMDg0MjExWjA2MTQwMgYDVQQDEytpcC0x
+MC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFsMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv11UTIKVlVN7DfY78bJ187coQZmLt3ey
+J1Qf1EkSufI1Iyz49XkCZslWEMBJiNcH0bcjdLIqm9NCuJtd+Bk0fZxg1yZJ1qAA
+2nt7fQ/wZrnkMlnbOkpzDLh0+CSynD76Z4Iv5BeSOUxSQuqzxB5+pGqDjdrX7NHZ
+vb13fYoMy76zAJnnRBjwnTCNnQiuzsisC9bdEJmFZEzWy0/QZYS8/RNanI8yOpPk
+hEXCm2YToWA+8vWiTo5qKzYwwDjsOwTAh4+NJhSIHS2QVKa3yIDR/LSRsSJHhVT+
+BOr/H+41m3FHebryU+OyM+nr02onkpDDIqAe1BAo1Ae6BlHukkd8jQIDAQABo1kw
+VzA2BgNVHREELzAtgitpcC0xMC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRl
+LmludGVybmFsMB0GA1UdDgQWBBQIudTe1ZcxpNPgLs9PaX2TtzBxvjANBgkqhkiG
+9w0BAQUFAAOCAQEAgr6asZTswOFw7iBfD5mWu2Yon2IRMnEZDmq3aIvbzqeM2K6X
++CQzlmyP36Ctt3F3yMDfl4AyA4thju3wsCH50sD2g8CACFMUvIk2v8/cbpbURNoV
+1mZwqVS7xQ+CmwWTVgqmPKk7WXQ9kqbknA5jVYzJmRBhylS6kwFGkjQUKlVaS29j
+Ou/sOMAgf9ub7LI0tWT1e6Mz83uFx+vdTuzvUVc+ufuUIDTdVeV9ZdjBRusc/FQe
+OrhnrrEum5QGmuXYb1mFs/TAqiQrGKbLoHAOqqAvDKOg5rX774JGnuv9DSVaeawB
+wcg2i07qM4SR0O7n7fkIYQvX5IUeicF8SLu++A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vhs-shib.no-ip.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.antagning.testc.ladok.umu.se-ecs-sp.xml b/swamid-2.0-obsolete/www.antagning.testc.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..0f0986cc
--- /dev/null
+++ b/swamid-2.0-obsolete/www.antagning.testc.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.testc.ladok.umu.se/ecs-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testc.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAPJ+RSRFDZVSMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALvB
+ef9KGfHjxdiXolyEYN6Lcp5yNDQI6tS/rNGIHbK75c805M5V5uzHPdWLnfZ/6RwI
+mLR+SCOs5+yKTJjDr0FflH0jQ/5At3Vg9oHv0DaylZscxR3qmdj48R+AbVUcav77
+/U8mEELUoVGgLKesYA1SybNgcGzV+Sgxk6ar5Bq7ZDWlOagbjSaiZDxBbxfsGFIW
+K9z8gj3Wy9gsy3otamBZ7nELph0M8ZIPKMMLoiOKKxpfLFK2QD/zcMf8y61b0fXd
+RubXATsPXn65K7g1PCV95zA1O8VWn1/dC1nSlmltD3zziAX56xgCqn7PsfsCH7CI
+CrxzEejyocRhGDz2Hd0CAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
+ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFAORRbDHuUZ+3r+9Z8moX6SvshEg
+MA0GCSqGSIb3DQEBBQUAA4IBAQC1kEUv/dbEYDBdElLOPLZEwyYrq4wHbyLSqZ6X
+no76seNckzcvHhoPof73wL9uu+8YfLx2yT+BC9m9Ved7DU1PnKZ/lYoHo0IQrZ5B
+49wmIXDvX03wP9siMT9Yz4cSeok8IpVHoGWDco7UI0/jTRfN7tx5EP+2PFWqtqCa
+oR+sJFzuRkaYceu1DmJLscMX4J10IEWvXXJ+CrdnKvXbXj5aarkCYqPjRfnUjzPQ
+oGfYJqbgeae5WMcYZFsrH0vDgsV4JI/ihVFKtG19BEk4T0RepVkzHIg2cwKBRRIu
+LzX/iUE2AvRGsOX+N4Vn5VY0pW1fnhwktabz0IkjgIFrqZAD
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testc.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAPJ+RSRFDZVSMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALvB
+ef9KGfHjxdiXolyEYN6Lcp5yNDQI6tS/rNGIHbK75c805M5V5uzHPdWLnfZ/6RwI
+mLR+SCOs5+yKTJjDr0FflH0jQ/5At3Vg9oHv0DaylZscxR3qmdj48R+AbVUcav77
+/U8mEELUoVGgLKesYA1SybNgcGzV+Sgxk6ar5Bq7ZDWlOagbjSaiZDxBbxfsGFIW
+K9z8gj3Wy9gsy3otamBZ7nELph0M8ZIPKMMLoiOKKxpfLFK2QD/zcMf8y61b0fXd
+RubXATsPXn65K7g1PCV95zA1O8VWn1/dC1nSlmltD3zziAX56xgCqn7PsfsCH7CI
+CrxzEejyocRhGDz2Hd0CAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
+ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFAORRbDHuUZ+3r+9Z8moX6SvshEg
+MA0GCSqGSIb3DQEBBQUAA4IBAQC1kEUv/dbEYDBdElLOPLZEwyYrq4wHbyLSqZ6X
+no76seNckzcvHhoPof73wL9uu+8YfLx2yT+BC9m9Ved7DU1PnKZ/lYoHo0IQrZ5B
+49wmIXDvX03wP9siMT9Yz4cSeok8IpVHoGWDco7UI0/jTRfN7tx5EP+2PFWqtqCa
+oR+sJFzuRkaYceu1DmJLscMX4J10IEWvXXJ+CrdnKvXbXj5aarkCYqPjRfnUjzPQ
+oGfYJqbgeae5WMcYZFsrH0vDgsV4JI/ihVFKtG19BEk4T0RepVkzHIg2cwKBRRIu
+LzX/iUE2AvRGsOX+N4Vn5VY0pW1fnhwktabz0IkjgIFrqZAD
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.antagning.testd.ladok.umu.se-ecs-sp.xml b/swamid-2.0-obsolete/www.antagning.testd.ladok.umu.se-ecs-sp.xml
new file mode 100644
index 00000000..f621984e
--- /dev/null
+++ b/swamid-2.0-obsolete/www.antagning.testd.ladok.umu.se-ecs-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.testd.ladok.umu.se/ecs-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testd.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANp8PNQfoLNyMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MDhaFw0yMDA5MTQxNDUyMDhaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI9
+bNdjjH8LoeCSVdvTQhF9I2ova5M2td2yrGvlaz2AzK59rCcOJwaJMysp0IieO8vV
+l3I1MQjlahh5OWXNqZO5+o6OQzfF/0K3kwrA067Shm+99a8Arz/UdEuT6ykNzizP
+7DGyp5Pe2lNlHCWa3HJQJoDbFU+x7cAuV2WkUl04DTyP8LRaLD1+NRoiRtsEUDm5
+ag3f5u3hJV1zYF3v/dlRldDUTfkQMEjhdg1QLxYDeDFojiI2NHjvSomw1uTeKE14
+Ktfgmc3O4slBpPTwJuxtUrw3STTqnV5R2h2JtzTMsidtRlMVugglKepWuKt+Vi/9
+wkMgiGxZcyksZeQetRcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
+ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFPdYFv2AH/oQwWqKy2ihzahAgR2V
+MA0GCSqGSIb3DQEBBQUAA4IBAQAN5dGtpjalyqnvqRHWxL4Tn9eVTKSFWX+AvJZm
+qlpsut89DA7N+/UhLA1BbZ9wg3KDEm9RGAht4wgD93/IZYlx1j+0nPrxqVNx0m/W
+eU0ZWryznc0lcjNBDV8DeDade4mwE7+TyhIZUgda5zKgt9Y42158d0shEImaKv8m
+AXS8rGoFju52nMGLqFOS3FvfIkJuAjbliNwjGDttWcaLCXnYzHm9xz68ZuCN6jck
+RlnCVqAGtP0QepeXLlTMfzWV0XA6YIrBjRRiyQfvwftVgTz7Tm3ppBMLYMkspKc3
+s4pYYmjhHGe8qqvPTOwNFZC2hO/RVJQ19FanleFnXSQQn4DV
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testd.ladok.umu.se/ecs-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANp8PNQfoLNyMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MDhaFw0yMDA5MTQxNDUyMDhaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI9
+bNdjjH8LoeCSVdvTQhF9I2ova5M2td2yrGvlaz2AzK59rCcOJwaJMysp0IieO8vV
+l3I1MQjlahh5OWXNqZO5+o6OQzfF/0K3kwrA067Shm+99a8Arz/UdEuT6ykNzizP
+7DGyp5Pe2lNlHCWa3HJQJoDbFU+x7cAuV2WkUl04DTyP8LRaLD1+NRoiRtsEUDm5
+ag3f5u3hJV1zYF3v/dlRldDUTfkQMEjhdg1QLxYDeDFojiI2NHjvSomw1uTeKE14
+Ktfgmc3O4slBpPTwJuxtUrw3STTqnV5R2h2JtzTMsidtRlMVugglKepWuKt+Vi/9
+wkMgiGxZcyksZeQetRcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
+ZG9rLnVtdS5zZS9lY3Mtc3AwHQYDVR0OBBYEFPdYFv2AH/oQwWqKy2ihzahAgR2V
+MA0GCSqGSIb3DQEBBQUAA4IBAQAN5dGtpjalyqnvqRHWxL4Tn9eVTKSFWX+AvJZm
+qlpsut89DA7N+/UhLA1BbZ9wg3KDEm9RGAht4wgD93/IZYlx1j+0nPrxqVNx0m/W
+eU0ZWryznc0lcjNBDV8DeDade4mwE7+TyhIZUgda5zKgt9Y42158d0shEImaKv8m
+AXS8rGoFju52nMGLqFOS3FvfIkJuAjbliNwjGDttWcaLCXnYzHm9xz68ZuCN6jck
+RlnCVqAGtP0QepeXLlTMfzWV0XA6YIrBjRRiyQfvwftVgTz7Tm3ppBMLYMkspKc3
+s4pYYmjhHGe8qqvPTOwNFZC2hO/RVJQ19FanleFnXSQQn4DV
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.antagning.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.student.teol.uu.se.xml b/swamid-2.0-obsolete/www.student.teol.uu.se.xml
new file mode 100644
index 00000000..3b452497
--- /dev/null
+++ b/swamid-2.0-obsolete/www.student.teol.uu.se.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.student.teol.uu.se">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.student.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.student.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>gravis.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=gravis.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAOCYEsltDIEOMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGdyYXZpcy5pdHMudXUuc2UwHhcNMTEwNTMwMTE0MjQ0WhcNMjEwNTI3MTE0
+MjQ0WjAbMRkwFwYDVQQDExBncmF2aXMuaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAqcyKimtM4p/GlAzooApIxPv+/BHyzyJh8gGcLFnH
+XNq/t1eZz1MAFeSg5nWYwCp2VaVSEGGy/C711qeSgCONkl83E4KFrsfjhT4OAgST
+N0MlNscx1bFy/xhY8auGzCO06vtyjo0KAV3b0dJHLdkVPqnZ2adh5NrBW8W+UjuF
+YlkVloBNbtYFkmDJ9TdDRR0lHn9kc8XBsc+tNWRiY8dnbrqrjEi9dhvu329htBKy
+jaXaX7XYO/N3m4bfTv2iLL6LmdIUOldSFg0+hk6haFsexfcpjNXmYW6TOdqEwRKO
+P3WaH3Nw0yfJVWFKiniy6g775F+QXs5PzxlNcLK+jkCOkQIDAQABoz4wPDAbBgNV
+HREEFDASghBncmF2aXMuaXRzLnV1LnNlMB0GA1UdDgQWBBRzUaO3NftSgdTOeqmN
+vB3AFMLi8TANBgkqhkiG9w0BAQUFAAOCAQEAh8KlaKp/LGgJL2w8/ES3nYhEXT6P
+Gy6V4RfqYCq0MKrel66XvB/3Q5F9+yoA39DjXFAVaZUB3xI0WeoHorQ7Gx+59gij
+xr6eFVgxL7j7q/dW48sz7tZwZ2znx0ML3LQY4z4Xqq0fGW7o+EsMby27IyM7C3Uk
+ch5H5bJ6FWyiKsG1aH9ZHQHGXKbDbCOL7eO3CEZFj10UWeETomBGBsE0YAwMgOKh
+4ZTYqvTaF7H9YYOOET3DeNeyk9LyhwQmHBkj9qfoA076qW58vWT5JxgOowHhf8Q5
+gcZIyBmPJZ77E5v9lXWPYJHop+LYLJppmM00jVz3nrrlX+UraN7koc64xA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.student.teol.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.studera.nu-shibboleth-sp.xml b/swamid-2.0-obsolete/www.studera.nu-shibboleth-sp.xml
new file mode 100644
index 00000000..4ced63eb
--- /dev/null
+++ b/swamid-2.0-obsolete/www.studera.nu-shibboleth-sp.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.nu/shibboleth-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.nu/shibboleth-sp</ds:KeyName>
+        <ds:KeyName>www.studera.nu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.nu</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIJAIUfzx/N0lN8MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDnd3dy5zdHVkZXJhLm51MB4XDTEwMTEyNDExNTI0MFoXDTE1MTEyMzExNTI0
+MFowGTEXMBUGA1UEAxMOd3d3LnN0dWRlcmEubnUwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCrF/v2Tcx6XNgANqYzUpibkBjhMjmpWAr67h4vQvpPUabI
+C2i/pxTykjPU7RPuako391Th4PR0pCDD21odCDShbcxEL6fy7CecWj2baI5antu7
+gx2bj6/y1k6V4c6c+it+VsU30usG3teYVNWaoAYk6FJuymS8zXSTvyihFlRr9l8P
+oV0Ap5IaBK7fj9sjESreefpv8a1/V0YXKvuJi9YdTAj7k3C0lj8/DiC/suXy+X/+
+/b9a6oEu1Gb8aPdxu7upq+C2A9RIebr2JtbqLwo5luQEIz2UMVUlR5SP1oGdo9jZ
+oo/rRNSNXsBKlkNgSUSBfKdnnDuKiBlgC6MwOvhbAgMBAAGjYjBgMD8GA1UdEQQ4
+MDaCDnd3dy5zdHVkZXJhLm51hiRodHRwczovL3d3dy5zdHVkZXJhLm51L3NoaWJi
+b2xldGgtc3AwHQYDVR0OBBYEFFtvzM/pgvj1lvMsm/h3rQZwmYMJMA0GCSqGSIb3
+DQEBBQUAA4IBAQCkQBRKL0sVMPL72omwGG6HI+Fv2Tyy2SrgODKvg5jjYBe70WfB
+s08Nmrl2ASDVvdsPEadmlyeQMqol7QfavTHK0+bu4j/2H0+ezhsNrADrTPs52k0k
+MpfZcKxrHEBzfVXA+MWl3yyGBoqCo9iXMU62UiNkxj71+1/ZGDOlttPUaZlYXi0f
+O/SLBF07IJZ2k+n5N4IpwIp8Yr5+vRMMqPEHDc7qVQ33Qp3VZN/vxFOj7DVUMAMt
+7K0x1uPKTp7929lYXfYsgLtQtV0FRrldiF/qN8y0qElNUyynhyQB38gJcTCbUzIX
+To0ucpLgYZwm1LIEXh4+VZuM2irCpX+guvFa
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.nu/shibboleth-sp</ds:KeyName>
+        <ds:KeyName>www.studera.nu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.nu</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIJAIUfzx/N0lN8MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDnd3dy5zdHVkZXJhLm51MB4XDTEwMTEyNDExNTI0MFoXDTE1MTEyMzExNTI0
+MFowGTEXMBUGA1UEAxMOd3d3LnN0dWRlcmEubnUwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCrF/v2Tcx6XNgANqYzUpibkBjhMjmpWAr67h4vQvpPUabI
+C2i/pxTykjPU7RPuako391Th4PR0pCDD21odCDShbcxEL6fy7CecWj2baI5antu7
+gx2bj6/y1k6V4c6c+it+VsU30usG3teYVNWaoAYk6FJuymS8zXSTvyihFlRr9l8P
+oV0Ap5IaBK7fj9sjESreefpv8a1/V0YXKvuJi9YdTAj7k3C0lj8/DiC/suXy+X/+
+/b9a6oEu1Gb8aPdxu7upq+C2A9RIebr2JtbqLwo5luQEIz2UMVUlR5SP1oGdo9jZ
+oo/rRNSNXsBKlkNgSUSBfKdnnDuKiBlgC6MwOvhbAgMBAAGjYjBgMD8GA1UdEQQ4
+MDaCDnd3dy5zdHVkZXJhLm51hiRodHRwczovL3d3dy5zdHVkZXJhLm51L3NoaWJi
+b2xldGgtc3AwHQYDVR0OBBYEFFtvzM/pgvj1lvMsm/h3rQZwmYMJMA0GCSqGSIb3
+DQEBBQUAA4IBAQCkQBRKL0sVMPL72omwGG6HI+Fv2Tyy2SrgODKvg5jjYBe70WfB
+s08Nmrl2ASDVvdsPEadmlyeQMqol7QfavTHK0+bu4j/2H0+ezhsNrADrTPs52k0k
+MpfZcKxrHEBzfVXA+MWl3yyGBoqCo9iXMU62UiNkxj71+1/ZGDOlttPUaZlYXi0f
+O/SLBF07IJZ2k+n5N4IpwIp8Yr5+vRMMqPEHDc7qVQ33Qp3VZN/vxFOj7DVUMAMt
+7K0x1uPKTp7929lYXfYsgLtQtV0FRrldiF/qN8y0qElNUyynhyQB38gJcTCbUzIX
+To0ucpLgYZwm1LIEXh4+VZuM2irCpX+guvFa
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.nu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.nu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.nu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.nu/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.nu/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.nu/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.nu/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.nu/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.nu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studera.nu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.nu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studera.nu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.nu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.nu/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.studera.testc.ladok.umu.se-aws-sp.xml b/swamid-2.0-obsolete/www.studera.testc.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..94540810
--- /dev/null
+++ b/swamid-2.0-obsolete/www.studera.testc.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.testc.ladok.umu.se/aws-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testc.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAI+HdeAF1LjIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKX6
+y4h4SAMMWpJhipR75Ynj9VsqHLIPJNoT64z84BnI8/gJ5WUkS6jfORwW7X5qS4uC
+OdguzHoTwhbGxcKgUzvfwPYR35dIcjJDMfL22esTL524zRxLN03p9z+lJVK5G0A0
+QXwaZzbG0rjVHrcUNl+ebqX28kioa3pkFijOUqxk0o9ON61gVHsZdLYZwT3u6wEe
+n/xlFfAzf7nMbp/ONqw5QvlU1chC7wNITrB+qqQaihkIJ93eHqqENGR7idSJ1SQP
+3scXn0PzxBdcX32wPaexnx3EtnWlUkV6pE7M4pMwK2o27OO1g8sAdaHIq4XTV4U6
+5E45g835yT/9Zi7+BBUCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
+ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFAAE4FJPrYq0Thl6hg3qrYObzBqm
+MA0GCSqGSIb3DQEBBQUAA4IBAQCKWh8fkVuVXBvL0Ey6EPe+QifiiMvYybtUPLpx
+UfR1keMuQfSaIu0+d5x9bNIDOohZdwnhL3fm1YW4H9WQnTf314nXz8otLmIhxBND
+53XrA3FXN/l9KOLkb2OEsdefkxThCRc60BPOLvuAOIuwPJ0iJivoLOJJVTxBwTf1
+iTSBEMCC5+eEsXPrt+vbikHsSQXbjwyhY6KXyEQWJxJoPEHkZD4S0AmQBWYi2IdU
+KuJ0fkS8yXCB+Bfv3I4adb/wR10ncUx8npyzgz6/Xu60PNR0uPVXgTMlcIOiotMF
+Ld8dS65KL3DIqzhjvmR04lTEAcgG83PUAVObTyUZtcIU8dWu
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testc.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testc.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testc.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAI+HdeAF1LjIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RjLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MTJaFw0yMDA5MTQxNDUyMTJaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rj
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKX6
+y4h4SAMMWpJhipR75Ynj9VsqHLIPJNoT64z84BnI8/gJ5WUkS6jfORwW7X5qS4uC
+OdguzHoTwhbGxcKgUzvfwPYR35dIcjJDMfL22esTL524zRxLN03p9z+lJVK5G0A0
+QXwaZzbG0rjVHrcUNl+ebqX28kioa3pkFijOUqxk0o9ON61gVHsZdLYZwT3u6wEe
+n/xlFfAzf7nMbp/ONqw5QvlU1chC7wNITrB+qqQaihkIJ93eHqqENGR7idSJ1SQP
+3scXn0PzxBdcX32wPaexnx3EtnWlUkV6pE7M4pMwK2o27OO1g8sAdaHIq4XTV4U6
+5E45g835yT/9Zi7+BBUCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGMubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RjLmxh
+ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFAAE4FJPrYq0Thl6hg3qrYObzBqm
+MA0GCSqGSIb3DQEBBQUAA4IBAQCKWh8fkVuVXBvL0Ey6EPe+QifiiMvYybtUPLpx
+UfR1keMuQfSaIu0+d5x9bNIDOohZdwnhL3fm1YW4H9WQnTf314nXz8otLmIhxBND
+53XrA3FXN/l9KOLkb2OEsdefkxThCRc60BPOLvuAOIuwPJ0iJivoLOJJVTxBwTf1
+iTSBEMCC5+eEsXPrt+vbikHsSQXbjwyhY6KXyEQWJxJoPEHkZD4S0AmQBWYi2IdU
+KuJ0fkS8yXCB+Bfv3I4adb/wR10ncUx8npyzgz6/Xu60PNR0uPVXgTMlcIOiotMF
+Ld8dS65KL3DIqzhjvmR04lTEAcgG83PUAVObTyUZtcIU8dWu
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www.studera.testd.ladok.umu.se-aws-sp.xml b/swamid-2.0-obsolete/www.studera.testd.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..6d5429ef
--- /dev/null
+++ b/swamid-2.0-obsolete/www.studera.testd.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studera.testd.ladok.umu.se/aws-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testd.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAMM4ZIXW5j6kMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MDdaFw0yMDA5MTQxNDUyMDdaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJO
+eg5dZ7oiCc5fDp50aJJ3l4N4xQgZrw/cm0gMm0gOIatz9exWhN+6vxyWu5sN8lQj
+bu/3I/2U2DxLfH82BJi54K8aBAvzC+vH4RZ21hjaOYvCcLzGGu+f/GPm5LdqUZct
+FXywuERT49QrrfwJy+FCUZZtu45RbuWFQJGt6allxnbV6zc7yrTbcTkPS71Ovgdq
+WzDYQrV2IEvNsGzsiyDWqU1fmyZ69Tq8O6cKw7SN8F1npn1sZdR+PerbPEbwwXwv
+goSWuR6kYpb6OGk1RwBESqbTrNMPXtrBUqzfZjlrntoN4O0MmrP4bvquN2ZnQ0Uf
+QTm1gBXr72ZGu0vztWcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
+ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFCWwrXH7ONQ24SAyYSfV+cboEr01
+MA0GCSqGSIb3DQEBBQUAA4IBAQBUK3LaipYGzbzq0S21cMSPx/s6XMm27A+4lrPk
+lk8C/Y/xNVvKUAXBkn1iBuauu9kpSMgheOUfP5uRVTJZIiyTIcips9OxtYRxB/4I
+v61PKD6Q/CRATzVwE9ALvOX8cRrrIBLXeh3/Z4N6ugLpT0EOVVqCaxFhBO9bz9p0
+To7ybx5KKjxIzJ2vIZOwXIGa0LIkwtCv/yNP/VRd0/t8U5Uel+RGuHn8m23re2/I
+DYLM7vrq3SZDgOEqN0MDSePiO7tyYuY4iq+YqMSU7fALAsDtx9Q0cWrR+Mg12qnh
+dr5flXboao22zDFyTDlx9deeyKY0myhpJk3E4+jv8a03KjHG
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.studera.testd.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAMM4ZIXW5j6kMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMDA5MTcxNDUy
+MDdaFw0yMDA5MTQxNDUyMDdaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
+LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJO
+eg5dZ7oiCc5fDp50aJJ3l4N4xQgZrw/cm0gMm0gOIatz9exWhN+6vxyWu5sN8lQj
+bu/3I/2U2DxLfH82BJi54K8aBAvzC+vH4RZ21hjaOYvCcLzGGu+f/GPm5LdqUZct
+FXywuERT49QrrfwJy+FCUZZtu45RbuWFQJGt6allxnbV6zc7yrTbcTkPS71Ovgdq
+WzDYQrV2IEvNsGzsiyDWqU1fmyZ69Tq8O6cKw7SN8F1npn1sZdR+PerbPEbwwXwv
+goSWuR6kYpb6OGk1RwBESqbTrNMPXtrBUqzfZjlrntoN4O0MmrP4bvquN2ZnQ0Uf
+QTm1gBXr72ZGu0vztWcCAwEAAaN7MHkwWAYDVR0RBFEwT4Ied3d3LnN0dWRlcmEu
+dGVzdGQubGFkb2sudW11LnNlhi1odHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
+ZG9rLnVtdS5zZS9hd3Mtc3AwHQYDVR0OBBYEFCWwrXH7ONQ24SAyYSfV+cboEr01
+MA0GCSqGSIb3DQEBBQUAA4IBAQBUK3LaipYGzbzq0S21cMSPx/s6XMm27A+4lrPk
+lk8C/Y/xNVvKUAXBkn1iBuauu9kpSMgheOUfP5uRVTJZIiyTIcips9OxtYRxB/4I
+v61PKD6Q/CRATzVwE9ALvOX8cRrrIBLXeh3/Z4N6ugLpT0EOVVqCaxFhBO9bz9p0
+To7ybx5KKjxIzJ2vIZOwXIGa0LIkwtCv/yNP/VRd0/t8U5Uel+RGuHn8m23re2/I
+DYLM7vrq3SZDgOEqN0MDSePiO7tyYuY4iq+YqMSU7fALAsDtx9Q0cWrR+Mg12qnh
+dr5flXboao22zDFyTDlx9deeyKY0myhpJk3E4+jv8a03KjHG
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/www2.student.teol.uu.se.xml b/swamid-2.0-obsolete/www2.student.teol.uu.se.xml
new file mode 100644
index 00000000..b37209df
--- /dev/null
+++ b/swamid-2.0-obsolete/www2.student.teol.uu.se.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.student.teol.uu.se">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www2.student.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www2.student.teol.uu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>gravis.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=gravis.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAOCYEsltDIEOMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGdyYXZpcy5pdHMudXUuc2UwHhcNMTEwNTMwMTE0MjQ0WhcNMjEwNTI3MTE0
+MjQ0WjAbMRkwFwYDVQQDExBncmF2aXMuaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAqcyKimtM4p/GlAzooApIxPv+/BHyzyJh8gGcLFnH
+XNq/t1eZz1MAFeSg5nWYwCp2VaVSEGGy/C711qeSgCONkl83E4KFrsfjhT4OAgST
+N0MlNscx1bFy/xhY8auGzCO06vtyjo0KAV3b0dJHLdkVPqnZ2adh5NrBW8W+UjuF
+YlkVloBNbtYFkmDJ9TdDRR0lHn9kc8XBsc+tNWRiY8dnbrqrjEi9dhvu329htBKy
+jaXaX7XYO/N3m4bfTv2iLL6LmdIUOldSFg0+hk6haFsexfcpjNXmYW6TOdqEwRKO
+P3WaH3Nw0yfJVWFKiniy6g775F+QXs5PzxlNcLK+jkCOkQIDAQABoz4wPDAbBgNV
+HREEFDASghBncmF2aXMuaXRzLnV1LnNlMB0GA1UdDgQWBBRzUaO3NftSgdTOeqmN
+vB3AFMLi8TANBgkqhkiG9w0BAQUFAAOCAQEAh8KlaKp/LGgJL2w8/ES3nYhEXT6P
+Gy6V4RfqYCq0MKrel66XvB/3Q5F9+yoA39DjXFAVaZUB3xI0WeoHorQ7Gx+59gij
+xr6eFVgxL7j7q/dW48sz7tZwZ2znx0ML3LQY4z4Xqq0fGW7o+EsMby27IyM7C3Uk
+ch5H5bJ6FWyiKsG1aH9ZHQHGXKbDbCOL7eO3CEZFj10UWeETomBGBsE0YAwMgOKh
+4ZTYqvTaF7H9YYOOET3DeNeyk9LyhwQmHBkj9qfoA076qW58vWT5JxgOowHhf8Q5
+gcZIyBmPJZ77E5v9lXWPYJHop+LYLJppmM00jVz3nrrlX+UraN7koc64xA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www2.student.teol.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0-obsolete/xenosmilus2.umdc.umu.se-8085-sp.xml b/swamid-2.0-obsolete/xenosmilus2.umdc.umu.se-8085-sp.xml
new file mode 100644
index 00000000..8ffa9fb0
--- /dev/null
+++ b/swamid-2.0-obsolete/xenosmilus2.umdc.umu.se-8085-sp.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://xenosmilus2.umdc.umu.se:8085/sp.xml">
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns1:DiscoveryResponse xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://xenosmilus2.umdc.umu.se:8085/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
+        <ns1:X509Data>
+          <ns1:X509Certificate>
+                        MIICKzCCAZQCCQCZVwtv8r7oXjANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJT
+                        RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVU1VMQwwCgYDVQQLDANJVFMxIDAe
+                        BgNVBAMMF3hlbm9zbWlsdXMyLnVtZGMudW11LnNlMB4XDTEzMDkxMzA3MjExMloX
+                        DTE0MDkxMzA3MjExMlowWjELMAkGA1UEBhMCU0UxDTALBgNVBAcMBFVtZWExDDAK
+                        BgNVBAoMA1VNVTEMMAoGA1UECwwDSVRTMSAwHgYDVQQDDBd4ZW5vc21pbHVzMi51
+                        bWRjLnVtdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoymYoeJkOlWw
+                        Y1rXmo/P8VKOezpXntP+2rSdixZ4F/JcGOgZxBc1gsbJLyUu+A/Y6lCusH4TmxOh
+                        WJCpgiwKX4nods89vGUqtwKP03KC/lUsUMwUvFonp0CcpfSdJZ3M+Z/DlzcyP2Qo
+                        TGYD/r8x1BGlRCKyRAp3PtZ/73adKpkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBP
+                        RL2roJBDFHmZgeYcfytDwzd9qtPAxXa6L+6LAOneHVkpGHXk9n7a6OK4asZgiGpY
+                        PeWEQeDnxOFlTar3EYfiHXpViioEY54Yd5IYLbRExKQ1quXwIwuXcOv33qDkF4Uw
+                        FAfJRgDIpaqa7gS4cxa92oRqvoP3odwxc2tAad4B1A==
+                    </ns1:X509Certificate>
+        </ns1:X509Data>
+      </ns1:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
+        <ns1:X509Data>
+          <ns1:X509Certificate>
+                        MIICKzCCAZQCCQCZVwtv8r7oXjANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJT
+                        RTENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDVU1VMQwwCgYDVQQLDANJVFMxIDAe
+                        BgNVBAMMF3hlbm9zbWlsdXMyLnVtZGMudW11LnNlMB4XDTEzMDkxMzA3MjExMloX
+                        DTE0MDkxMzA3MjExMlowWjELMAkGA1UEBhMCU0UxDTALBgNVBAcMBFVtZWExDDAK
+                        BgNVBAoMA1VNVTEMMAoGA1UECwwDSVRTMSAwHgYDVQQDDBd4ZW5vc21pbHVzMi51
+                        bWRjLnVtdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoymYoeJkOlWw
+                        Y1rXmo/P8VKOezpXntP+2rSdixZ4F/JcGOgZxBc1gsbJLyUu+A/Y6lCusH4TmxOh
+                        WJCpgiwKX4nods89vGUqtwKP03KC/lUsUMwUvFonp0CcpfSdJZ3M+Z/DlzcyP2Qo
+                        TGYD/r8x1BGlRCKyRAp3PtZ/73adKpkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBP
+                        RL2roJBDFHmZgeYcfytDwzd9qtPAxXa6L+6LAOneHVkpGHXk9n7a6OK4asZgiGpY
+                        PeWEQeDnxOFlTar3EYfiHXpViioEY54Yd5IYLbRExKQ1quXwIwuXcOv33qDkF4Uw
+                        FAfJRgDIpaqa7gS4cxa92oRqvoP3odwxc2tAad4B1A==
+                    </ns1:X509Certificate>
+        </ns1:X509Data>
+      </ns1:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8085/slo"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8085" index="1"/>
+  </ns0:SPSSODescriptor>
+  <ns0:Organization>
+    <ns0:OrganizationName xml:lang="en">ITS, Umea University</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="se">ITS@UMU</ns0:OrganizationDisplayName>
+    <ns0:OrganizationDisplayName xml:lang="en">ITS@UMU</ns0:OrganizationDisplayName>
+    <ns0:OrganizationURL xml:lang="en">http://www.its.umu.se/roland</ns0:OrganizationURL>
+  </ns0:Organization>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:GivenName>Roland</ns0:GivenName>
+    <ns0:SurName>Hedberg</ns0:SurName>
+    <ns0:EmailAddress>roland.hedberg@umu.se</ns0:EmailAddress>
+  </ns0:ContactPerson>
+</ns0:EntityDescriptor>
author	Fredrik Åslund <fredrik.aslund@umu.se>	2013-09-24 10:19:38 +0200
committer	Fredrik Åslund <fredrik.aslund@umu.se>	2013-09-24 10:19:38 +0200
commit	46b6a83aaecbddd698972839c8470835ac7211d6 (patch)
tree	1ae4425a981267795b13981f410e938dd0fa0953 /swamid-2.0-obsolete
parent	bca2bb6b51904fc80667281e16ac25a02e615e07 (diff)