resolves SWAMIDOPS-6383

3 files changed, 54 insertions, 54 deletions

diff --git a/swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..26168357
--- /dev/null
+++ b/swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,53 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_d96c18a4ab0c6e7f7eb1e0cb9dfb388f4fac6b45" entityID="https://www-en.testd.ladok.umu.se/aws-sp-en">
+
+  <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://www-en.testd.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www-en.testd.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>www-en.testd.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www-en.testd.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIJAJzPrOxzZijAMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGXd3dy1lbi50ZXN0ZC5sYWRvay51bXUuc2UwHhcNMTExMjE0MDg1MTQxWhcN
+MjExMjExMDg1MTQxWjAkMSIwIAYDVQQDExl3d3ctZW4udGVzdGQubGFkb2sudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApFaOz+KOeFQAMd+w
+eAaaeixrNoq3oAFLLkAg9tI0RcoKJD/ssNA/BytGn/T+uoDHws/yak6YO8/sfH5k
+BfgCxEc7WaBreXBkW/YpwAAx4qSaIx/3vdj/c6ytosWynjAbirOAIAk1UTEHgCKI
+SxqnFzwlWJc1pSsAz8ayQipJkOPgTEWiuEd7+mNC6KHmvWTZ38zwLHUYdsJuyJl6
+eEMdPUgPpt9CbVrHEqvLTIrnmQr7oe7wrGsCi3uJ+Sa1TgALTbg1dhR+eB+HNO4/
+IBQqr1M8yG+c9dz1nMmTeRyu6Fqc+E7UdHofECuDrR7Tu5ah4pVFlRqIaCYjSPZE
+TX1FzwIDAQABo3QwcjBRBgNVHREESjBIghl3d3ctZW4udGVzdGQubGFkb2sudW11
+LnNlhitodHRwczovL3d3dy1lbi50ZXN0ZC5sYWRvay51bXUuc2UvYXdzLXNwLWVu
+MB0GA1UdDgQWBBR4fBmNgW6ZFa/mlVA1NpQiGZMBiDANBgkqhkiG9w0BAQUFAAOC
+AQEAREpcQ2wEyp5vaD8Phu/pKKjimY/XT/ypfnyOA9au957S2J7c1pGhjQ6cZp2Z
+JSJru9ltM1tyzhb3V6ShmOUI3GF94dFi2OYl3KYjrHF+Qxay8lU6cjoZIvC2Gcpa
+YX+vO8HLEa6IYn3K24cKlaepnhViSnIR6mT6Cus0p69JzLnBzZj9g1F92ymuiUwq
+M4qI030C477k8wSjFZIClzKi74JKZjiXftBdyjSy5FIdJTvmIUFy0S5v6QzM4SPr
+0FvdPJO+0xkeYmKPn2/6KW/H1K35BSbwGLfcbyM5jv78oWAHJRFQd9Ml1fnw3x6p
+UB28P1ZfxwQO+Evo145MDgcHyw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-en.testd.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp-en.xml
deleted file mode 100644
index ff135d03..00000000
--- a/swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp-en.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_57beec463ae7f0a1ea560ca449e8a350cee366ff" entityID="https://www.studera.testd.ladok.umu.se/aws-sp-en">
-
-  <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://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/Login"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.studera.testd.ladok.umu.se/aws-sp-en</ds:KeyName>
-        <ds:KeyName>www.studera.testd.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studera.testd.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJANLE6Jnkve40MA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHnd3dy5zdHVkZXJhLnRlc3RkLmxhZG9rLnVtdS5zZTAeFw0xMTEyMTMxMzQ2
-NTRaFw0yMTEyMTAxMzQ2NTRaMCkxJzAlBgNVBAMTHnd3dy5zdHVkZXJhLnRlc3Rk
-LmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7s
-PD1CqhKZiRXsPmQQKMQ11ptGGDBkmuQcCrxX7CCRkBjcY9DCzr+ZBe8KSiUPA49U
-5D+poDaMyV7nyJfZcRd3nuoAtzxpXcNiE8rrBMb2njEZfCKe7zEjjOg5zWF5hM6n
-EK9uf/PLajUGvGZJYuPtz+96VHnNBiFbU/2eHxeSU5IVK5fXzcV6LuRX2T7U/V5x
-RGW+XyX0LhcaW3J1+7pLbvFJZRmpKKua5IUZze/Q3i829y+E/hchBMaPk3NHa75i
-7yuvrUVNtF3fm6SxYhjWfalElbnuprRS5cysQt2Q9ChRDwd9rgwmb7Ci/C7wYT0M
-0uSj6GS2CUWSud2N/mkCAwEAAaN+MHwwWwYDVR0RBFQwUoIed3d3LnN0dWRlcmEu
-dGVzdGQubGFkb2sudW11LnNlhjBodHRwczovL3d3dy5zdHVkZXJhLnRlc3RkLmxh
-ZG9rLnVtdS5zZS9hd3Mtc3AtZW4wHQYDVR0OBBYEFO0gIQRhQSMuagF5wvC0G6Io
-sVlYMA0GCSqGSIb3DQEBBQUAA4IBAQBGVktyZZeM+gtPF6WXvbgu+KzUY3q9qZ0e
-SwGSnVWltUAENFTWYoqo9TbBXNyIJlr118d4xm/LUL6DXyH3Fsoan1S9Sfr+kZJ8
-nwB11pUqQDhLg66rSQcmiW3hRCggjU0YAT2NVjYt/LkRfTxWcpnwqJClJf/nLbQT
-TJbde523paJzrnIRFLwpYlzXE7MfzNjeVbIdnmA9uMV4QxQXW/CnrMOW+aElVWMP
-MRpYmbjEGNEv1g6tsSWrQW4PlnlDhfDc1qSY0UixVdMKO2rfeHrhHTB8S+mrG8cT
-vHdt+W19R2aQ6UhTAWlRRUsr+m8pp3c61CtTDBwkBjchsJQsMsOD
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studera.testd.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 57ed0700..4ebd76fe 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -138,5 +138,5 @@
   <xi:include href="swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-1.0/www.testa.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/nya-00.ladok.umu.se-aws-sp-en.xml"/>
-  <xi:include href="swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp-en.xml"/>
+  <xi:include href="swamid-1.0/www-en.testd.ladok.umu.se-aws-sp-en.xml"/>
 </EntitiesDescriptor>