Created swamid-testing-sp-1.0.mxml and filled it with metadata from Ladok, moved Ladok testing idp-metadata to swamid-testing-idp-1.0.mxml

5 files changed, 172 insertions, 95 deletions

diff --git a/NewMakefileWithSp b/NewMakefileWithSp
new file mode 100644
index 00000000..1341812e
--- /dev/null
+++ b/NewMakefileWithSp
@@ -0,0 +1,73 @@
+
+KEY=/opt/swamid-credentials/swamid-signer.key
+CERT=/opt/swamid-credentials/swamid-signer.crt
+PASS=$(shell cat /opt/swamid-credentials/swamid-signer-pass.txt)
+DEST=/opt/published-metadata
+
+all: update clean sign
+
+update:
+#	@svn up -q
+
+keys: $(KEY) $(CERT)
+
+MXML=$(shell echo *.mxml)
+
+sign: keys swamid nya swamid-compat nya-testing old-swamid-testing swamid-testing swamid-testing-idp swamid-testing-sp swamid-kalmar swamid-edugain-testing swamid-ki-sll
+
+urn-mace-swami.se-swamid-test-1.0-metadata.mxml:
+	@sed 's!http://md.swamid.se/md/swamid-1.0.xml!urn:mace:swami.se:swamid:test-1.0!g' < swamid-1.0.mxml > urn-mace-swami.se-swamid-test-1.0-metadata.mxml
+
+swamid-compat: urn-mace-swami.se-swamid-test-1.0-metadata.mxml
+	@saml-md-tool urn-mace-swami.se-swamid-test-1.0-metadata update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s urn-mace-swami.se-swamid-test-1.0-metadata-unsigned.xml && cp urn-mace-swami.se-swamid-test-1.0-metadata-unsigned.xml $(DEST)/urn-mace-swami.se-swamid-test-1.0-metadata.xml
+	@test -s urn-mace-swami.se-swamid-test-1.0-metadata.xml && cp urn-mace-swami.se-swamid-test-1.0-metadata.xml $(DEST)/urn-mace-swami.se-swamid-test-1.0-metadata-signed.xml
+	@rm -f urn-mace-swami.se-swamid-test-1.0-metadata.mxml
+
+swamid:
+	@saml-md-tool swamid-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s swamid-1.0.xml && cp swamid-1.0.xml $(DEST)
+	@test -s swamid-1.0-unsigned.xml && cp swamid-1.0-unsigned.xml $(DEST)
+
+nya:
+	@saml-md-tool nya-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s nya-1.0.xml && cp nya-1.0.xml $(DEST)
+	@test -s nya-1.0-unsigned.xml && cp nya-1.0-unsigned.xml $(DEST)
+
+nya-testing:
+	@saml-md-tool nya-1.0-testing update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s nya-1.0-testing.xml && cp nya-1.0-testing.xml $(DEST)
+
+swamid-testing:
+	@saml-md-tool swamid-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s swamid-testing-1.0.xml && cp swamid-testing-1.0.xml $(DEST)
+
+swamid-testing-idp:
+	@saml-md-tool swamid-testing-idp-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s swamid-testing-idp-1.0.xml && cp swamid-testing-idp-1.0.xml $(DEST)
+
+swamid-testing-sp:
+	@saml-md-tool swamid-testing-sp-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s swamid-testing-sp-1.0.xml && cp swamid-testing-sp-1.0.xml $(DEST)
+
+old-swamid-testing:
+	@saml-md-tool swamid-1.0-testing update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s swamid-1.0-testing.xml && cp swamid-1.0-testing.xml $(DEST)
+
+swamid-edugain-testing:
+	@saml-md-tool swamid-edugain-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s swamid-edugain-testing-1.0.xml && cp swamid-edugain-testing-1.0.xml $(DEST)
+
+swamid-kalmar:
+	@saml-md-tool swamid-kalmar-1.0 update --days=2 --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s swamid-kalmar-1.0.xml && cp swamid-kalmar-1.0.xml $(DEST)
+
+swamid-ki-sll:
+	@saml-md-tool swamid-ki-sll-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s swamid-ki-sll-1.0.xml && cp swamid-ki-sll-1.0.xml $(DEST)
+
+test:
+	@for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema  schema.xsd $$x; done
+
+clean:
+	@rm -f *.xml
diff --git a/swamid-1.0-testing.mxml b/swamid-1.0-testing.mxml
index 805d5757..7830c843 100644
--- a/swamid-1.0-testing.mxml
+++ b/swamid-1.0-testing.mxml
@@ -59,99 +59,4 @@
   <xi:include href="swamid-1.0/kurser.math.su.se.xml"/>
   <xi:include href="swamid-1.0/webwork.math.su.se.xml"/>
   <xi:include href="swamid-1.0/idp1.unit.liu.se.xml"/>
-  <xi:include href="swamid-1.0/ab11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/ab11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/ab11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="swamid-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-1.0.mxml b/swamid-testing-1.0.mxml
index 8dfc2582..2b9cdfc1 100644
--- a/swamid-testing-1.0.mxml
+++ b/swamid-testing-1.0.mxml
@@ -2,4 +2,5 @@
 <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.mxml"/>
   <xi:include href="swamid-testing-idp-1.0.mxml"/>
+  <xi:include href="swamid-testing-sp-1.0.mxml"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index b305a211..153dfd34 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -2,4 +2,51 @@
 <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/flax.nettst.chalmers.se.xml"/>
   <xi:include href="swamid-1.0/openidp.feide.no.xml"/>
+  <xi:include href="swamid-1.0/ab11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/ab11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/at11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/at11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/dwidp.testc.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/dwidp.testd.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/ft11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/ft11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/it11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/it11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nb11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nb11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/wb11.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/wb11.ladok.umu.se-shibboleth-idp.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
new file mode 100644
index 00000000..f86e9d7f
--- /dev/null
+++ b/swamid-testing-sp-1.0.mxml
@@ -0,0 +1,51 @@
+<?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/ab11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/ab11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/at11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/at11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/ft11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/ft11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/it11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/it11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nb11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nb11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-00.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-01.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-02.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-03.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-04.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-05.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-06.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-07.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-08.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-09.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-10.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-12.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-13.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-14.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-15.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/wb11.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/wb11.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml"/>
+</EntitiesDescriptor>