From ce2a01735261b352f1f87484a386b3c17e841782 Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Tue, 18 Jun 2013 10:46:51 +0200
Subject: metadata files renamed to <entityid>.xml nya-08.ladok.umu.se
 duplicated, removed idp.kau.se.xml duplicate, removed
 luigi.umdc.umu.se-dw-idp.xml duplicate, removed
 luigi.umdc.umu.se-shibboleth-idp.xml duplicate, removed
 swamid-1.0/ladok3-*gui-sp* duplicates, removed old e5.onthehub.com in
 swamid-testing-1.0.xml replaced by swamid-2.0 metadata
 www.bmcmediatek.uu.se.xml duplicate of ws3.bmc.uu.se-shibboleth.xml, removed
 bad entityid of www2.teol.uu.se.xml, removed bad entityid of
 dev.teol.uu.se.xml (sp.example.org-shibboleth.xml), removed

---
 nya-1.0.mxml | 58 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'nya-1.0.mxml')

diff --git a/nya-1.0.mxml b/nya-1.0.mxml
index 89ffcd7b..426a1e1c 100644
--- a/nya-1.0.mxml
+++ b/nya-1.0.mxml
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/nya-1.0.xml">
-  <xi:include href="swamid-1.0/sp.swamid.se.xml"/>
-  <xi:include href="swamid-1.0/shib-sp.kau.se.xml"/>
-  <xi:include href="swamid-1.0/public.it.secure.su.se.xml"/>
-  <xi:include href="nya-1.0/shibboleth.testc.ladok.umu.se.xml"/>
-  <xi:include href="nya-1.0/shibboleth.testb.antagning.se.xml"/>
-  <xi:include href="nya-1.0/shibboleth.testa.antagning.se.xml"/>
-  <xi:include href="nya-1.0/shibboleth.studera.nu.xml"/>
-  <xi:include href="swamid-1.0/shib1.oru.se.xml"/>
-  <xi:include href="swamid-1.0/sp-nya.bth.se.xml"/>
-  <xi:include href="swamid-1.0/akino.hh.se.xml"/>
+  <xi:include href="swamid-1.0/sp.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/shib-sp.kau.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/public.it.secure.su.se-shibboleth.xml"/>
+  <xi:include href="nya-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="nya-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml"/>
+  <xi:include href="nya-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml"/>
+  <xi:include href="nya-1.0/shibboleth.studera.nu-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/shib1.oru.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/sp-nya.bth.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/akino.hh.se-shibboleth.xml"/>
   <xi:include href="swamid-1.0/accountcheckout.lnu.se.xml"/>
-  <xi:include href="swamid-1.0/umdac-stdout.umdc.umu.se.xml"/>
-  <xi:include href="swamid-1.0/account-test.unit.liu.se.xml"/>
-  <xi:include href="swamid-1.0/registrera.hb.se.xml"/>
-  <xi:include href="swamid-1.0/aktivering.db.umu.se.xml"/>
-  <xi:include href="swamid-1.0/nacho.adm.gu.se.xml"/>
-  <xi:include href="swamid-1.0/akino.hh.se.xml"/>
-  <xi:include href="swamid-1.0/nyainloggning.slu.se.xml"/>
-  <xi:include href="swamid-1.0/webapp-utv.ita.mdh.se.xml"/>
-  <xi:include href="swamid-1.0/portal.mdh.se.xml"/>
-  <xi:include href="nya-1.0/shibboleth.antagning.se.xml"/>
-  <xi:include href="swamid-1.0/sp.it.gu.se.xml"/>
-  <xi:include href="nya-1.0/dwidp.antagning.se.xml"/>
-  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se.xml"/>
-  <xi:include href="swamid-1.0/umdac-strike.ad.umu.se.xml"/>
-  <xi:include href="nya-1.0/www.antagning.se.xml"/>
-  <xi:include href="nya-1.0/aktivera-test.su.se.xml"/>
-  <xi:include href="nya-1.0/aktivera.su.se.xml"/>
-  <xi:include href="nya-1.0/www.servicedesk.umdac.umu.se.xml"/>
-  <xi:include href="swamid-1.0/account.mdh.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-stdout.umdc.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/account-test.unit.liu.se-shibboleth-sp.xml"/>
+  <xi:include href="swamid-1.0/registrera.hb.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/aktivering.db.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/nacho.adm.gu.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/akino.hh.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml"/>
+  <xi:include href="swamid-1.0/webapp-utv.ita.mdh.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/portal.mdh.se-shibboleth.xml"/>
+  <xi:include href="nya-1.0/shibboleth.antagning.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/sp.it.gu.se-shibboleth.xml"/>
+  <xi:include href="nya-1.0/dwidp.antagning.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/umdac-strike.ad.umu.se-shibboleth.xml"/>
+  <xi:include href="nya-1.0/www.antagning.se-ecs-sp.xml"/>
+  <xi:include href="nya-1.0/aktivera-test.su.se-shibboleth.sso.xml"/>
+  <xi:include href="nya-1.0/aktivera.su.se-shibboleth.sso.xml"/>
+  <xi:include href="nya-1.0/www.servicedesk.umdac.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-1.0/account.mdh.se-shibboleth.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3