https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-externals-1.0

26 files changed, 27 insertions, 27 deletions

diff --git a/swamid-externals-1.0.mxml b/swamid-externals-1.0.mxml
index be22bb6c..0306e5cf 100644
--- a/swamid-externals-1.0.mxml
+++ b/swamid-externals-1.0.mxml
@@ -1,4 +1,4 @@
 <?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/spaces.internet2.edu.crt.xml">
-<xi:include href="/home/leifj/work/swamid.se/swamid-metadata/certs/spaces.internet2.edu.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//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>
diff --git a/swamid-externals-1.0/agw-sparknet.utu.fi.xml b/swamid-externals-1.0/agw-sparknet.utu.fi.xml
index 7d29f076..e07e8768 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">
+<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: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 cb22ece2..46fde808 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">
+<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: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 7feb0939..c18b4cc1 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">
+<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: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 4e72f55d..5a234cc4 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/">
+<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: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 1d587e37..b3750124 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">
+<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: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 1f7aa7af..012b57da 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">
+<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: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 94af423b..69fc6ab8 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">
+<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: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 b4dc6610..6a647c52 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">
+<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: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 4e55389c..86319287 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">
+<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: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 a0e9ff0c..1703972e 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">
+<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: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 87efde95..0898cad5 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">
+<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: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 77116f41..7360368f 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">
+<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: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 73c53340..05a9b55f 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">
+<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: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 369729a5..b82561ca 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">
+<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: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 164aa9c4..22a7bb5d 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">
+<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: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 5410cb2d..8cb026a0 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">
+<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: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 f7907e2c..9cbfe077 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">
+<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: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 1747ed7d..dd74c5a3 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/">
+<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: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 f602f2ab..4652e1cf 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">
+<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: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 4cdc7aee..2f998277 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">
+<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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">
diff --git a/swamid-externals-1.0/talli.funet.fi.xml b/swamid-externals-1.0/talli.funet.fi.xml
index 27de8fc6..63bddda7 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">
+<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: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 91071550..b3f9b323 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">
+<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: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 be68c7d7..b844a7c2 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">
+<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: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 e1525153..732daba8 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/">
+<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: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 e4606d33..61faea2c 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">
+<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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <saml:Attribute Name="tags">