Resolves SWAMID-3523

2 files changed, 0 insertions, 71 deletions

diff --git a/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
deleted file mode 100644
index fcb5552c..00000000
--- a/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,70 +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://akka-adm.demo.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>
-    <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">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Uppsala University AKKA DEMO</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA DEMO</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Authentication Control - Directory Administration DEMO</mdui:Description>
-        <mdui:Description xml:lang="sv">Autentisering Kontroll - Katalogadministration DEMO</mdui:Description>
-        <mdui:Logo height="50" width="50">https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://demo.weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://akka-adm.demo.its.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://akka-adm.demo.its.uu.se</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC9DCCAdygAwIBAgIJAJV0MHQLU696MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3ZpcmdvLml0cy51dS5zZTAeFw0xNTA2MTYxNjEyMzJaFw0yNTA2MTMxNjEy
-MzJaMBoxGDAWBgNVBAMTD3ZpcmdvLml0cy51dS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKURYrKnlepBelj8KQW/T+Ha1qtziQQ4gQJkLTYPIUVF
-TlBCiJgGlAgZtQ71WXKRGvfqt2PelpcMONPll0E0OY/J1p6FQlBt9iUYF2fq/9to
-DOQJVm2xLxItO2dLQ/89FJUxcpXnxirK5YxH162jW7Hz+WldOZ5kyQAHeu3HmEAK
-fNIYTCloMSmdwj1q1jNuu5vOoR8zmVoXmtUAPF/HwkdvSyVs9doS5BgnbMeyoBk9
-4xiFmDiO1Gy0ox7Ag9klLh6WxJVKulqfXA83uWLbADqG18XOrCzSOEiJY/QHLVLX
-9JJm5HTypGmUY1X22EQaTYagk6b52NtVkexXVR3zJTECAwEAAaM9MDswGgYDVR0R
-BBMwEYIPdmlyZ28uaXRzLnV1LnNlMB0GA1UdDgQWBBRPmpge3PE7E2Rg+DE28bh/
-NLGFYzANBgkqhkiG9w0BAQUFAAOCAQEAB2TzC1/cKVSxM72XCcegq9oMEf51KvKU
-nY8fkr8d+0LIE4aSNwgHf6nOSQGh+jLBpDaeIaEylzQ50hNG/XVcq3xpAiEGHDj5
-5Kmkqm2S8AscPaUBQEB46bQz9npTpem1PORzsOStUxHuj2JKulGdLFF61wR3Kjcb
-p4+WwrYtlk+elmgzGrj0W7aF9JN9NWupGlpc7Q0YQHxhlw6fWXp4Ny0hmXByCIY/
-Focty5H3QmBpK8aLH3wbajaLaDZs4IXp+wrIOjYGo79ZYeH9ky6DHGZV6G13bUY7
-xxDg6j9aNkDMliUUAe6tc0OcQkp0gbwwFzJMT/qq8K7AfKlX8vES9Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.demo.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.demo.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-adm.demo.its.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 080ccc3c..77d31fc9 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -24,7 +24,6 @@
   <xi:include href="swamid-2.0/akkatest-anv.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/t0253.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/emmautv.ldc.lu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/devrb.lbic.lu.se.xml"/>
   <xi:include href="swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml"/>