Resolves SWAMID-2875 part 2

6 files changed, 66 insertions, 36 deletions

diff --git a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
index 49f3599c..8cdcab0e 100644
--- a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
@@ -219,4 +219,22 @@ YPbGFDgtXE/LKeKsvKgyQIfKUW8=
     <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
     <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </AttributeAuthorityDescriptor>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>University of Borås</Company>
+    <SurName>IT</SurName>
+    <EmailAddress>mailto:it@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>University of Borås</Company>
+    <SurName>IT</SurName>
+    <EmailAddress>mailto:it@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>University of Borås</Company>
+    <SurName>IT</SurName>
+    <EmailAddress>mailto:it@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/konto-test.test.hb.se-shibboleth.xml b/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
index 8e3a57a8..f6a64bde 100644
--- a/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
+++ b/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
@@ -131,22 +131,22 @@ jdkRrWzWFJhSCRj04tS0Oyw=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>University of Borås</Company>
+    <SurName>IT</SurName>
+    <EmailAddress>mailto:it@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>University of Borås</Company>
+    <SurName>IT</SurName>
+    <EmailAddress>mailto:it@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>University of Borås</Company>
+    <SurName>IT</SurName>
+    <EmailAddress>mailto:it@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml b/swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml
index 0f67cc3c..28c8ce42 100644
--- a/swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml
+++ b/swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml
@@ -72,5 +72,8 @@ kRhWnOJ7MGl/dXuesoTIyhkE5T2fMTM=
   </md:ContactPerson>
   <md:ContactPerson contactType="other">
     <md:Company>Högskolan i Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml b/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml
index fe04351d..25c993f5 100644
--- a/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml
+++ b/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml
@@ -66,5 +66,8 @@ tK5eKJ70Qsj0YizWe90n9K+VGOryORdurTNkxJNVHxSvPZRuFQ==
   </md:ContactPerson>
   <md:ContactPerson contactType="other">
     <md:Company>Högskolan i Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.hb.se.xml b/swamid-2.0/play.hb.se.xml
index c0a86c40..698873d8 100644
--- a/swamid-2.0/play.hb.se.xml
+++ b/swamid-2.0/play.hb.se.xml
@@ -47,4 +47,10 @@
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="other">
+    <md:Company>Högskolan i Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml b/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml
index 873daa92..1da27499 100644
--- a/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml
@@ -127,22 +127,22 @@ jdkRrWzWFJhSCRj04tS0Oyw=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT</md:SurName>
-    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>University of Borås</Company>
+    <SurName>IT</SurName>
+    <EmailAddress>mailto:it@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>University of Borås</Company>
+    <SurName>IT</SurName>
+    <EmailAddress>mailto:it@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>University of Borås</Company>
+    <SurName>IT</SurName>
+    <EmailAddress>mailto:it@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
 </md:EntityDescriptor>