From 9ab08fae0625365ce5259d833f38d253f8d7c147 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Mon, 16 May 2016 11:08:32 +0200
Subject: Update contact info for ths.se and opt-in again to edugain

---
 swamid-2.0/idp.ths.se-idp-shibboleth.xml | 17 +++++++++++++++++
 swamid-edugain-idp-1.0.mxml              |  1 +
 swamid-idp-2.0.mxml                      |  1 -
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/swamid-2.0/idp.ths.se-idp-shibboleth.xml b/swamid-2.0/idp.ths.se-idp-shibboleth.xml
index 3d9c8fdd..9fe246b1 100644
--- a/swamid-2.0/idp.ths.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.ths.se-idp-shibboleth.xml
@@ -175,4 +175,21 @@ xAdB19mh1plahNrAaEfu6Ldetyz9iulY
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">THS</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Teologiska högskolan Stockholm</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Stockholm School of Theology</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ths.se/english</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.ths.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Owe</GivenName>
+    <SurName>Kennerberg</SurName>
+    <EmailAddress>mailto:owe.kennerberg@ths.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Peter</GivenName>
+    <SurName>Säll</SurName>
+    <EmailAddress>mailto:peter@jhsupport.se</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 30583ebb..d34a551d 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -50,4 +50,5 @@
   <xi:include href="swamid-2.0/idp2.bth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.ths.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 39fda176..e03116d2 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -11,5 +11,4 @@
   <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/login.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.irf.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.ths.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3