http://spaces.internet2.edu/Shibboleth.sso/Metadata into swamid-externals-1.0

27 files changed, 54 insertions, 28 deletions

diff --git a/swamid-externals-1.0.mxml b/swamid-externals-1.0.mxml
index 0306e5cf..7fa017ae 100644
--- a/swamid-externals-1.0.mxml
+++ b/swamid-externals-1.0.mxml
@@ -1,4 +1,30 @@
 <?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//home/leifj/work/swamid.se/swamid-metadata/certs/kalmar-signer.crt.xml">
-<xi:include href="/home/leifj/work/swamid.se/swamid-metadata/certs/kalmar-signer.crt/*.xml"/>
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-externals-1.0.xml">
+<xi:include href="swamid-externals-1.0/agw-sparknet.utu.fi.xml"/>
+<xi:include href="swamid-externals-1.0/atlases.muni.cz.xml"/>
+<xi:include href="swamid-externals-1.0/auth.asiaportal.info.xml"/>
+<xi:include href="swamid-externals-1.0/connect.tut.fi.xml"/>
+<xi:include href="swamid-externals-1.0/foodl.org.xml"/>
+<xi:include href="swamid-externals-1.0/fse.eduuni.fi.xml"/>
+<xi:include href="swamid-externals-1.0/idp.csc.fi.xml"/>
+<xi:include href="swamid-externals-1.0/idp.feide.no.xml"/>
+<xi:include href="swamid-externals-1.0/idp.ids-mannheim.de.xml"/>
+<xi:include href="swamid-externals-1.0/idp.it.helsinki.fi.xml"/>
+<xi:include href="swamid-externals-1.0/moodle.helsinki.fi.xml"/>
+<xi:include href="swamid-externals-1.0/moodle.utu.fi.xml"/>
+<xi:include href="swamid-externals-1.0/openwiki.feide.no.xml"/>
+<xi:include href="swamid-externals-1.0/ow.feide.no.xml"/>
+<xi:include href="swamid-externals-1.0/rnd.feide.no.xml"/>
+<xi:include href="swamid-externals-1.0/securemail.feide.no.xml"/>
+<xi:include href="swamid-externals-1.0/shibboleth.bbaw.de.xml"/>
+<xi:include href="swamid-externals-1.0/software.msdnaa.dk.xml"/>
+<xi:include href="swamid-externals-1.0/spaces.internet2.edu.xml"/>
+<xi:include href="swamid-externals-1.0/sp.dev.clarin.inl.nl.xml"/>
+<xi:include href="swamid-externals-1.0/sp.lux17.mpi.nl.xml"/>
+<xi:include href="swamid-externals-1.0/talli.funet.fi.xml"/>
+<xi:include href="swamid-externals-1.0/terena.org.xml"/>
+<xi:include href="swamid-externals-1.0/translation.rnd.feide.no.xml"/>
+<xi:include href="swamid-externals-1.0/tullbommen.arcada.fi.xml"/>
+<xi:include href="swamid-externals-1.0/wayf.wayf.dk.xml"/>
+<xi:include href="swamid-externals-1.0/www.scribo.dk.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-externals-1.0/agw-sparknet.utu.fi.xml b/swamid-externals-1.0/agw-sparknet.utu.fi.xml
index e07e8768..7d29f076 100644
--- a/swamid-externals-1.0/agw-sparknet.utu.fi.xml
+++ b/swamid-externals-1.0/agw-sparknet.utu.fi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://agw-sparknet.utu.fi" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://agw-sparknet.utu.fi">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/atlases.muni.cz.xml b/swamid-externals-1.0/atlases.muni.cz.xml
index 46fde808..cb22ece2 100644
--- a/swamid-externals-1.0/atlases.muni.cz.xml
+++ b/swamid-externals-1.0/atlases.muni.cz.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://atlases.muni.cz/shibboleth" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://atlases.muni.cz/shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/auth.asiaportal.info.xml b/swamid-externals-1.0/auth.asiaportal.info.xml
index c18b4cc1..7feb0939 100644
--- a/swamid-externals-1.0/auth.asiaportal.info.xml
+++ b/swamid-externals-1.0/auth.asiaportal.info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://auth.asiaportal.info" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://auth.asiaportal.info">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/connect.tut.fi.xml b/swamid-externals-1.0/connect.tut.fi.xml
index 5a234cc4..4e72f55d 100644
--- a/swamid-externals-1.0/connect.tut.fi.xml
+++ b/swamid-externals-1.0/connect.tut.fi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://connect.tut.fi/" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://connect.tut.fi/">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/foodl.org.xml b/swamid-externals-1.0/foodl.org.xml
index b3750124..1d587e37 100644
--- a/swamid-externals-1.0/foodl.org.xml
+++ b/swamid-externals-1.0/foodl.org.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/fse.eduuni.fi.xml b/swamid-externals-1.0/fse.eduuni.fi.xml
index 012b57da..1f7aa7af 100644
--- a/swamid-externals-1.0/fse.eduuni.fi.xml
+++ b/swamid-externals-1.0/fse.eduuni.fi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://fse.eduuni.fi/adfs/services/trust" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://fse.eduuni.fi/adfs/services/trust">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/idp.csc.fi.xml b/swamid-externals-1.0/idp.csc.fi.xml
index 69fc6ab8..94af423b 100644
--- a/swamid-externals-1.0/idp.csc.fi.xml
+++ b/swamid-externals-1.0/idp.csc.fi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.csc.fi/idp/shibboleth" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.csc.fi/idp/shibboleth">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/idp.feide.no.xml b/swamid-externals-1.0/idp.feide.no.xml
index 6a647c52..b4dc6610 100644
--- a/swamid-externals-1.0/idp.feide.no.xml
+++ b/swamid-externals-1.0/idp.feide.no.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.feide.no" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.feide.no">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/idp.ids-mannheim.de.xml b/swamid-externals-1.0/idp.ids-mannheim.de.xml
index 86319287..4e55389c 100644
--- a/swamid-externals-1.0/idp.ids-mannheim.de.xml
+++ b/swamid-externals-1.0/idp.ids-mannheim.de.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.ids-mannheim.de/shibboleth" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.ids-mannheim.de/shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/idp.it.helsinki.fi.xml b/swamid-externals-1.0/idp.it.helsinki.fi.xml
index 1703972e..a0e9ff0c 100644
--- a/swamid-externals-1.0/idp.it.helsinki.fi.xml
+++ b/swamid-externals-1.0/idp.it.helsinki.fi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.it.helsinki.fi/shibboleth" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.it.helsinki.fi/shibboleth">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/moodle.helsinki.fi.xml b/swamid-externals-1.0/moodle.helsinki.fi.xml
index 0898cad5..87efde95 100644
--- a/swamid-externals-1.0/moodle.helsinki.fi.xml
+++ b/swamid-externals-1.0/moodle.helsinki.fi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://moodle.helsinki.fi/shibboleth" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://moodle.helsinki.fi/shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/moodle.utu.fi.xml b/swamid-externals-1.0/moodle.utu.fi.xml
index 7360368f..77116f41 100644
--- a/swamid-externals-1.0/moodle.utu.fi.xml
+++ b/swamid-externals-1.0/moodle.utu.fi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://moodle.utu.fi" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://moodle.utu.fi">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/openwiki.feide.no.xml b/swamid-externals-1.0/openwiki.feide.no.xml
index 05a9b55f..73c53340 100644
--- a/swamid-externals-1.0/openwiki.feide.no.xml
+++ b/swamid-externals-1.0/openwiki.feide.no.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://openwiki.feide.no/simplesaml/module.php/saml/sp/metadata.php/default-sp" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://openwiki.feide.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/ow.feide.no.xml b/swamid-externals-1.0/ow.feide.no.xml
index b82561ca..369729a5 100644
--- a/swamid-externals-1.0/ow.feide.no.xml
+++ b/swamid-externals-1.0/ow.feide.no.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ow.feide.no/simplesaml/module.php/saml/sp/metadata.php/default-sp" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ow.feide.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/rnd.feide.no.xml b/swamid-externals-1.0/rnd.feide.no.xml
index 22a7bb5d..164aa9c4 100644
--- a/swamid-externals-1.0/rnd.feide.no.xml
+++ b/swamid-externals-1.0/rnd.feide.no.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://rnd.feide.no/simplesaml/module.php/saml/sp/metadata.php/saml" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://rnd.feide.no/simplesaml/module.php/saml/sp/metadata.php/saml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/securemail.feide.no.xml b/swamid-externals-1.0/securemail.feide.no.xml
index 8cb026a0..5410cb2d 100644
--- a/swamid-externals-1.0/securemail.feide.no.xml
+++ b/swamid-externals-1.0/securemail.feide.no.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://securemail.feide.no/simplesaml/saml2/sp/metadata.php" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://securemail.feide.no/simplesaml/saml2/sp/metadata.php">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/shibboleth.bbaw.de.xml b/swamid-externals-1.0/shibboleth.bbaw.de.xml
index 9cbfe077..f7907e2c 100644
--- a/swamid-externals-1.0/shibboleth.bbaw.de.xml
+++ b/swamid-externals-1.0/shibboleth.bbaw.de.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://shibboleth.bbaw.de/shibboleth" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://shibboleth.bbaw.de/shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/software.msdnaa.dk.xml b/swamid-externals-1.0/software.msdnaa.dk.xml
index dd74c5a3..1747ed7d 100644
--- a/swamid-externals-1.0/software.msdnaa.dk.xml
+++ b/swamid-externals-1.0/software.msdnaa.dk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://software.msdnaa.dk/" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://software.msdnaa.dk/">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/sp.dev.clarin.inl.nl.xml b/swamid-externals-1.0/sp.dev.clarin.inl.nl.xml
index 4652e1cf..f602f2ab 100644
--- a/swamid-externals-1.0/sp.dev.clarin.inl.nl.xml
+++ b/swamid-externals-1.0/sp.dev.clarin.inl.nl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.dev.clarin.inl.nl/shibboleth" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.dev.clarin.inl.nl/shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/sp.lux17.mpi.nl.xml b/swamid-externals-1.0/sp.lux17.mpi.nl.xml
index 2f998277..4cdc7aee 100644
--- a/swamid-externals-1.0/sp.lux17.mpi.nl.xml
+++ b/swamid-externals-1.0/sp.lux17.mpi.nl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.lux17.mpi.nl" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.lux17.mpi.nl">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/spaces.internet2.edu.xml b/swamid-externals-1.0/spaces.internet2.edu.xml
index 033a63a9..77e698e2 100644
--- a/swamid-externals-1.0/spaces.internet2.edu.xml
+++ b/swamid-externals-1.0/spaces.internet2.edu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" cacheDuration="P0DT1H0M0S" entityID="https://spaces.internet2.edu/shibboleth" validUntil="2011-02-07T10:22:05Z">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://spaces.internet2.edu/shibboleth">
    
    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.0:protocol">
       <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
diff --git a/swamid-externals-1.0/talli.funet.fi.xml b/swamid-externals-1.0/talli.funet.fi.xml
index 63bddda7..27de8fc6 100644
--- a/swamid-externals-1.0/talli.funet.fi.xml
+++ b/swamid-externals-1.0/talli.funet.fi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://talli.funet.fi/haka" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://talli.funet.fi/haka">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/terena.org.xml b/swamid-externals-1.0/terena.org.xml
index b3f9b323..91071550 100644
--- a/swamid-externals-1.0/terena.org.xml
+++ b/swamid-externals-1.0/terena.org.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/translation.rnd.feide.no.xml b/swamid-externals-1.0/translation.rnd.feide.no.xml
index b844a7c2..be68c7d7 100644
--- a/swamid-externals-1.0/translation.rnd.feide.no.xml
+++ b/swamid-externals-1.0/translation.rnd.feide.no.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://translation.rnd.feide.no/simplesaml/saml2/sp/metadata.php" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://translation.rnd.feide.no/simplesaml/saml2/sp/metadata.php">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/tullbommen.arcada.fi.xml b/swamid-externals-1.0/tullbommen.arcada.fi.xml
index 732daba8..e1525153 100644
--- a/swamid-externals-1.0/tullbommen.arcada.fi.xml
+++ b/swamid-externals-1.0/tullbommen.arcada.fi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://tullbommen.arcada.fi/simplesaml/" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://tullbommen.arcada.fi/simplesaml/">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/wayf.wayf.dk.xml b/swamid-externals-1.0/wayf.wayf.dk.xml
index 61faea2c..e4606d33 100644
--- a/swamid-externals-1.0/wayf.wayf.dk.xml
+++ b/swamid-externals-1.0/wayf.wayf.dk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.wayf.dk" validUntil="2011-01-20T10:22:06Z" cacheDuration="PT259200S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.wayf.dk">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">