edugain changed to opt-out:

- All except opt-out IdP:s moved from swamid-idp-2.0.mxml to swamid-edugain-idp-1.0.mxml
- eduGAIN SP:s moved from swamid-edugain-1.0.mxml to swamid-edugain-sp-1.0.mxml
- Include eduGAIN IdP:s in swamid-idp-2.0.mxml

4 files changed, 74 insertions, 64 deletions

diff --git a/swamid-edugain-1.0.mxml b/swamid-edugain-1.0.mxml
index be27ab5e..c1b009aa 100644
--- a/swamid-edugain-1.0.mxml
+++ b/swamid-edugain-1.0.mxml
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-edugain-1.0.xml" validUntil="1970-01-01T00:00:00Z" cacheDuration="PT2H">
-  <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
-  <xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/connect-beta.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/webinar.nordu.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sp-test.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/e5.onthehub.com.xml"/>
-  <xi:include href="swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
-  <xi:include href="swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-2.0/wiki.edugain.org-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/test-adfs.geant.net-adfs-services-trust.xml"/>
+  <xi:include href="swamid-edugain-idp-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
+  <xi:include href="swamid-edugain-sp-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
new file mode 100644
index 00000000..ee0b4cae
--- /dev/null
+++ b/swamid-edugain-idp-1.0.mxml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-2.0/idp.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-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/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-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/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="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/swamid2.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"/>
+  <xi:include href="swamid-2.0-obsolete/idp.hgo.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/fs.liu.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/weblogin.uu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/login.idp.eduid.se-idp.xml"/>
+  <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/>
+</md:EntitiesDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
new file mode 100644
index 00000000..7d406af5
--- /dev/null
+++ b/swamid-edugain-sp-1.0.mxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
+  <xi:include href="swamid-2.0/connect.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/connect-beta.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/webinar.nordu.net-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/sp-test.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/e5.onthehub.com.xml"/>
+  <xi:include href="swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
+  <xi:include href="swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+  <xi:include href="swamid-2.0/wiki.edugain.org-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/test-adfs.geant.net-adfs-services-trust.xml"/>
+</md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 64938d65..75e25212 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -2,57 +2,6 @@
 <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-2.0/idp.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-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/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-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/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="swamid-edugain-idp-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <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/swamid2.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"/>
-  <xi:include href="swamid-2.0-obsolete/idp.hgo.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/fs.liu.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/weblogin.uu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/login.idp.eduid.se-idp.xml"/>
-  <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>