Resolves SWAMIDOPS-8235

3 files changed, 0 insertions, 191 deletions

diff --git a/swamid-2.0/vfuportalportfolio-dev.it.su.se-Shibboleth.sso.xml b/swamid-2.0/vfuportalportfolio-dev.it.su.se-Shibboleth.sso.xml
deleted file mode 100644
index cb5c2ad2..00000000
--- a/swamid-2.0/vfuportalportfolio-dev.it.su.se-Shibboleth.sso.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/WAYF"/>
-      <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://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <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://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/WAYF/wavelan"/>
-      <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://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
-      <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://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
-      <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://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/SWAMID"/>
-      <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://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/SWAMID" index="3"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ny VFU-Portalen utvecklingsmiljö</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ny VFU-Portalen development environment</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">SP är för ny vfuportalportfolio miljö (som ska spegla vfu-gemdev.it.su.se).</mdui:Description>
-        <mdui:Description xml:lang="en">SP is for new vfuportalportfolio environment (Mirror environment for vfu-gemdev.it.su.se)</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vfuportalportfolio-dev-app01</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vfuportalportfolio-dev-app01</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAKH/QNYWY1tYMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHHZmdXBvcnRhbHBvcnRmb2xpby1kZXYtYXBwMDEwHhcNMTYwNDE4MTIwMDQ1
-WhcNMjYwNDE2MTIwMDQ1WjAnMSUwIwYDVQQDExx2ZnVwb3J0YWxwb3J0Zm9saW8t
-ZGV2LWFwcDAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArnevJR6D
-jPnWbJ7ohWDY2UQ6lIlGlNP5yKYbGoQWF+e4tzBvMm0GMQ0++wHWxbStmeVEJjh0
-OeSazVf/bB1eDGayDjj9nEQ2sQBFRw5uvaGQenkDr1b5xzWL1gBlWyyN8uyNISZH
-ro7Ju99zQvlYPg0smE2F38DzKLsTkTcO8P048TL/WL8DPyCg4u8EoT0IOi9wrhCm
-NH6S1VamulHh0oRcLJttbnOOf4STTvXLj7vNsH/yChBnySK/o7RgEHnoGAeQ5sYC
-9YCX5OLGZOpegnWzCQzLYZ7RE6lLLoM+cj9LHZ3yuiM9XGaLiEOXNNqwvD4SMbGt
-xtRSSVPyy1Qk3wIDAQABo0owSDAnBgNVHREEIDAeghx2ZnVwb3J0YWxwb3J0Zm9s
-aW8tZGV2LWFwcDAxMB0GA1UdDgQWBBTR0lDA3oh2Svv/HrCzd3M5LNQr3TANBgkq
-hkiG9w0BAQUFAAOCAQEAkUBbjc5PUwXYE8jh0F8hY7OaheG/U/WfX8l7gH76GKOx
-PJzocSs6eDYLmmtirzsFL7fWtQ63DumWcUur6mD/nJ58syC+8T3JvmeB2ldmQIgF
-7dGZOQGp+HGP/vyV5Fl859G7sZfIQfeGF8DdpWO7H/KRMzuW3GS7DgafFN6QMIAH
-qO+aMdr6nVXmg5+9hbMIsIC/OU1W/UwsMuWE8J1fG7AyBvXsklp+10bLPwC4mN5R
-l8piaIbI133sLwTHzdKIf6jyJxxUejDEEX5pXXUF26DF4ASanK54wv39B1xakBWE
-++s6FDgAwcY7AtKStqiQ6cmbWXnsI9mF9gXQ3/nEQA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfuportalportfolio-dev.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/vfuportalportfolio-test.su.se-Shibboleth.sso.xml b/swamid-2.0/vfuportalportfolio-test.su.se-Shibboleth.sso.xml
deleted file mode 100644
index 8eb648bd..00000000
--- a/swamid-2.0/vfuportalportfolio-test.su.se-Shibboleth.sso.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vfuportalportfolio-test.su.se/Shibboleth.sso">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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://vfuportalportfolio-test.su.se/Shibboleth.sso/WAYF"/>
-      <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://vfuportalportfolio-test.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <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://vfuportalportfolio-test.su.se/Shibboleth.sso/WAYF/wavelan"/>
-      <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://vfuportalportfolio-test.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
-      <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://vfuportalportfolio-test.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
-      <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://vfuportalportfolio-test.su.se/Shibboleth.sso/WAYF/idp-test.it.su.se"/>
-      <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://vfuportalportfolio-test.su.se/Shibboleth.sso/SWAMID"/>
-      <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://vfuportalportfolio-test.su.se/Shibboleth.sso/SWAMID" index="3"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Test Verksamhetsförlagd utbildning Stockholms universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Test Workplace Situated Education at Stockholm University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">SP är för ny vfuportalportfolio miljö (som ska speglas vfu-test.su.se).</mdui:Description>
-        <mdui:Description xml:lang="en">SP is for new vfuportalportfolio environment (Mirror environment for vfu-test.su.se )</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vfuportalportfolio-test-app01</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vfuportalportfolio-test-app01</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHjCCAgagAwIBAgIJAIx7KH7z5CJWMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXZmdXBvcnRhbHBvcnRmb2xpby10ZXN0LWFwcDAxMB4XDTE2MDQxODA5MzA1
-OFoXDTI2MDQxNjA5MzA1OFowKDEmMCQGA1UEAxMddmZ1cG9ydGFscG9ydGZvbGlv
-LXRlc3QtYXBwMDEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClgyOH
-4iU73ym+JGI9Gdra3uunqlmvIFVe9SvA7bXaV6g0Ew1vLO8kId+zpxf26PZSPnbV
-XspO03vp8yLa7Xuxb50CtvBCWYyo1d56G/hNl7Eky6VOyGPhYS8iYdZneoLf7hs7
-XxpsR2ML6FrRT1at+kPa/sDA8yOXbuXsbbASOFxtQP1RRFPVoAcC+qWx73WeLrnL
-Yr+70Dmme6kvXPKZT9yg/s/IkhOb4frY8Gzv1apnEyxRVSAwf4N9QE07KEZP5QiB
-BYgIAOK1hQl/bggcpJoQgNDAxKd6+Ko+1ZQMKSdrZ7qmpEj+GZqFME2mgjZzASZJ
-WaDcYzc8tr+hzuJdAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXZmdXBvcnRhbHBvcnRm
-b2xpby10ZXN0LWFwcDAxMB0GA1UdDgQWBBSG1ecYic2UxOhGiceG2PEOJkAalDAN
-BgkqhkiG9w0BAQUFAAOCAQEAnDXs8Q5+FeixXwuKhBSqE83s1FUPcobGkDRrtkcA
-KTIRWRtB/G7A7hNL6rrfripKddoKgxqEEz89xfR9LS0jt/RIaC6ansmFplBeBMnD
-HfnEL7a3tPUeMcZTYn+HYcFgDC7tSNfP/awmeuErweVCDSdrnidHYJE8LP0Ai5ZC
-k215wjr2WUf/IV03yroF2sykwMWLiAdpW+WccO/rBuTZsvq4+qugiE07DM8d2jv+
-wPTYRmTfKywcuDCB2/hUqex1uft/RNfE7JwgS1UblSJLxyrdF12RRzxbnCHoel/x
-juv3gekXlDpGuCilsBc8x619HHAJMerrhiJBiVwRhGTxnQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfuportalportfolio-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index c42dba12..178e1238 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -530,9 +530,7 @@
   <xi:include href="swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-ssh-sp.xml"/>
-  <xi:include href="swamid-2.0/vfuportalportfolio-test.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-2.0/vfuportalportfolio-dev.it.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/www.start.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/www.student.ladok.se-student-sp.xml"/>