From 002295fa3bec3757e039955bd040eca2e17319b3 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 18 Nov 2015 14:45:35 +0100
Subject: Resolves SWAMIDOPS-7886

---
 swamid-2.0/wisumstage.its.umu.se-shibboleth.xml | 108 ------------------------
 swamid-sp-2.0.mxml                              |   1 -
 2 files changed, 109 deletions(-)
 delete mode 100644 swamid-2.0/wisumstage.its.umu.se-shibboleth.xml

diff --git a/swamid-2.0/wisumstage.its.umu.se-shibboleth.xml b/swamid-2.0/wisumstage.its.umu.se-shibboleth.xml
deleted file mode 100644
index 50ca0a2e..00000000
--- a/swamid-2.0/wisumstage.its.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wisumstage.its.umu.se/shibboleth">
-  <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://refeds.org/category/research-and-scholarship</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://wisumstage.its.umu.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://wisumstage.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" 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://wisumstage.its.umu.se/Shibboleth.sso/MIUN"/>
-      <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://wisumstage.its.umu.se/Shibboleth.sso/HH"/>
-      <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://wisumstage.its.umu.se/Shibboleth.sso/UMU"/>
-      <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://wisumstage.its.umu.se/Shibboleth.sso/SU"/>
-      <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://wisumstage.its.umu.se/Shibboleth.sso/KI"/>
-      <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://wisumstage.its.umu.se/Shibboleth.sso/SU"/>
-      <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://wisumstage.its.umu.se/Shibboleth.sso/KTH"/>
-      <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://wisumstage.its.umu.se/Shibboleth.sso/HIG"/>
-      <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://wisumstage.its.umu.se/Shibboleth.sso/LTU"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">ITS, Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ITS, Umea University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Serviceprovider, används primärt för utveckling</mdui:Description>
-        <mdui:Description xml:lang="en">Serviceprovider, primarily used for development</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>its-utv03.ad.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ake.andersson@umu.se,CN=its-utv03.ad.umu.se,OU=Organizational Unit Name:ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAMZSkH53CntAMA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
-CgYDVQQKDANJVFMxJTAjBgNVBAsMHE9yZ2FuaXphdGlvbmFsIFVuaXQgTmFtZTpJ
-VFMxHDAaBgNVBAMME2l0cy11dHYwMy5hZC51bXUuc2UxIzAhBgkqhkiG9w0BCQEW
-FGFrZS5hbmRlcnNzb25AdW11LnNlMB4XDTE0MDkyMzA4MzQxMloXDTE3MDgwNjA4
-MzQxMlowgasxCzAJBgNVBAYTAlNFMRUwEwYDVQQIDAxWYXN0ZXJib3R0ZW4xDTAL
-BgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzElMCMGA1UECwwcT3JnYW5pemF0aW9u
-YWwgVW5pdCBOYW1lOklUUzEcMBoGA1UEAwwTaXRzLXV0djAzLmFkLnVtdS5zZTEj
-MCEGCSqGSIb3DQEJARYUYWtlLmFuZGVyc3NvbkB1bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC6WjbxUU6Sy8YeZIeQ11E2eH66YG/CcAy3nd2g
-0ai2Dzu03wCD+GNdWPuZslLlkvK4AE6iR2+ZQgkqzBoI7ifpxSbnPMfPDMjNK5Yx
-Ix7EHE1kgD7D1iCz30H2O9/oNSVjykMXnjLMlLBYaDjxZoj+L3pwKKTW6Yzg6T7o
-z90xke1qpcVOD0+e2vgLoYbIq7QTzF/VkPyRrDwsbw3f4WiJiRAI9dNLPdt6fh6F
-ePKKPv6xUEOO1uDjVmwL7HUYfh6br5G6jR642rnbJhqd5HJiD1Sn+BMv2ilVFHOr
-KclBHavS9aKvj++IVdjTMk0/APsSi8uV2RF1UEeUVh2afi2pAgMBAAGjUDBOMB0G
-A1UdDgQWBBS/yT6QYUoPUWKDcpJe52kqdgRKXzAfBgNVHSMEGDAWgBS/yT6QYUoP
-UWKDcpJe52kqdgRKXzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCa
-53ROhR17tvRIoeBhUZ3WICcNsrN88LcQX6iiD9beWr4bLYn0hX+vgs/EoznuLZPL
-9yBPk5XlVfRJA6XGQ2mrcWeVPapduIOeRX5MpBaOhOULMahTC9VztR+0/h5lUiVF
-MgYw/UX/wMJheDvEqt31DrwfGPH7cFnZZnNiDBNzpe7RTx5r6W9lXROzyl0BJ+l/
-N1edCRg4D+SjXviDNKli19pL82ONv0x607sCLGKEDR3qhQxd7wcGcNGwlg32MFNQ
-vk7XtvHnrAqG1Nn1WrK5npXCw9Tx8omdql4W0fhtdHDffSxO7iNVswPS8/fYIYHc
-xjIf5blaR7shDIsqWMix
-</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://wisumstage.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 60ab1812..766510f5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -283,7 +283,6 @@
   <xi:include href="swamid-2.0/tucana.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/registry.swamid.se-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/its-utv03.ad.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/wisumstage.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/data.kb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/blender.c3se.chalmers.se-a.xml"/>
   <xi:include href="swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt"/>
-- 
cgit v1.2.3