Resolves SWAMID-3464 and SWAMID-3466

4 files changed, 0 insertions, 198 deletions

diff --git a/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
deleted file mode 100644
index 688a65f0..00000000
--- a/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://demo.weblogin.uu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">demo.uu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">DEMO Uppsala universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DEMO Uppsala University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">AKKA DEMO Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University's AKKA DEMO Joint Web Login for employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo height="50" width="50">https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="sv">https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="en">https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">uppsala+universitet</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAPxLbmeKxztkByoHr1nHOrwqB4XjMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMME2RlbW8ud2VibG9naW4udXUuc2UwHhcNMTUwNjE2MTM0
-NDAzWhcNMzUwNjE2MTM0NDAzWjAeMRwwGgYDVQQDDBNkZW1vLndlYmxvZ2luLnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWwx4TDF3MMObfgM
-CnDI+ghMX4K7wEPbGR5Xyw/BEWMm6xvNgMzX6R7QVU7NWle2Kdsy1XgbQC3hb9/P
-WzWdMag9UKuNCB3KeZcT7+RsQgBS76T5HpcYqDMjoDSDlBn36qeizjTEjQfujFrx
-tt/yeq//1v/FzZHoePoiNe3j9FHtz5QZ+vJVVOMRZlrACfLqxpzYZc8NkQjupOAo
-Xrh02tsAvMokjS1R17don1D8BFxKCve6hclrrTcNWFPjhx3ucuRgmYXHaGLUlNAT
-GeVNBujBJ+N+3/8dPTk7izj04J01O/MUerBTTkc2gzGd0/dfTTg/VLYvWZerbe7a
-h/kkLwIDAQABo20wazAdBgNVHQ4EFgQU0W7hm9BiA/ksTNslvsbrsIWKLPIwSgYD
-VR0RBEMwQYITZGVtby53ZWJsb2dpbi51dS5zZYYqaHR0cHM6Ly9kZW1vLndlYmxv
-Z2luLnV1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQA4jOuz
-faaTxSHudbNaA0Np0rfvyibyCTN+GCHehuabl5jLYDGvMX5WwV+tyQ+Q2nDLCmjH
-QThOe96fbyN5KoJq4J+5nK5LC4/3HaVhG7XXJofTutbQXazmeuSFYDOhBk5qAXv6
-0B+rfTm0xpdHQoMakPfbYA0v2xh2z5B9Q63gEqt2BMU2IEYbD/+/XzR+t+3mBrfg
-MXx/+iCnRjnS6/wHETmB3/v2cAJsksFLiJ/EyV2UG1URHPMYIBcWnVHJo1yJIMFe
-uyWI170/uSD+sI1wCOKp/8zKrwaPh5xnnx74Nktr+m+pbH8Hq6VPjZmmsP557nm4
-czuyQatrgEL0HlWr
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://demo.weblogin.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://demo.weblogin.uu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">demo.uu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAPxLbmeKxztkByoHr1nHOrwqB4XjMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMME2RlbW8ud2VibG9naW4udXUuc2UwHhcNMTUwNjE2MTM0
-NDAzWhcNMzUwNjE2MTM0NDAzWjAeMRwwGgYDVQQDDBNkZW1vLndlYmxvZ2luLnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWwx4TDF3MMObfgM
-CnDI+ghMX4K7wEPbGR5Xyw/BEWMm6xvNgMzX6R7QVU7NWle2Kdsy1XgbQC3hb9/P
-WzWdMag9UKuNCB3KeZcT7+RsQgBS76T5HpcYqDMjoDSDlBn36qeizjTEjQfujFrx
-tt/yeq//1v/FzZHoePoiNe3j9FHtz5QZ+vJVVOMRZlrACfLqxpzYZc8NkQjupOAo
-Xrh02tsAvMokjS1R17don1D8BFxKCve6hclrrTcNWFPjhx3ucuRgmYXHaGLUlNAT
-GeVNBujBJ+N+3/8dPTk7izj04J01O/MUerBTTkc2gzGd0/dfTTg/VLYvWZerbe7a
-h/kkLwIDAQABo20wazAdBgNVHQ4EFgQU0W7hm9BiA/ksTNslvsbrsIWKLPIwSgYD
-VR0RBEMwQYITZGVtby53ZWJsb2dpbi51dS5zZYYqaHR0cHM6Ly9kZW1vLndlYmxv
-Z2luLnV1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQA4jOuz
-faaTxSHudbNaA0Np0rfvyibyCTN+GCHehuabl5jLYDGvMX5WwV+tyQ+Q2nDLCmjH
-QThOe96fbyN5KoJq4J+5nK5LC4/3HaVhG7XXJofTutbQXazmeuSFYDOhBk5qAXv6
-0B+rfTm0xpdHQoMakPfbYA0v2xh2z5B9Q63gEqt2BMU2IEYbD/+/XzR+t+3mBrfg
-MXx/+iCnRjnS6/wHETmB3/v2cAJsksFLiJ/EyV2UG1URHPMYIBcWnVHJo1yJIMFe
-uyWI170/uSD+sI1wCOKp/8zKrwaPh5xnnx74Nktr+m+pbH8Hq6VPjZmmsP557nm4
-czuyQatrgEL0HlWr
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://demo.weblogin.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.weblogin.uu.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">DEMO Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">DEMO Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala University</md:Company>
-    <md:SurName>Team Plattform</md:SurName>
-    <md:EmailAddress>mailto:uadm-team_plattform@lists.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala University</md:Company>
-    <md:SurName>John Morrison</md:SurName>
-    <md:EmailAddress>mailto:john.morrison@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml b/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
deleted file mode 100644
index fc35001b..00000000
--- a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://stipendieansokan-test.uaf.uu.se/stipendium">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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/hei-service</samla:AttributeValue>
-      <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-    </samla:Attribute>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Scholarship Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Stipendiehantering Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">System för att söka och hantera stipendium vid Uppsala universitet (Test)</mdui:Description>
-        <mdui:Description xml:lang="en">Scholarship management system at Uppsala university (Test)</mdui:Description>
-        <mdui:Logo height="125" width="125">https://stipendieansokan-test.uaf.uu.se/stipendium/img/UU-logga_125x125.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://stipendieansokan-test.uaf.uu.se/stipendium/stipac/login?lang=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://stipendieansokan-test.uaf.uu.se/stipendium/stipac/login</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDYzCCAkugAwIBAgIEXsncWDANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJzZTEQMA4GA1UE
-CBMHU3ZlcmlnZTEQMA4GA1UEBxMHVXBwc2FsYTELMAkGA1UEChMCVVUxCzAJBgNVBAsTAklUMRUw
-EwYDVQQDEwxUb21teSBTdGVudmkwHhcNMTQwMTIxMTIzMzIxWhcNMTcxMDEyMTIzMzIxWjBiMQsw
-CQYDVQQGEwJzZTEQMA4GA1UECBMHU3ZlcmlnZTEQMA4GA1UEBxMHVXBwc2FsYTELMAkGA1UEChMC
-VVUxCzAJBgNVBAsTAklUMRUwEwYDVQQDEwxUb21teSBTdGVudmkwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCYm9zOwWOyPzD3W2ophyDRR2YKEuWdP1ZzQAUf7nwBRa0sf62UODcvavGJ
-FK+yVjdtDayls5KPyIfHiW0vJAjWPrhCRE/Nk4pCyPhEbVhBtSA/JfXUEtB9Otf79G8PmxCJGfUN
-TeaFIl1PhEjQtQGS9IHe/N0P/Gxn9hJL+452ePbScB0hpC2/Z61GV2GDmz8l8g2FS4BXC/OxpqkR
-TfWqVvO7h8UJrrPfntqLTEHpD9Ex0LAy9RBXAj/4eUt8obzr84IJLITF875icjXyRcq0510gtGAr
-LytJxy/5KQ/Y2rUVfVBSg3m4C5BRiTAKjNncx+JFhq665tyiLtOTITxPAgMBAAGjITAfMB0GA1Ud
-DgQWBBTFo53xd9YijvyHlNUZ6Gt1YLLjQTANBgkqhkiG9w0BAQsFAAOCAQEAEFmcm96wM5/SwNCj
-i5uX3XFkQ2IDqeVmAAOmY/3cRh/kXxSM1OR1rifCl4kQlHHxV/9+r1EwiJ+LIhhnBHwJLM2TVFKD
-DRm5Lq9ghRzjiKponRltsGQzdZx5b5dAsG+J3J0TWJCp+HXoO6FNbIs0WAPm2nGkICyUi+ZBmdM1
-NHqA2JtG95d1VrNeZMmou7CdUBqRIWSlQPcGhawq4tKrs/6C79JLwfDhIPidJ3V0gkVSjm1FSNC5
-DJLTyRKIJB8d1r0/RpePenawO79D5eJlDeUTpu0LcPMyCKPGVT0tFaU/TyF6Jn8CJ2ZIlybtdXtp
-lQDSN7w4inBTDBIKvjWfVg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://stipendieansokan-test.uaf.uu.se:80/stipendium/saml/SingleLogout/alias/defaultAlias"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://stipendieansokan-test.uaf.uu.se:80/stipendium/saml/SingleLogout/alias/defaultAlias"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://stipendieansokan-test.uaf.uu.se:80/stipendium/saml/SSO/alias/defaultAlias" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://stipendieansokan-test.uaf.uu.se:80/stipendium/saml/SSO/alias/defaultAlias" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://stipendieansokan-test.uaf.uu.se:80/stipendium/saml/SSO/alias/defaultAlias" index="2"/>
-    <md:AssertionConsumerService xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="http://stipendieansokan-test.uaf.uu.se:80/stipendium/saml/HoKSSO/alias/defaultAlias" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="3"/>
-    <md:AssertionConsumerService xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="http://stipendieansokan-test.uaf.uu.se:80/stipendium/saml/HoKSSO/alias/defaultAlias" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Stipendiehantering</md:SurName>
-    <md:EmailAddress>mailto:stipendie-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 6b59be53..cd6b8186 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -160,7 +160,6 @@
   <xi:include href="swamid-2.0/mp.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml"/>
   <xi:include href="swamid-2.0/lartorget.sll.se-shibbolet.xml"/>
   <xi:include href="swamid-2.0/hr.liu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/accounts.bils.se-saml2-metadata.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index b46d8d08..b1b05a48 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -22,7 +22,6 @@
   <xi:include href="swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibboleth.umu.se-test.xml"/>
   <xi:include href="swamid-2.0/idp-test.suni.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml"/>