swamid-1.0* removed

nya-1.0* removed
non-used metadata moved to swamid-2.0-obsolete
swamid-1.0/* moved to swamid-2.0/
nya-1.0/* moved to swamid-2.0/
mxml cleaned from swamid-1.0 data
Makefile cleaned from nya-1.0 and swamid-1.0 data

1 files changed, 43 insertions, 43 deletions

diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index b3282029..74d60977 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -2,52 +2,52 @@
 <md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 
                        xmlns:xi="http://www.w3.org/2001/XInclude" 
                        Name="http://md.swamid.se/md/swamid-idp-2.0.xml">
-   <xi:include href="swamid-1.0/idp.nordu.net-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp-test.nordu.net-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/swamid.user.uu.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.chalmers.se-adfs-services-trust.xml"/>
-   <xi:include href="swamid-1.0/idp.hig.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp2.hig.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.lnu.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/login.du.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.mah.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/shibboleth.slu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.nordu.net-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/swamid.user.uu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.chalmers.se-adfs-services-trust.xml"/>
+   <xi:include href="swamid-2.0/idp.hig.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp2.hig.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.lnu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/login.du.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.mah.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shibboleth.slu.se-idp-shibboleth.xml"/>
    <xi:include href="swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/login.liu.se-idp-shibboleth.xml"/>  
-   <xi:include href="swamid-1.0/shibbo.ltu.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.hkr.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.it.su.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/saml-1.sys.kth.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/shibboleth.vhs.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
-   <xi:include href="swamid-1.0/idp2.kau.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/shibb1.hj.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.bth.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/login.liu.se-idp-shibboleth.xml"/>  
+   <xi:include href="swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.hkr.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.it.su.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shibboleth.vhs.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
+   <xi:include href="swamid-2.0/idp2.kau.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shibb1.hj.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.bth.se-idp-shibboleth.xml"/>
    <xi:include href="swamid-2.0/idp.kb.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/signon.hh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/vmidgw3.miun.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.irf.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/signon.hh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/livesrv.ex.vr.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.bth.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.student.bth.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/identity.mdh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.it.gu.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/adfs01.fhs.se-adfs-services-trust.xml"/>
-   <xi:include href="swamid-1.0/idp.konstfack.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.rkh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.kmh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml"/>
-   <xi:include href="swamid-1.0/shibboleth.net.lu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.irf.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.bth.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.student.bth.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/identity.mdh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.it.gu.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml"/>
+   <xi:include href="swamid-2.0/idp.konstfack.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.rkh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.kmh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/callback-prod.inloggning.se-simplesaml-saml2-idp-meta_7baf0ac137159c2b28aebc5956e46bff.xml"/>
+   <xi:include href="swamid-2.0/shibboleth.net.lu.se-idp-shibboleth.xml"/>
    <xi:include href="swamid-2.0/idp.kva.se-idp-shibboleth.xml"/>
    <xi:include href="swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml"/>
    <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/>
-   <xi:include href="nya-1.0/shibboleth.antagning.se-shibboleth-idp.xml"/>
-   <xi:include href="swamid-1.0/kiidp.ki.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/swamid.shh.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.suni.se-adfs-services-trust.xml"/>
-   <xi:include href="swamid-1.0/hbidp.hb.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp.his.se-idp-shibboleth.xml"/>
-   <xi:include href="swamid-1.0/idp2.hv.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml"/>
+   <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/swamid.shh.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/>
+   <xi:include href="swamid-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp.his.se-idp-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>