Resolves SWAMIDOPS-946

2 files changed, 50 insertions, 50 deletions

diff --git a/swamid-2.0/jira-test.its.umu.se-shibboleth.xml b/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
index 9125aa48..cfa6a359 100644
--- a/swamid-2.0/jira-test.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jira-test.its.umu.se/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jira-stage.its.umu.se/shibboleth">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -30,10 +26,10 @@ and do *NOT* provide it in real time to your partners.
   </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://jira-test.its.umu.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://jira-test.its.umu.se/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://jira-test.its.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <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://jira-test.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+      <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://jira-stage.its.umu.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://jira-stage.its.umu.se/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://jira-stage.its.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://jira-stage.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Jira Test, ITS, Umeå universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Jira Test, ITS, Umeå University</mdui:DisplayName>
@@ -43,33 +39,33 @@ and do *NOT* provide it in real time to your partners.
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://jira-test.its.umu.se/shibboleth</ds:KeyName>
-        <ds:KeyName>jira-test.its.umu.se</ds:KeyName>
+        <ds:KeyName>https://jira-stage.its.umu.se/shibboleth</ds:KeyName>
+        <ds:KeyName>jira-stage.its.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=jira-test.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIELDCCApSgAwIBAgIJAIwCaY3F/5fPMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMTFGppcmEtdGVzdC5pdHMudW11LnNlMB4XDTE3MTAwNTEzMzM1MVoXDTI3MTAw
-MzEzMzM1MVowHzEdMBsGA1UEAxMUamlyYS10ZXN0Lml0cy51bXUuc2UwggGiMA0G
-CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC+a5oMUtQvu6HIRyKGyAV/xNFrdoIO
-pV3RUe+jnc2Re20qD4lAjz07xV0LvICOzF2QumUelLWgrXB6pL2fjQM4LVExerbN
-9+yUsEF7SJseBeVfQgQheNyeX0GgsWFlIKQ+YALRZAPBm5rDFKgfsaxh9hcJgt4R
-y4BuPDhTBusXjX8hzN6pfoulSMspEMOTQAKKDxyhyqN6+l2wOkiCapPyQze2hlhL
-suvt2Txu44tTI4mdnMp2uYHWZkxgTVzFbZRWJ41nUM00xJkkUuJGL3XAahTUM9gv
-hK0VbDl3U2uDOZ9pdZGmnxRypGdxoDtXuU3sbwRbRydAg/Ya69YuF8zHw9hUBa/I
-i0t7HaSNNWS7IdB+bLVfn1mw326z+GdkC1B8KSZb59lv5WqKZVZ7bCs0yJYynuo/
-cix+H7MTq22QuYZINDoxD9gPN5HlJycMEEivFDMyhVdTPUwp7u9OQ21PQl3E2sNt
-//oUnUF1/gB0rucCCXY0qSN3WCL7Vwex4isCAwEAAaNrMGkwSAYDVR0RBEEwP4IU
-amlyYS10ZXN0Lml0cy51bXUuc2WGJ2h0dHBzOi8vamlyYS10ZXN0Lml0cy51bXUu
-c2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwIUKTZvWSSDUSlAqUTixFZFvA9swDQYJ
-KoZIhvcNAQELBQADggGBAJX5lUdKqOmj9bkED5jZWovWo5vuayZ2LxcmWu3UwDz1
-ZntDf8lLeujVW+mLhKLyYPX7UQrwfcjJOCvjk7Ps/O8IDqpzHJDRKP4tRv6v+1F2
-LwPjytRKjx3lv73tyKrUtYtZY5ra5I5E/VaJbX/kSz9d4aIpqPukaAba9BD8d7Rc
-ylz8OAOf4erIFuqkBncUtkAdtXgKERC8qYv+IaHHa7pNnqkejbFQbomhOO2K9kaz
-pgNg7h9AvXKq9PTtf7ozKV1DQEi8hRY1XH+3beeENYqAOP6ugXyOnw6RUxF+z0JJ
-M7kgJTYE8q8u82KhntgDtAEg4Z/Wq3f2oIMfLZPJx7/xqNMrBaVzaVZmvhM+lqwj
-Tr8KgUo0LHzZum1Aebo7ScT6cdOD3Xfvvt8F+ZUR57U+fFSsSx00JUwb1tD3o6qu
-/ggX9O5JLDBs2VXs5sK/O+8el+4JgTnmuCA41arfQlhBP5/MU7Qo48tJ2OYi1Bp8
-GsQCL1moH4F0OZi+taTeTQ==
+          <ds:X509SubjectName>CN=jira-stage.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEMDCCApigAwIBAgIJAM2AaDJdCuFeMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFWppcmEtc3RhZ2UuaXRzLnVtdS5zZTAeFw0xODA4MDYxMDQ0MTVaFw0yODA4
+MDMxMDQ0MTVaMCAxHjAcBgNVBAMTFWppcmEtc3RhZ2UuaXRzLnVtdS5zZTCCAaIw
+DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKuqJ/47I0ebFAVb9thKbbYzynTh
+R029afidaLGJ4R5nJ1i75XyaoJcf7raXCQ3mTwbvS4wqGCO9ZyB8ZyDAaiogf882
+/w/CoBQn8Y2aWWu05uPD+wBXzObWtGe4m5SFCSVeLJI01r2LEBG9d0l+pK21Cxzb
+yWhPony7vMM8S8Zk35s/LtfuT79TCiRdhlSDaGzuIYa+LRUQMvPDLQ9z2UwHsm92
+Xsm2yto80IVe8jTpRSoBIE4p/QBT5qD/zWGBptY1H/kWTFWeTokfYkM+CH3Sc+es
+PWi8zV2sPab2/uMdez0a0XIXYFMB/mIif7O8pznsaVtrtopdyzaelyx9EiWIwff7
+59E8A30ppb0IbiNLJOZSwRKsuCi+Q8j9iTdlCmTih2YmzvHOT1AvakBZ/2HPTMzB
+N7zALJI/5hJELupe/to4ZFmWTYcU9NVoo/3aL+lW0FN+yUK3rSsSADq7wVM179wi
+942UtGbW61BZ72fdJgykmITbIsyBmypCBTciAQIDAQABo20wazBKBgNVHREEQzBB
+ghVqaXJhLXN0YWdlLml0cy51bXUuc2WGKGh0dHBzOi8vamlyYS1zdGFnZS5pdHMu
+dW11LnNlL3NoaWJib2xldGgwHQYDVR0OBBYEFFwbljaCTQs6QyfvfXc1h0KTvEG3
+MA0GCSqGSIb3DQEBCwUAA4IBgQBxyz0h7OJTEn2fyFVoAiFST9ahAkce2Cs1lz9D
+sr3fHEEBXRz5GAqdWq8jfM6mC689iBXUbQ3HKTl1zrCY9kNif7zdHM9bb6UwkES9
+fanNFo8/9CtYoF4s3/euos3DzfcuB66EnqceuGjd9oKRC1mXPFJ3n52uQ+LSyGGl
+jbsSntDDJ1PncMLxEmygXSVyVNFtp7sNGjSJand81xx489aOEAl6oXRObeqKssh6
+4XRUPhyhu+oCLz5EV3GTLyDM0+PFoBR3PwEE2kkbWpPJjktHs/CumPPvKFZNSlTQ
+AM2nOBpchj4F0EDszmxmMc+IAeKRYUUYnLa4t2Ta/6CaO5dnZgqGHVhVH+0e/F8v
+y5BXM6C0n8D63zRjeXWj7NDeyNDOWmK/Fm8YLgTl0lHGVJgVFV29ikhrrdxe+nz9
+5qhrWTL/eyr7uqwZCOv4qRTRzlJDUyPUTGXuw4stYEWlioTKkZz1lYvkw+bfIcs1
+h8k881ZFk3x0kRy/fE1YrM3PU04=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -83,19 +79,23 @@ GsQCL1moH4F0OZi+taTeTQ==
       <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://jira-test.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-test.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-test.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-test.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-test.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-test.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-test.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-test.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-stage.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-stage.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-stage.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-stage.its.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-stage.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Risto Järvi</md:SurName>
+    <md:EmailAddress>mailto:risto.jarvi@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ee02235f..baf240a5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -583,7 +583,6 @@
   <xi:include href="swamid-2.0/student.utb2.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/www.utb2.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/eduroamkonto.kau.se.xml"/>
-  <xi:include href="swamid-2.0/jira-test.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.utbildning.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.utbildning.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml"/>
@@ -720,4 +719,5 @@
   <xi:include href="swamid-2.0/primula.lnu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tentaadmintest.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lis.ladok.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/jira-stage.its.umu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>