Resolves SWAMIDOPS-8500

4 files changed, 0 insertions, 175 deletions

diff --git a/swamid-2.0/jabber.nordu.net-shibboleth.xml b/swamid-2.0/jabber.nordu.net-shibboleth.xml
deleted file mode 100644
index fb6c4bd0..00000000
--- a/swamid-2.0/jabber.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jabber.nordu.net/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://jabber.nordu.net/Shibboleth.sso/DS/nordu.net" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>jabber.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=jabber.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAMdBcIFfKqNcMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGphYmJlci5ub3JkdS5uZXQwHhcNMTEwNDE1MDkxNDQ2WhcNMjEwNDEyMDkx
-NDQ2WjAbMRkwFwYDVQQDExBqYWJiZXIubm9yZHUubmV0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAuf/UhI1cEEWM1EVJNLJLxNQAjgcU1Ed4rWubB9iu
-ZPmmpDnXMPJ/PiTAoi58iqzs28M6CN3mVqwP/PlMyt/N1toIu0VSd9R9czXyEmII
-JgBiEJ4CWbLdbhaLoCGeBEyKCob4ZdpHnV/+9o3Vx2kFo6frFg/SY4ryi1hXomcp
-hR5iTpo4H5pYDqFquvlJ0fxPmPBhqZpCeLhJBPGjTrS6rrEnkUYh3iKOywboOMIN
-yVdNhUcV5PPSM3+e0McIquAfRumRacVfhe+qvofEuTlWbTSPQLQymBfBMaDUDYjH
-WK6+jGjLAHB8Y9PPvwM/ecRSb6vckKfpu/Y/+arsn/7ihwIDAQABoz4wPDAbBgNV
-HREEFDASghBqYWJiZXIubm9yZHUubmV0MB0GA1UdDgQWBBTpbrmNDAbzimHpvfgR
-Xi9+6vC1GDANBgkqhkiG9w0BAQUFAAOCAQEAFa/NGDqdgxvqkqss0m4SLCa2omxV
-opoYV2zwA7wjPqlPPi4M20i2LysFyqwrPHmOKH0wcAWiB4+d8XN8UmsLrVODmrJN
-BD07pGaDP6jamTtHOr4Enj25pJ/0Fe5hZeLJ3ppFebgq6TfrTd41qIwmC0KMClay
-K0rTtqshk+nKb89Re3xutEU9D7r+EaoHIa9rw1bTz6UmkFZ5ovjfV3htogb8xNt9
-2kQbxgdjl0QkFTf2sURB+4El0oUnXdOZiqQS5hqjEtZDJ6NlDvtW7OtH/SE2PAyn
-zvTzeciRKJ9UNf9ibAJGF7jz/GP5r+yUgizdV0wyikyUa8VNyrSeExBUVg==
-</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>jabber.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=jabber.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAMdBcIFfKqNcMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGphYmJlci5ub3JkdS5uZXQwHhcNMTEwNDE1MDkxNDQ2WhcNMjEwNDEyMDkx
-NDQ2WjAbMRkwFwYDVQQDExBqYWJiZXIubm9yZHUubmV0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAuf/UhI1cEEWM1EVJNLJLxNQAjgcU1Ed4rWubB9iu
-ZPmmpDnXMPJ/PiTAoi58iqzs28M6CN3mVqwP/PlMyt/N1toIu0VSd9R9czXyEmII
-JgBiEJ4CWbLdbhaLoCGeBEyKCob4ZdpHnV/+9o3Vx2kFo6frFg/SY4ryi1hXomcp
-hR5iTpo4H5pYDqFquvlJ0fxPmPBhqZpCeLhJBPGjTrS6rrEnkUYh3iKOywboOMIN
-yVdNhUcV5PPSM3+e0McIquAfRumRacVfhe+qvofEuTlWbTSPQLQymBfBMaDUDYjH
-WK6+jGjLAHB8Y9PPvwM/ecRSb6vckKfpu/Y/+arsn/7ihwIDAQABoz4wPDAbBgNV
-HREEFDASghBqYWJiZXIubm9yZHUubmV0MB0GA1UdDgQWBBTpbrmNDAbzimHpvfgR
-Xi9+6vC1GDANBgkqhkiG9w0BAQUFAAOCAQEAFa/NGDqdgxvqkqss0m4SLCa2omxV
-opoYV2zwA7wjPqlPPi4M20i2LysFyqwrPHmOKH0wcAWiB4+d8XN8UmsLrVODmrJN
-BD07pGaDP6jamTtHOr4Enj25pJ/0Fe5hZeLJ3ppFebgq6TfrTd41qIwmC0KMClay
-K0rTtqshk+nKb89Re3xutEU9D7r+EaoHIa9rw1bTz6UmkFZ5ovjfV3htogb8xNt9
-2kQbxgdjl0QkFTf2sURB+4El0oUnXdOZiqQS5hqjEtZDJ6NlDvtW7OtH/SE2PAyn
-zvTzeciRKJ9UNf9ibAJGF7jz/GP5r+yUgizdV0wyikyUa8VNyrSeExBUVg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jabber.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jabber.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jabber.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jabber.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jabber.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jabber.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jabber.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jabber.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jabber.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jabber.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jabber.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jabber.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jabber.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jabber.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Jabber at NORDUnet</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Jabber at NORDUnet</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/nordunet.tv-shibboleth.xml b/swamid-2.0/nordunet.tv-shibboleth.xml
deleted file mode 100644
index 16021d1e..00000000
--- a/swamid-2.0/nordunet.tv-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nordunet.tv/shibboleth">
-  <md: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/nren-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>
-      <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://nordunet.tv/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>nordunet.tv</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nordunet.tv</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAJbH0STVcsEQMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC25vcmR1bmV0LnR2MB4XDTExMDUzMTE1NDg1NloXDTIxMDUyODE1NDg1Nlow
-FjEUMBIGA1UEAxMLbm9yZHVuZXQudHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDgvw+Ecpy85/x9dFLRnI11QoYRx9eRC/H23k5ItE5g/HOinHkl7tT2
-KYhXE8orDVpvtj1edXppIE0C3XWkgltdJTvPOXxnfto2rQOx6h8lZHldFzNhlaD1
-gNNzrNLD/PqOJ4vGgqFogV7BAQFHBWz1hiU98xle7Jqa8/7rWj2V1T7ZcjkfaRhU
-q/4EoJg0UTy0NURQjhgD8pk4gw9PdUfnxWBeiukIFFIiRzPVy6E/DnMHO/Lj3UYU
-hlVK4CZJ1eMaDlqq2msAM2NXFEvfG7jd/XfCdx8ZSqKCRsa4o8pTOcbAW9cxhso8
-rC2gcjgeZypevNVxHzcepMMeCrbs1rblAgMBAAGjRjBEMCMGA1UdEQQcMBqCC25v
-cmR1bmV0LnR2hgtub3JkdW5ldC50djAdBgNVHQ4EFgQULkNNPNMu2YQkJwXc62KQ
-gVs9cTcwDQYJKoZIhvcNAQEFBQADggEBAEQw4jnSd7l+50jXx9lDY4Ffn9s2m69M
-pdKjSUlCN/0+MFRzpZcgJcVSrivqiICeDOW1QHNJZLmiZXzOV4QHwrOGObCMCclo
-+lCmV0sLvZ/N9E5mAne/61kx251w1ub/aQJ5H2HV+wgcGMLyrJN+Fas3Z6D0WIwE
-ln9IKS3JyKG+VBcpLWosX1jaSP6XFJe7kZ58SVbRnAoaGoIWh7tww13KsHkPEmU3
-UuGq63xCD7WDlXE0wpoWBE2dJUti1P4OovwFCUN4aqYT1c2y4wneVj/KTEWy8qKz
-000W3/HStrhj0L5kZNAkal6vzZ0Ux9n3V/9/ZoeSilM5ZiFD9whUQho=
-</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>nordunet.tv</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=nordunet.tv</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAJbH0STVcsEQMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC25vcmR1bmV0LnR2MB4XDTExMDUzMTE1NDg1NloXDTIxMDUyODE1NDg1Nlow
-FjEUMBIGA1UEAxMLbm9yZHVuZXQudHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDgvw+Ecpy85/x9dFLRnI11QoYRx9eRC/H23k5ItE5g/HOinHkl7tT2
-KYhXE8orDVpvtj1edXppIE0C3XWkgltdJTvPOXxnfto2rQOx6h8lZHldFzNhlaD1
-gNNzrNLD/PqOJ4vGgqFogV7BAQFHBWz1hiU98xle7Jqa8/7rWj2V1T7ZcjkfaRhU
-q/4EoJg0UTy0NURQjhgD8pk4gw9PdUfnxWBeiukIFFIiRzPVy6E/DnMHO/Lj3UYU
-hlVK4CZJ1eMaDlqq2msAM2NXFEvfG7jd/XfCdx8ZSqKCRsa4o8pTOcbAW9cxhso8
-rC2gcjgeZypevNVxHzcepMMeCrbs1rblAgMBAAGjRjBEMCMGA1UdEQQcMBqCC25v
-cmR1bmV0LnR2hgtub3JkdW5ldC50djAdBgNVHQ4EFgQULkNNPNMu2YQkJwXc62KQ
-gVs9cTcwDQYJKoZIhvcNAQEFBQADggEBAEQw4jnSd7l+50jXx9lDY4Ffn9s2m69M
-pdKjSUlCN/0+MFRzpZcgJcVSrivqiICeDOW1QHNJZLmiZXzOV4QHwrOGObCMCclo
-+lCmV0sLvZ/N9E5mAne/61kx251w1ub/aQJ5H2HV+wgcGMLyrJN+Fas3Z6D0WIwE
-ln9IKS3JyKG+VBcpLWosX1jaSP6XFJe7kZ58SVbRnAoaGoIWh7tww13KsHkPEmU3
-UuGq63xCD7WDlXE0wpoWBE2dJUti1P4OovwFCUN4aqYT1c2y4wneVj/KTEWy8qKz
-000W3/HStrhj0L5kZNAkal6vzZ0Ux9n3V/9/ZoeSilM5ZiFD9whUQho=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nordunet.tv/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nordunet.tv/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nordunet.tv/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nordunet.tv/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nordunet.tv/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nordunet.tv/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nordunet.tv/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nordunet.tv/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nordunet.tv/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nordunet.tv/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nordunet.tv/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nordunet.tv/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nordunet.tv/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nordunet.tv/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nordunet.tv/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">NORDUnet TV</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">NORDUnet Media Distribution Site</md:ServiceDescription>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
-      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-kalmar-1.0.mxml b/swamid-kalmar-1.0.mxml
index 0cf80b0c..9b60208c 100644
--- a/swamid-kalmar-1.0.mxml
+++ b/swamid-kalmar-1.0.mxml
@@ -7,9 +7,7 @@
   <xi:include href="swamid-2.0/crowd.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.nordu.net-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/beta.lobber.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nordunet.tv-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mailfilter.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/jabber.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/meetingtools.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect-beta.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect-stable.sunet.se-shibboleth.xml"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f62a8d42..1607d69e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -153,13 +153,11 @@
   <xi:include href="swamid-2.0/sp-test.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lingon.ladok.umu.se-8087-sp.xml"/>
   <xi:include href="swamid-2.0/ni.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/jabber.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/epc.ub.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/its-pd0001.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.wisum.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lpw.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/nordunet.tv-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mailfilter.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sutest.dsv.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mds.sunet.se-shibboleth.xml"/>