Resolved SWAMIDOPS-12480

3 files changed, 0 insertions, 118 deletions

diff --git a/swamid-2.0/lubas-test.srv.lu.se-shibboleth.xml b/swamid-2.0/lubas-test.srv.lu.se-shibboleth.xml
deleted file mode 100644
index 0ce73938..00000000
--- a/swamid-2.0/lubas-test.srv.lu.se-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://lubas-test.srv.lu.se/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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">luBAS test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">luBAS test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">uBAS och luBAS testmiljö / utbildningsplaner och kusrplaner</mdui:Description>
-        <mdui:Description xml:lang="en">uBAS and luBAS testing</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDwzCCAqugAwIBAgIJAOZyU0HkuQhgMA0GCSqGSIb3DQEBCwUAMHMxCzAJBgNV
-BAYTAlNFMQ8wDQYDVQQIEwZTd2VkZW4xDTALBgNVBAcTBEx1bmQxEjAQBgNVBAoT
-CUxEQyBkcmlmdDERMA8GA1UECxMIVEVTVC1zc2wxHTAbBgNVBAMTFGx1YmFzLXRl
-c3Quc3J2Lmx1LnNlMB4XDTE1MTAxNDEzMzQxOFoXDTIwMTAxMzEzMzQxOFowczEL
-MAkGA1UEBhMCU0UxDzANBgNVBAgTBlN3ZWRlbjENMAsGA1UEBxMETHVuZDESMBAG
-A1UEChMJTERDIGRyaWZ0MREwDwYDVQQLEwhURVNULXNzbDEdMBsGA1UEAxMUbHVi
-YXMtdGVzdC5zcnYubHUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDRSRpSaqjsMSzRna4CqZlAohcY4j8FZ4hMMOSCKa30Jbh8GSlZCcTcu1lN1lbi
-gpECR+Fx6CyV4tPW8mc+QJ8MaprLC8MnS4w2XtYR+QtCtDYLQo0dm4w6RlOjdQaX
-T76Kj5hjgT6v5ZRvxiM9Q3i3i4EQqmHxyIYy6+0L4XjkjEsSRBpn/0x+ra5Q8NOv
-7+N5dBQ1zKUbk1UXmno0/BBvm8xkDvUYRMk9wINFdNehFlcIZvTFdLQYoWm60vZT
-ZVM7CD4CEEY0ZxffATdjHpdcL4rsh5o/glb2b8wszpy4z9L9fkPbDLlr3gFu+Mki
-CaOZa5ImY4/BVdRJlqjxAN7tAgMBAAGjWjBYMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMD4GA1UdEQQ3MDWCFGx1YmFzLXRlc3Quc3J2Lmx1LnNlgh10MDIyMS1nbHVi
-YXMtbHUtdHN0LnNydi5sdS5zZTANBgkqhkiG9w0BAQsFAAOCAQEAW/alO9TuQsky
-PX8QFP+x+l8O8Vmt30Gdya8uzVCPgibdmlPFu23SKyjEf+Le9p1nsfo7tNnFC9rv
-xB32GgjO/zgSGCjsct/CJscZTALocEGk3w0VaUfYFzQutCB975uicnJ/Iq7PE/tf
-cIlfY6XWfDa0wU2T5MTA1RbsB/0BJNPN5SdqK4v/2h2eJjP6pnBP6kRXQ1sRCWH6
-LVxrRza5HanRojg8YRWJxlnSkexJ68Ev8yiPPOwPYDbyv/+e6hW/ODIf7yY07A+p
-wXmNCK4Zh4KW6j219O4VEldp2fWfWNTzbgfI/Eo5VJq54SRRTkDAL2Rat7eWXm3t
-iU9HcxkhcA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lubas-test.srv.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lubas-test.srv.lu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lubas-test.srv.lu.se/Shibboleth.sso/SAML/POST" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Åhfeldt</md:SurName>
-    <md:EmailAddress>martin.ahfeldt@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ubas-test.srv.lu.se-shibboleth.xml b/swamid-2.0/ubas-test.srv.lu.se-shibboleth.xml
deleted file mode 100644
index 9f359853..00000000
--- a/swamid-2.0/ubas-test.srv.lu.se-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ubas-test.srv.lu.se/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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">uBAS test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">uBAS test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">uBAS och luBAS testmiljö / utbildningsplaner och kusrplaner</mdui:Description>
-        <mdui:Description xml:lang="en">uBAS and luBAS testing</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDvjCCAqagAwIBAgIJAOfZjMApPqeXMA0GCSqGSIb3DQEBCwUAMHIxCzAJBgNV
-BAYTAlNFMQ8wDQYDVQQIEwZTd2VkZW4xDTALBgNVBAcTBEx1bmQxEjAQBgNVBAoT
-CUxEQyBkcmlmdDERMA8GA1UECxMIVEVTVC1zc2wxHDAaBgNVBAMTE3ViYXMtdGVz
-dC5zcnYubHUuc2UwHhcNMTUxMDE0MDkwMDAxWhcNMjAxMDEzMDkwMDAxWjByMQsw
-CQYDVQQGEwJTRTEPMA0GA1UECBMGU3dlZGVuMQ0wCwYDVQQHEwRMdW5kMRIwEAYD
-VQQKEwlMREMgZHJpZnQxETAPBgNVBAsTCFRFU1Qtc3NsMRwwGgYDVQQDExN1YmFz
-LXRlc3Quc3J2Lmx1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-ma6sd5S7fy4QMP1oV3BB8QO92cd/JAIbvgduiOf6JIbwXoamIlpKX8VK0HhXm1Cr
-TrbUBk1cStapjj+bb6DMEmN/YoPcwXDiS7O4Rngm9O2gD4FwFjSxZwOjSfme0FPz
-b9e9XdUd0wcAYn5jOvESB+OdtSDpzGmoOiaobm+5dvnje31bod1GDyxgoWDx201u
-QyVM+10tnRiex5Hrk7WWYnhMEv02PLIx+6cO2ms9a/qqzNfUYt699q5IkfU2yQKI
-XU554jrS3Md0HDGich8TBphtLMzQ8Ot3SVkJza48u9L3Fpk6ANk8lkKM5E7ywaD2
-IS6RKHxEdOaYi+WvyMWMsQIDAQABo1cwVTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DA7BgNVHREENDAyghN1YmFzLXRlc3Quc3J2Lmx1LnNlght0MDIyMS11YmFzLWx1
-LXRzdC5zcnYubHUuc2UwDQYJKoZIhvcNAQELBQADggEBAHM/29XBSwCIyROueQ1y
-Fmit577cWeazp1+NBL3NRHtesFJdMftMCGncQxGmLrLtM7BTXOo3VIESzKYMl1Xm
-95IX1G1n38VkoVqJvTeVaSC6ICdphoRzoS3RIdZVFZ5h7VYz7zhqwmS5b8sXGvhH
-iJQJq7XXtua5AkQnhyg4S2Tvl+OGXXM02d3DYLAfnn9Hqwh2OYK++J1FJUsnRFy9
-Mq8mcNGZ3w2+BrFczNJ+C23CGJ2dxQS77hAPIB8fOTPKt8zFbsFRk4TeDwFUlQ1m
-ES+MzAaLWpKSnGkIsyHbz5P8oek6Suc5ewoxo/7lMBXDpwS1YSEets0i0s6OHM5C
-5iU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ubas-test.srv.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ubas-test.srv.lu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ubas-test.srv.lu.se/Shibboleth.sso/SAML/POST" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Åhfeldt</md:SurName>
-    <md:EmailAddress>martin.ahfeldt@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index e1e5f14f..7c0245e1 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -359,8 +359,6 @@
   <xi:include href="swamid-2.0/www.resultat.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/account.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/lubas-test.srv.lu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/ubas-test.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/secure.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml"/>