make a swamid-1.0 without cacheDuration and validUntil

2 files changed, 191 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index a2d84146..27b75c23 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ keys: $(KEY) $(CERT)
 
 MXML=$(shell echo *.mxml)
 
-sign: keys swamid nya nya-testing swamid-testing swamid-testing-idp upstream projects swamid-ki-sll
+sign: keys swamid nocache nya nya-testing swamid-testing swamid-testing-idp upstream projects swamid-ki-sll
 
 %.sig: %.mxml
 	xsltproc $(XSLTDEFS) --xinclude $(TRANSFORM) $< > $*.n
@@ -44,6 +44,9 @@ kalmar:
 edugain:
 	$(MAKE) RPI=true CONTACTS=true swamid-edugain-testing-1.0.pub swamid-edugain-1.0.pub
 
+nocache:
+	$(MAKE) swamid-1.0-nocache.pub
+
 projects:
 	$(MAKE) RPI=false CONTACTS=false TOU=false ORG=false swamid-fiv-test.pub
 
@@ -132,4 +135,4 @@ test: swamid2-deps
 	@for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema  schema.xsd $$x; done
 
 clean:
-	@rm -f *.xml *.tbs
+	@rm -f *.xml *.tbs *.n
diff --git a/swamid-1.0-nocache.mxml b/swamid-1.0-nocache.mxml
new file mode 100644
index 00000000..e62afab0
--- /dev/null
+++ b/swamid-1.0-nocache.mxml
@@ -0,0 +1,186 @@
+<?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/swamid-1.0.xml">
+  <xi:include href="swamid-1.0/order.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/dedserv79.levonline.com.xml"/>
+  <xi:include href="swamid-1.0/mondo.su.se.xml"/>
+  <xi:include href="swamid-1.0/mondo-test.su.se.xml"/>
+  <xi:include href="swamid-1.0/ensky.lhs.se.xml"/>
+  <xi:include href="swamid-1.0/shib-sp.kau.se.xml"/>
+  <xi:include href="swamid-1.0/www.wisum.umdac.umu.se.xml"/>
+  <xi:include href="swamid-1.0/beta.augustus.se.xml"/>
+  <xi:include href="swamid-1.0/dspace.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/lists.su.se.xml"/>
+  <xi:include href="swamid-1.0/pp-komm-admin.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/www.sub.su.se.xml"/>
+  <xi:include href="swamid-1.0/idp.protectnetwork.org.xml"/>
+  <xi:include href="swamid-1.0/samsok.libris.kb.se.xml"/>
+  <xi:include href="swamid-1.0/public.it.secure.su.se.xml"/>
+  <xi:include href="swamid-externals-1.0/downloads.channel8.msdn.com.xml"/>
+  <xi:include href="swamid-1.0/mondo-web.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/idp.hig.se.xml"/>
+  <xi:include href="swamid-1.0/cbs-vylvatest.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/labs.swami.se.xml"/>
+  <xi:include href="swamid-1.0/shibboleth.ebscohost.com.xml"/>
+  <xi:include href="swamid-1.0/www3.genuinetext.com.xml"/>
+  <xi:include href="swamid-1.0/xfire.mimas.ac.uk.xml"/>
+  <xi:include href="swamid-1.0/idp.secure.su.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-humpdac.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/sp.lhs.se.xml"/>
+  <xi:include href="swamid-1.0/roundup.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/moodle.lhs.se.xml"/>
+  <xi:include href="swamid-1.0/slcstest.uninett.no.xml"/>
+  <xi:include href="swamid-1.0/www.cambro.umu.se.xml"/>
+  <xi:include href="swamid-1.0/cambro-utv1.umdc.umu.se.xml"/>
+  <xi:include href="swamid-1.0/idp.umu.se-saml2.xml"/>
+  <xi:include href="swamid-1.0/idp.umu.se-saml1.xml"/>
+  <xi:include href="swamid-1.0/kurser.math.su.se.xml"/>
+  <xi:include href="swamid-1.0/kurser3.math.su.se.xml"/>
+  <xi:include href="swamid-1.0/webwork.math.su.se.xml"/>
+  <xi:include href="swamid-1.0/webwork2.math.su.se.xml"/>
+  <xi:include href="swamid-1.0/etenta.math.su.se"/>
+  <xi:include href="swamid-1.0/sp.swamid.se.xml"/>
+  <xi:include href="swamid-1.0/connect.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/connect-test.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/login.liu.se.xml"/>
+  <xi:include href="swamid-1.0/converis.info.xml"/>
+  <xi:include href="swamid-1.0/samlidp.ki.se.xml"/>
+  <xi:include href="swamid-1.0/sp.wavelan.su.se.xml"/>
+  <xi:include href="swamid-1.0/samadhi.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/idp.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/idp.it.gu.se.xml"/>
+  <xi:include href="swamid-1.0/tcs-test.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/identity.mdh.se.xml"/>
+  <xi:include href="swamid-1.0/signon.hh.se.xml"/>
+  <xi:include href="swamid-1.0/shibboleth.net.lu.se.xml"/>
+  <xi:include href="swamid-1.0/idp.lnu.se.xml"/>
+  <xi:include href="swamid-1.0/hbidp.hb.se.xml"/>
+  <xi:include href="swamid-1.0/shib-idp-1.oru.se.xml"/>
+  <xi:include href="swamid-1.0/tcs-escience.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/tcs-personal.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/tcs-escience-portal.terena.org.xml"/>
+  <xi:include href="swamid-1.0/tcs-personal-portal.terena.org.xml"/>
+  <xi:include href="swamid-1.0/shibb1.hj.se.xml"/>
+  <xi:include href="swamid-1.0/shibbo.ltu.se.xml"/>
+  <xi:include href="swamid-1.0/akino.hh.se.xml"/>
+  <xi:include href="swamid-1.0/vmidgw.miun.se.xml"/>
+  <xi:include href="swamid-1.0/bibliometrics.ki.se.xml"/>
+  <xi:include href="swamid-1.0/uu.test.diva-portal.org.xml"/>
+  <xi:include href="swamid-1.0/idp.bth.se.xml"/>
+  <xi:include href="swamid-1.0/idp.student.bth.se.xml"/>
+  <xi:include href="swamid-1.0/account-test.unit.liu.se.xml"/>
+  <xi:include href="swamid-1.0/www4.genuinetext.com.xml"/>
+  <xi:include href="swamid-1.0/beta.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/su.avedas.com.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/sukattool-web1.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/idp.hgo.se.xml"/>
+  <xi:include href="swamid-1.0/www.diva-portal.org.xml"/>
+  <xi:include href="swamid-1.0/pp-edu-admin.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/minastudier-test.su.se.xml"/>
+  <xi:include href="swamid-1.0/ladok-test.su.se.xml"/>
+  <xi:include href="swamid-1.0/pp-redtest-admin.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/cambro-tst1.umdc.umu.se.xml"/>
+  <xi:include href="swamid-1.0/login.proxy.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/nordushare-dev.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/pp-migr-admin.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/pp-test-admin.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/swamid.user.uu.se.xml"/>
+  <xi:include href="swamid-1.0/mail.su.se.xml"/>
+  <xi:include href="swamid-1.0/support.it.secure.su.se.xml"/>
+  <xi:include href="swamid-1.0/tools.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/publications.ki.se.xml"/>
+  <xi:include href="swamid-1.0/pp-prod-admin.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/pp-redmigr-admin.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/brainstorm.swami.se.xml"/>
+  <xi:include href="swamid-1.0/kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/beta.lobber.se.xml"/>
+  <xi:include href="swamid-1.0/idp.his.se.xml"/>
+  <xi:include href="swamid-1.0/users.hv.se-shib1.xml"/>
+  <xi:include href="swamid-1.0/users.hv.se-saml2.xml"/>
+  <xi:include href="swamid-1.0/www07test.sub.su.se.xml"/>
+  <xi:include href="swamid-1.0/sp.kau.se.xml"/>
+  <xi:include href="swamid-1.0/fordrop.irt.kth.se.xml"/>
+  <xi:include href="swamid-1.0/minastudier.su.se.xml"/>
+  <xi:include href="swamid-1.0/ladok.su.se.xml"/>
+  <xi:include href="swamid-1.0/bardo.kib.ki.se.xml"/>
+  <xi:include href="swamid-1.0/mailfilter-test.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/unitcf.se.xml"/>
+  <xi:include href="swamid-1.0/crowd.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/rt-test-app1.it.su.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="swamid-1.0/confluence.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/jira.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/confluence-test.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/mailfilter.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/jira-test.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/rt.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/swamid.shh.se.xml"/>
+  <xi:include href="swamid-1.0/ilearn.dsv.su.se.xml"/>
+  <xi:include href="swamid-1.0/idp.mah.se.xml"/>
+  <xi:include href="swamid-1.0/connect.uninett.no.xml"/>
+  <xi:include href="swamid-1.0/nagios.dev.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/www.studera.testb.antagning.se.xml"/>
+  <xi:include href="swamid-1.0/idp2.kau.se.xml"/>
+  <xi:include href="swamid-1.0/idp.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/dev.lobber.se.xml"/>
+  <xi:include href="swamid-1.0/kiidp.ki.se.xml"/>
+  <xi:include href="swamid-1.0/www.bmcmediatek.uu.se.xml"/>
+  <xi:include href="swamid-1.0/saml-1.sys.kth.se.xml"/>
+  <xi:include href="swamid-1.0/sp-test.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/www.studera.nu.xml"/>
+  <xi:include href="swamid-1.0/smd-dev.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/vlab-chemsub.explizit.se.xml"/>
+  <xi:include href="swamid-1.0/sp.it.gu.se.xml"/>
+  <xi:include href="swamid-1.0/monitor.it.su.se.xml"/>
+  <xi:include href="swamid-1.0/coip-test.sunet.se-sp.xml"/>
+  <xi:include href="swamid-1.0/idp.hkr.se.xml"/>
+  <xi:include href="swamid-1.0/betafoo.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/idp.chalmers.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-utv1.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-utv2.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/idp2.hig.se.xml"/>
+  <xi:include href="swamid-1.0/login.du.se.xml"/>
+  <xi:include href="nya-1.0/www.antagning.se.xml"/>
+  <xi:include href="swamid-1.0/idp.irf.se.xml"/>
+  <xi:include href="swamid-1.0/crowdtest.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/idp.suni.se.xml"/>
+  <xi:include href="swamid-1.0/connect8.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/sp-test.swamid.se.xml"/>
+  <xi:include href="swamid-1.0/shibboleth.vhs.se.xml"/>
+  <xi:include href="nya-1.0/www.studera.testa.antagning.se.xml"/>
+  <xi:include href="swamid-1.0/lingon.ladok.umu.se.xml"/>
+  <xi:include href="swamid-1.0/ni.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/jabber.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/epc.ub.uu.se.xml"/>
+  <xi:include href="swamid-1.0/expert.antagning.se.xml"/>
+  <xi:include href="swamid-1.0/its-pd0001.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/www.servicedesk.its.umu.se.xml"/>
+  <xi:include href="swamid-1.0/umdac-olho0001.ad.umu.se.xml"/>
+  <xi:include href="swamid-1.0/www.wisum.its.umu.se.xml"/>
+  <xi:include href="swamid-1.0/kiladokdev.it.ki.se.xml"/>
+  <xi:include href="swamid-1.0/kiladoktest.it.ki.se.xml"/>
+  <xi:include href="swamid-1.0/lpw.ki.se.xml"/>
+  <xi:include href="swamid-1.0/nordunet.tv.xml"/>
+  <xi:include href="swamid-1.0/mailfilter.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/dev.teol.uu.se.xml"/>
+  <xi:include href="swamid-1.0/www2.teol.uu.se.xml"/>
+  <xi:include href="swamid-1.0/www2.student.teol.uu.se.xml"/>
+  <xi:include href="swamid-1.0/www.student.teol.uu.se.xml"/>
+  <xi:include href="swamid-1.0/sutest.dsv.su.se.xml"/>
+  <xi:include href="swamid-1.0/www.antagning.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/mds.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/meta.eduroam.se.xml"/>
+  <xi:include href="swamid-1.0/meetingtools.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/play.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/medieportaltest.kau.se.xml"/>
+  <xi:include href="swamid-1.0/smd.du.se.xml"/>
+  <xi:include href="swamid-1.0/mds.lan.kth.se.xml"/>
+  <xi:include href="swamid-1.0/ws3.bmc.uu.se.xml"/>
+  <xi:include href="swamid-1.0/mds-test.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/play.liu.se.xml"/>
+  <xi:include href="swamid-1.0/account.liu.se.xml"/>
+  <xi:include href="swamid-1.0/shibboleth.slu.se.xml"/>
+  <xi:include href="swamid-1.0/nagios-vm.nordu.net.xml"/>
+</EntitiesDescriptor>