From 034f97f362d7117a0501e2fe6d7c986791b1d516 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 15 Nov 2016 14:56:04 +0100
Subject: Remove old KAU IdP from testing. Make aggregate

---
 swamid-2.0/idp-test.kau.se-idp-shibboleth.xml | 139 --------------------------
 swamid-testing-idp-1.0.mxml                   |   1 -
 2 files changed, 140 deletions(-)
 delete mode 100644 swamid-2.0/idp-test.kau.se-idp-shibboleth.xml

diff --git a/swamid-2.0/idp-test.kau.se-idp-shibboleth.xml b/swamid-2.0/idp-test.kau.se-idp-shibboleth.xml
deleted file mode 100644
index 447321ca..00000000
--- a/swamid-2.0/idp-test.kau.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-test.kau.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAL6+eYiH7vM1UZL2/N2xPdb4piT6MA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTAeFw0xMTEyMTQyMTAzMTVa
-Fw0zMTEyMTQyMTAzMTVaMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVDJpZBV5iqqcHOdf1x30M7vK7n
-B2ZPL86g8JDb16CeH5FHnA9neydqunpY3qX4/NJjuIglsmvDVh1ZPpQFSEOsA4YM
-p1hmSKuCc2k6YhTRnnvrno12v7a10RZyVRD952cQLLlYz0/AAZoVfvILgnVX2QQF
-VXzE4H1OpsTQIuSriuHh8+IdEuwZ2RlZfnsbpiAkVj2X0i1K7DhC3GHXgiN/UAps
-a3nFE9j2m1IewnL0/xO0VNf07nA83c7vvR3Ekua6UeqjA8zsgrQSSbuFiZcWn4dF
-6BNqkr9Q96G5A72/jvI+rluuu/QJ7G+CuHgAhRS6VKrynR4NdCMIxOeu5usCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLXRlc3Qua2F1LnNlhiZodHRwczovL2lkcC10
-ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU2vqi7u/v5R4V2Ejb
-1CtC/Nt6vhAwDQYJKoZIhvcNAQEFBQADggEBAG+1OjFI0WzKL0vhoO+OAXgT/5nA
-oUYST3WkNqx1W+EobtjQnJfI5csi3XSRYvoHEuFZqKQL4Wfrzs2lBGvOi57F9UdQ
-cc7EM6tBU+r22/AxUmBWDFLVoB4uStPNT8LBRcB75jAbHHdny6r/KxeRcqU1ug/3
-uv2QZfazpP7UtGpYSX27MsrT0ASyVchSta8kbWV8m7dyziJ4alAPYMBM4+qEic98
-MCUrqCvl40nvl7TfesM/0VOgrPiGi4fNt+hF5cPPVMUGC2buM8Ox2rsqg9Tr8klP
-Tnia5JUcHU+5FI4AguTUeFr5F8YbByd7KBjsN6ywpK7ulrrNJnDzWFmSCYY=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIJAKWCbaA+La6KMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2lkcC10ZXN0LmthdS5zZTAeFw0xNDA0MTQxNTA3MTZaFw0xNzA0MTMxNTA3
-MTZaMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAOOUnn1Z8qxNitfN7vn//7wGigpf0dCFhkTPpRlmRIU6
-wNlnOgT3JkRpH88U/vFzCR0F6kC+khBJzrjohC1trWJXGuK6aEUg7dY43vGgcVjQ
-/wfpgs5mtoku7LIOj7VgTkjU9foLmzSvH+Ts1CBD8Rwk6qDmWPdTf2cgviOu3r3a
-R4MvXbUOJvMX+BjqQrDPI2LQW7jeWjQ+g7rtb3sapMkoTvVdts0AL7OEcegIAa24
-SYKn9QFd2dafJdEq0tcgyQD/xqY1jiNkl1El9jcUpaFIgwUBTZ1UcleN6Vjyu2V9
-C/D58yCC7eEu4M6bahWpsYEz5lZXRh5fDN7k35yRy58CAwEAAaNlMGMwQgYDVR0R
-BDswOYIPaWRwLXRlc3Qua2F1LnNlhiZodHRwczovL2lkcC10ZXN0LmthdS5zZS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU7pI0oFwuXDc46gGBSpBIckMC8KgwDQYJ
-KoZIhvcNAQEFBQADggEBAHOAOEOfg2fc7bbMW3S2r8ZULK278CtsOwr4gQU4rzli
-vkF3Yq7wqw3U3NBteGY0GSiTt2qcF00Va6EGYxqNPktfXtlo3z0IkpMnzcGPRtmp
-ez6S6iUIPC8wzPJ7giuMXgWn7QaY9F6kETEcg2nRM5I4ZU7/+mPHljVBQVPFI2/7
-H5H2QzixHDK1qwOkdneRrvCNlNnl9KHgiuiTEy6j3zUpIS+f3U1PS+ist+NXZrdj
-I6D7EogivsjADowMTNAq+rtlxhTUTlp4ntIc8N1jhLKetvPfwl/np3G+VHN2v5w8
-Izy0hXNev3Cjxtgj7mQS0EKO/6UOCuObXVcE41Iyep4=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.kau.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.kau.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.kau.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAL6+eYiH7vM1UZL2/N2xPdb4piT6MA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTAeFw0xMTEyMTQyMTAzMTVa
-Fw0zMTEyMTQyMTAzMTVaMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVDJpZBV5iqqcHOdf1x30M7vK7n
-B2ZPL86g8JDb16CeH5FHnA9neydqunpY3qX4/NJjuIglsmvDVh1ZPpQFSEOsA4YM
-p1hmSKuCc2k6YhTRnnvrno12v7a10RZyVRD952cQLLlYz0/AAZoVfvILgnVX2QQF
-VXzE4H1OpsTQIuSriuHh8+IdEuwZ2RlZfnsbpiAkVj2X0i1K7DhC3GHXgiN/UAps
-a3nFE9j2m1IewnL0/xO0VNf07nA83c7vvR3Ekua6UeqjA8zsgrQSSbuFiZcWn4dF
-6BNqkr9Q96G5A72/jvI+rluuu/QJ7G+CuHgAhRS6VKrynR4NdCMIxOeu5usCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLXRlc3Qua2F1LnNlhiZodHRwczovL2lkcC10
-ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU2vqi7u/v5R4V2Ejb
-1CtC/Nt6vhAwDQYJKoZIhvcNAQEFBQADggEBAG+1OjFI0WzKL0vhoO+OAXgT/5nA
-oUYST3WkNqx1W+EobtjQnJfI5csi3XSRYvoHEuFZqKQL4Wfrzs2lBGvOi57F9UdQ
-cc7EM6tBU+r22/AxUmBWDFLVoB4uStPNT8LBRcB75jAbHHdny6r/KxeRcqU1ug/3
-uv2QZfazpP7UtGpYSX27MsrT0ASyVchSta8kbWV8m7dyziJ4alAPYMBM4+qEic98
-MCUrqCvl40nvl7TfesM/0VOgrPiGi4fNt+hF5cPPVMUGC2buM8Ox2rsqg9Tr8klP
-Tnia5JUcHU+5FI4AguTUeFr5F8YbByd7KBjsN6ywpK7ulrrNJnDzWFmSCYY=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIJAKWCbaA+La6KMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2lkcC10ZXN0LmthdS5zZTAeFw0xNDA0MTQxNTA3MTZaFw0xNzA0MTMxNTA3
-MTZaMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAOOUnn1Z8qxNitfN7vn//7wGigpf0dCFhkTPpRlmRIU6
-wNlnOgT3JkRpH88U/vFzCR0F6kC+khBJzrjohC1trWJXGuK6aEUg7dY43vGgcVjQ
-/wfpgs5mtoku7LIOj7VgTkjU9foLmzSvH+Ts1CBD8Rwk6qDmWPdTf2cgviOu3r3a
-R4MvXbUOJvMX+BjqQrDPI2LQW7jeWjQ+g7rtb3sapMkoTvVdts0AL7OEcegIAa24
-SYKn9QFd2dafJdEq0tcgyQD/xqY1jiNkl1El9jcUpaFIgwUBTZ1UcleN6Vjyu2V9
-C/D58yCC7eEu4M6bahWpsYEz5lZXRh5fDN7k35yRy58CAwEAAaNlMGMwQgYDVR0R
-BDswOYIPaWRwLXRlc3Qua2F1LnNlhiZodHRwczovL2lkcC10ZXN0LmthdS5zZS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU7pI0oFwuXDc46gGBSpBIckMC8KgwDQYJ
-KoZIhvcNAQEFBQADggEBAHOAOEOfg2fc7bbMW3S2r8ZULK278CtsOwr4gQU4rzli
-vkF3Yq7wqw3U3NBteGY0GSiTt2qcF00Va6EGYxqNPktfXtlo3z0IkpMnzcGPRtmp
-ez6S6iUIPC8wzPJ7giuMXgWn7QaY9F6kETEcg2nRM5I4ZU7/+mPHljVBQVPFI2/7
-H5H2QzixHDK1qwOkdneRrvCNlNnl9KHgiuiTEy6j3zUpIS+f3U1PS+ist+NXZrdj
-I6D7EogivsjADowMTNAq+rtlxhTUTlp4ntIc8N1jhLKetvPfwl/np3G+VHN2v5w8
-Izy0hXNev3Cjxtgj7mQS0EKO/6UOCuObXVcE41Iyep4=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.kau.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KAUTEST</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Karlstads Universitet (Test IdP)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Karlstad University (Test IdP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>KAU</Company>
-    <EmailAddress>paul.scott@kau.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 56cd625d..834159fe 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -13,7 +13,6 @@
   <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dwidp.testb.antagning.se-dw-idp.xml"/>
   <xi:include href="swamid-2.0/shibboleth.testb.antagning.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-2.0/idp-test.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml"/>
-- 
cgit v1.2.3