From fd4cb8e524c8355824957178eaf5c65eeb550b7b Mon Sep 17 00:00:00 2001
From: Johan Berggren <jbn@nordu.net>
Date: Thu, 9 Feb 2012 10:38:24 +0100
Subject: Removed UMU-SAML1 IdP and renamed OrgName for UMU SAML2 Idp MD

---
 swamid-1.0.mxml                 | 1 -
 swamid-1.0/idp.umu.se-saml1.xml | 4 ++--
 swamid-1.0/idp.umu.se-saml2.xml | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index b45b010c..6c864f02 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -35,7 +35,6 @@
   <xi:include href="swamid-1.0/www.cambro.umu.se.xml"/>
   <xi:include href="swamid-1.0/cambro-utv1.umdc.umu.se.xml"/>
   <xi:include href="swamid-1.0/idp.umu.se-saml2.xml"/>
-  <xi:include href="swamid-1.0/idp.umu.se-saml1.xml"/>
   <xi:include href="swamid-1.0/kurser.math.su.se.xml"/>
   <xi:include href="swamid-1.0/kurser3.math.su.se.xml"/>
   <xi:include href="swamid-1.0/webwork.math.su.se.xml"/>
diff --git a/swamid-1.0/idp.umu.se-saml1.xml b/swamid-1.0/idp.umu.se-saml1.xml
index fc35887a..e8b61e4e 100644
--- a/swamid-1.0/idp.umu.se-saml1.xml
+++ b/swamid-1.0/idp.umu.se-saml1.xml
@@ -21,8 +21,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
     <md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University (SAML1)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet (SAML1)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
     <md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-1.0/idp.umu.se-saml2.xml b/swamid-1.0/idp.umu.se-saml2.xml
index 71e43a42..1bd6b6a6 100644
--- a/swamid-1.0/idp.umu.se-saml2.xml
+++ b/swamid-1.0/idp.umu.se-saml2.xml
@@ -26,8 +26,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
     <md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University (SAML2)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet (SAML2)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
     <md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
   </md:Organization>
@@ -35,4 +35,4 @@
     <md:SurName>Datordrift</md:SurName>
     <md:EmailAddress>datordrift@umdac.umu.se</md:EmailAddress>
   </md:ContactPerson>
-</md:EntityDescriptor>
\ No newline at end of file
+</md:EntityDescriptor>
-- 
cgit v1.2.3