SWAMID-179 Remove and add antagning test SPs

2 files changed, 67 insertions, 44 deletions

diff --git a/swamid-2.0/expert.hubbletest.antagning.se-452-anvandare-sp.xml b/swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml
index 6d732ce0..3cd3b0cc 100644
--- a/swamid-2.0/expert.hubbletest.antagning.se-452-anvandare-sp.xml
+++ b/swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml
@@ -1,5 +1,5 @@
 <?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://expert.hubbletest.antagning.se:452/anvandare-sp">
+<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://expert.hubbletest.antagning.se/ecs-sp">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
@@ -22,49 +22,48 @@
     <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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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://expert.hubbletest.antagning.se:452/Shibboleth.sso/Login"/>
-      <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://expert.hubbletest.antagning.se:452/Shibboleth.sso/Login" 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://expert.hubbletest.antagning.se/Shibboleth.sso/Login"/>
+      <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://expert.hubbletest.antagning.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Hubbletest användaradministration</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hubbletest useradministration</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Hubbletest</mdui:Description>
-        <mdui:Description xml:lang="en">Hubbletest</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">NyA-webben (hubbletest)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NyA-webben (hubbletest)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Antagning.se är sajten för anmälan till universitet och högskolor</mdui:Description>
+        <mdui:Description xml:lang="en">Apply online to Swedish universities and university colleges</mdui:Description>
         <mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
         <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>expert.hubbletest.antagning.se:452/bw</ds:KeyName>
+        <ds:KeyName>expert.hubbletest.antagning.se/ecs-sp</ds:KeyName>
         <ds:KeyName>https://expert.hubbletest.antagning.se/ecs-sp</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=expert.hubbletest.antagning.se:452/bw</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDZzCCAk+gAwIBAgIJAIQ9MwNj9pFLMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-BAMTJWV4cGVydC5odWJibGV0ZXN0LmFudGFnbmluZy5zZTo0NTIvYncwHhcNMTkw
-NDAxMDcwNzAwWhcNMjkwMzI5MDcwNzAwWjAwMS4wLAYDVQQDEyVleHBlcnQuaHVi
-YmxldGVzdC5hbnRhZ25pbmcuc2U6NDUyL2J3MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAyQrKw08CX8jMA2uJyAoZ3A1aGsXaQNYwDsvXZj0HrZyXf7W6
-1QSJBsTlkMkhzHkg697pBjdPvOCZy9SI18CMvp/ycJ8Lw1svy18MepgbE12XNHqI
-SfcB8E9wOctD9XvCZ3MJYUhm3LCffTcRsMAfZG7tUTmvu9BVbpguFO5GZDEmfd0a
-OHXS5XldWtkwHy1WLxOKCUb25xJBkHSMszwFAbzSfWObSPCCOmF0Qbqvig8T8h/T
-blqPBRMPuCVLem9ExFnAafOplbWJ6C9SZKLUnW251HWfrn6uKr5JiSpSYECpTXnt
-CcC6Ca1eoPEiNl1jlHRfdJ4bSDZX2DXYZByTwwIDAQABo4GDMIGAMF8GA1UdEQRY
-MFaCJWV4cGVydC5odWJibGV0ZXN0LmFudGFnbmluZy5zZTo0NTIvYneGLWh0dHBz
+          <ds:X509SubjectName>CN=expert.hubbletest.antagning.se/ecs-sp</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDZzCCAk+gAwIBAgIJALjWQi/CTDllMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+BAMTJWV4cGVydC5odWJibGV0ZXN0LmFudGFnbmluZy5zZS9lY3Mtc3AwHhcNMTcx
+MDI3MTAyOTI2WhcNMjcxMDI1MTAyOTI2WjAwMS4wLAYDVQQDEyVleHBlcnQuaHVi
+YmxldGVzdC5hbnRhZ25pbmcuc2UvZWNzLXNwMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAvQ94mOsaXpzM/dmkyfvHaNEwh80JCd9OT5Omb95NdhZBi/FZ
+a7m9waoVopNz3vAzfUIGVmMTF3UYF2p759dvIeMUkaI4o1kmc16pM2w0Art+1bKL
+A0LCmdDsqAwehiwxDXxZHKy5qzC2drnwn8O+CZv99mH1dSlTI59064hNroNjxqve
+XAxI4Xg7BMHzVUSaLOR6F8G1KvWucNnfnPJ6u0YCYfvhHoFZBtUA09F7iNJxOeUI
+oFeresoqX2c+Jj1n1Q2wQ/J9YtTRHkyYql0+JOEG1zlZEVJc8+F3cxiOpcVN9hoc
+KD3hBbVEjK4aMttEzqUUyOF79mmxv9O11spC6QIDAQABo4GDMIGAMF8GA1UdEQRY
+MFaCJWV4cGVydC5odWJibGV0ZXN0LmFudGFnbmluZy5zZS9lY3Mtc3CGLWh0dHBz
 Oi8vZXhwZXJ0Lmh1YmJsZXRlc3QuYW50YWduaW5nLnNlL2Vjcy1zcDAdBgNVHQ4E
-FgQUbZ3pS9QMDcjeqkhfYcaxrY6jPUowDQYJKoZIhvcNAQEFBQADggEBAKM2Oh4/
-d7++8FpvKUiODyjYDSp8xnnTIcPH+fNuiNnLTtUThU995HOfOWOWCW3LdmIN5wLE
-J0/mQADX1bwhlhimBMnlUF/r6nJw37XTxgOmEvorIO/DH5EJ8vSymkesDRC0d8HD
-ZacuUIIWoW9H3fe+NSzkXzMdGatNcfxxArP0Ge+HuTlBd/Nsk9o/zZNuYEAwQKiN
-P7OMnQsFslVgD4M4MXaGFHXIkmfoz+vgBUzN/K1tlw0JHiIQWrxzm+hokT3zTD0y
-/65z9RCIqxW6vvGV6p/fCFZ1fNELsoCJlBpMc2JTfHdYfZfFeE/t0sRGKLxd2Tj0
-tSrfWefE7kzjfEE=
+FgQUb7Ye17gp0TZULKfIY1Ym8X2QtQwwDQYJKoZIhvcNAQEFBQADggEBAFPFg8cV
+7KXNIrEraiQoBV9JDu+puWI2c8IJQUlm/F2gTHA/ctLJi26/+pk7Kt+S7KbRZuX4
+O51tYoMzvxpbs8I358Ax4QU0ilpzn4qbEPVwT76jza1YZdr0suesz6kswtURtKMY
+s0+qHX0+VrNBgCEZ7Ez10vS14wutN4+0bpmkW1xv2iBYbmKp1m+jK5loGQY8HBzl
+0RQS005icbLY0Fp1GFH1qPCUurnvhrzTvTLZDJvvfwlTm+/zxxJv7ygYmukXXelX
+KPMShcY/oiXVhIeTKerVykuKp0/nfLKlR9Qk1DiURdCxlNsjRALaG+GKBcuWLhw2
+pTz2pvp6H+wCW7E=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +77,43 @@ tSrfWefE7kzjfEE=
       <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://expert.hubbletest.antagning.se:452/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.hubbletest.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">Swedish Council for Higher Education</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">www.uhr.se</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">www.uhr.se/en</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uhr.se/en</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Swedish Council for Higher Education</Company>
+    <SurName>UHR Systemdrift</SurName>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
+    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Swedish Council for Higher Education</Company>
+    <SurName>HÃ¥kan Pettersson</SurName>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
+    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Swedish Council for Higher Education</Company>
+    <SurName>UHR Systemdrift</SurName>
+    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
+    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
+  </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 1e96ec6c..88602a00 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -519,7 +519,6 @@
   <xi:include href="swamid-2.0/lu.beta.instructure.com-saml2.xml"/>
   <xi:include href="swamid-2.0/lu.test.instructure.com-saml2.xml"/>
   <xi:include href="swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityrealm-finishlogin.xml"/>
-  <xi:include href="swamid-2.0/expert.hubbletest.antagning.se-452-anvandare-sp.xml"/>
   <xi:include href="swamid-2.0/uu-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/uppsala.instructure.com-saml2.xml"/>
@@ -688,4 +687,5 @@
   <xi:include href="swamid-2.0/idpproxy.dev.eduid.se-sp.xml"/>
   <xi:include href="swamid-2.0/account.lnu.se-saml2.xml"/>
   <xi:include href="swamid-2.0/secure.ouriginal.com.xml"/>
+  <xi:include href="swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml"/>
 </md:EntitiesDescriptor>