From 5d6ace1d99747a98e7073e7a9f56c27996a648e9 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Wed, 26 Feb 2020 14:15:24 +0100
Subject: Resolved SWAMID-2708

---
 .../confluence-test.its.uu.se-Shibboleth.xml       | 126 ---------------------
 swamid-2.0/confluence.its.uu.se-shibboleth.xml     | 126 ---------------------
 swamid-sp-2.0.mxml                                 |   2 -
 3 files changed, 254 deletions(-)
 delete mode 100644 swamid-2.0/confluence-test.its.uu.se-Shibboleth.xml
 delete mode 100644 swamid-2.0/confluence.its.uu.se-shibboleth.xml

diff --git a/swamid-2.0/confluence-test.its.uu.se-Shibboleth.xml b/swamid-2.0/confluence-test.its.uu.se-Shibboleth.xml
deleted file mode 100644
index e3eafad4..00000000
--- a/swamid-2.0/confluence-test.its.uu.se-Shibboleth.xml
+++ /dev/null
@@ -1,126 +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://confluence-test.its.uu.se/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>
-    <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:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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>
-      <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://confluence-test.its.uu.se/Shibboleth.sso/Login"/>
-      <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://confluence-test.its.uu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">IT-avdelningens Confluence (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">IT Division Confluence (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Confluence är ett samarbetsverktyg för team.</mdui:Description>
-        <mdui:Description xml:lang="en">Confluence is a team collaboration system.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="34" width="250">https://confluence-test.its.uu.se/images/logo/confluence_header.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="34" width="250">https://confluence-test.its.uu.se/images/logo/confluence_header.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://confluence-test.its.uu.se/aboutconfluencepage.action</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>confluence-test.its.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=confluence-test.its.uu.se,O=Uppsala universitet,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFHDCCAwQCCQC8gvZTSEZKwTANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQGEwJT
-RTEcMBoGA1UEChMTVXBwc2FsYSB1bml2ZXJzaXRldDEiMCAGA1UEAxMZY29uZmx1
-ZW5jZS10ZXN0Lml0cy51dS5zZTAgFw0xODA0MDMxNDU1NDZaGA8yMDczMDEwNDE0
-NTU0NlowTzELMAkGA1UEBhMCU0UxHDAaBgNVBAoTE1VwcHNhbGEgdW5pdmVyc2l0
-ZXQxIjAgBgNVBAMTGWNvbmZsdWVuY2UtdGVzdC5pdHMudXUuc2UwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQDzVG+51wvzNSBeYp4gv6PI4wViCaQ+NWbc
-Uuom/fpdEUAg4QLNAbNih5m5hNIMQWP53+YfPFigkHbfuG+9J7buhCUfghH4Boh4
-TiMCgrsPHs4i0V1FqM1tk7NcgqU/BaYakbDIbk5UXDaSTcWFVS/IC3U0Dtf0+hP2
-sdXr64EpiI60ykCugNB4hqWTfS9EY7ik7ekGBzNx1g57A7269yBj7knept4IAD9j
-ANA8gdZ5lFIOk3rI4EoWXJRLeOpL8pLZ1/eIHtdE4lAjWI4SVI89gJ99VSkmGqDJ
-4F7BfIpnuBVUzmTXTCYW0cjR2vrlKlA27BvtPO0I3IwD5VHO3fZe+dW2fjTvxSsP
-UVbbz3qMzn18Hj5zgSTnypw1oo0f3jK4KEXnWeref02jhe3Mv0njnqfsVLharsa2
-HOV1ELoUhF/LJDqvKrtu4OSy60c82/CDUttYTqNFzAF1Z+9DWCnczwQNryM5/Kn+
-h9UlB/OGVeiCSuhYaG2wdXOF65ncGrk7L3+QLfWXpTESLu3eAENUlO7naeXcsvbs
-U/6tzJrxngwskEylN6v18vAXB8XJg1rnopyQKGQT7qBL4viGpo4Zuhcv86XfW/4V
-AcH7hlu+LbX2kehFR0G+7ryeO66hRVeBYNWEdIhv9Gu4KH+4UqOVzB3k4c2ldzdT
-hgkIDkqACQIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQBvUwVcRWwIqO+bPBeRwKiU
-xwfbjqIdYDAAI+GAM0kepYTgq6Y6rOBw5lCFmyUmadjPNUSbD6lS0dLXJEq+IasM
-BlCL3+cmu7aAIEHbpQOGXujXEbLv+1tcWR7Jdhi3Wn7TlIfvnAGDRQaGYOV8g0te
-g+B83pDJLbuQVrMt+5nyMgjjze7IQdfzeZF9LeWk4OvL1VtIfA3Ks0EbLKDK/5vK
-8+qQyMcw31DP8unHCm4i2T476nh5HgIIlFSgkJn7jjAyxhmFrLT7kFlfTPjyVtEU
-iMO/SMoJH5qPLFhPaIrF5A6XVWY+wq6LwmfDYVE0WB+qNnHavPmBTCyQ1koeRGA4
-rmHBdteEM+zvvFU3XXh6CyeJi/YboHSvOBGa3fwxxYyyqqA/sI93O7Z7sZdGkSlv
-PZKB4b551QFq/mnSbYBxmnccah6zNwP7v+S264BN5/m/nE6Sp0FNm7CznOpKjneK
-lAd7j/AaNwAahUbQUQPePTsZOKREE/byqzErigNr6N7Z/xXl1burRhVKenBizxhm
-+4Lwwp8N+rS9lUOAZIOk9nsHivfjMuaJmbcghk2FQgmahx5g0ElWvCZ7Z5xvGj3F
-n//tIhpDkM6LQy1Mz2o39a/LPavKnBBEKY0rWIAi0EGxEC//qdnM+zWYaO/81bgv
-mo7jda5ck9hTxIWnp3G4OA==
-</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://confluence-test.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence-test.its.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence-test.its.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence-test.its.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.its.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
-    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/confluence.its.uu.se-shibboleth.xml b/swamid-2.0/confluence.its.uu.se-shibboleth.xml
deleted file mode 100644
index af34fcb0..00000000
--- a/swamid-2.0/confluence.its.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,126 +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://confluence.its.uu.se/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>
-    <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:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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>
-      <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://confluence.its.uu.se/Shibboleth.sso/Login"/>
-      <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://confluence.its.uu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">IT-avdelningens Confluence</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">IT Division Confluence</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Confluence är ett samarbetsverktyg för team.</mdui:Description>
-        <mdui:Description xml:lang="en">Confluence is a team collaboration system.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="34" width="250">https://confluence.its.uu.se/images/logo/confluence_header.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="34" width="250">https://confluence.its.uu.se/images/logo/confluence_header.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://confluence.its.uu.se/aboutconfluencepage.action</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>confluence.its.uu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=confluence.its.uu.se,O=Uppsala universitet,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEjCCAvoCCQDhKJMbzYc3ODANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJT
-RTEcMBoGA1UEChMTVXBwc2FsYSB1bml2ZXJzaXRldDEdMBsGA1UEAxMUY29uZmx1
-ZW5jZS5pdHMudXUuc2UwIBcNMTgwNDAzMTQ1NjI3WhgPMjA3MzAxMDQxNDU2Mjda
-MEoxCzAJBgNVBAYTAlNFMRwwGgYDVQQKExNVcHBzYWxhIHVuaXZlcnNpdGV0MR0w
-GwYDVQQDExRjb25mbHVlbmNlLml0cy51dS5zZTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAMCISWcGJfUZuo9u5tpkGGI/+NB/kkiA10LIL21+vo4ZeHst
-QE+Tflwgi7uI5carzaL4YVv3QdNQcQRfPaacablpI6A7c1aece6hxBKNaKF9D0P+
-z+d04OKSINkMvoKV6ZzrjPVrDB7pXjiTcX6SPvcbEpmUXNslsQ61ecp2XUlpCoxW
-luAegghkLukOFPIVoI1ESntIEAXz/qXjQPQnjIC7arpihBgFhSQJALoHlDHAxd78
-POEgd/ULHfnhELP28zx8c0Ljk/emu3LdoOdHiGKL/EX7Dm3y6FbMXPDbrfUFMlVw
-L/UcNq8OqdLmvCx5d9kdTTWJ48Vd6BO/lCBRbyvJ3r20ItuxJCX3zAbeUS1OR9ZW
-cbxVNxFo4azHsbYq2mhso2nGa3l6BisP50O/UQaouECkoG8adQh6pK4L7cVqC+IP
-D4RwibxgzZSh7eD177Ws6V7zf1bdx0nUWLM/7f0bfJzU2Q9PDlWbDX+4LlFHOoNZ
-Y6G8AVyrEs8V43kTFwTBRdXz2CLCU4hqP1F2cFmDcrODIEhyXMnm9jZ4vci3WwpN
-U44bFf4DHLUS5nfh90sn90NzoaUhhnkS8mqIjN8O0ERu4ybvxlcUgRKCiVlI0bjU
-HQcz12UvvjcgHsU1bHSJdmDUXgTyu+UetkX5GmncPyQweWNKMdY31uvQqKDzAgMB
-AAEwDQYJKoZIhvcNAQELBQADggIBAIrnGRTiLnaijmndgyFLsLK2MZk48M9aeRTa
-FPjq4IrfPI37/NO3/1TYWGvAMPaza6MiiCF/t+Wbbcp1juVQuOZG5sMFLuOdDt8u
-DJHhZT1QaQAx91mIfcA3bADblPUiTUgl2M/ofJ6LKhh1vC7PwIU25TbaSzzRmpVK
-wbtiufy5HHc43X+dLeJewzHKQVUN9Njvm2ssmRkBU45f+7hQTMz3mKK7+NIMxtA+
-3c5YRQhoBftUTWdMW+3qTcYVn/ztgmB/t0JbpGz15kbMfg81zyZQuVgaMRiSII5h
-utlzzaRzMEoBgwHRcpCT/A9JnEgqODhohd3Iyqa444r5tQcMPVU2NTkwOypPqIn7
-6dAuQyEdivshQCUuF6v9gt2vhI2CzMBmKOX7/t5xgq6c9U6W0cP/Zc64LPwTRlRJ
-abjZnR4ZqJZMosBiyO9iNGk90BebhF0BMrQ4V0hVKLq9owlFnyt+bMtY1MC5u7Dc
-KAX4Jq/XMwz52e6wSUDGP6ZmDNAqLJpBlcXjmmUiWjvTG7YECb+/MU4GDMftxA32
-osrr2DF9rxMBxal1Cy8aPDpjTGJqHcntFAdwvS6xHaFpUFUuvYgiue2gK1am72O2
-NvygAelCu4wABd7/kAbOkIDwN9+HmD98TjSBNhPwvQrvH8OdBTRsquI6bqynyL0P
-GpYW8E7+
-</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://confluence.its.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.its.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.its.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence.its.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.its.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.its.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://confluence.its.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://confluence.its.uu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
-    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index cb06a10d..4e1c3620 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -470,7 +470,6 @@
   <xi:include href="swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kmh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/crowd01.ub.uu.se-plugins-servlet-ssocookie.xml"/>
-  <xi:include href="swamid-2.0/confluence-test.its.uu.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/sciencedirect-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/acs-ra21.mnt.se-shibboleth.xml"/>
@@ -479,7 +478,6 @@
   <xi:include href="swamid-2.0/portalfhs.onricoh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-hh.hr.evry.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/confluence.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/test-du.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/du.hr.evry.se-shibboleth.xml"/>
-- 
cgit v1.2.3