23 files changed, 20 insertions, 20 deletions
diff --git a/nya-1.0-testing.mxml b/nya-1.0-testing.mxml
index 624f0f5a..1806f030 100644
--- a/nya-1.0-testing.mxml
+++ b/nya-1.0-testing.mxml
@@ -130,24 +130,4 @@
   <xi:include href="nya-1.0/wb11.ladok.umu.se-aw-sp.xml"/>
   <xi:include href="nya-1.0/wb11.ladok.umu.se-dw-sp.xml"/>
   <xi:include href="nya-1.0/www.studera.testa.antagning.se.xml"/>
-  <xi:include href="nya-1.0/nya-16.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-16.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-16.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-17.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-17.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-17.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-18.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-18.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-18.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-19.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-19.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-19.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/nya-20.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="nya-1.0/nya-20.ladok.umu.se-dw-idp.xml"/>
-  <xi:include href="nya-1.0/nya-20.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="nya-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml"/>
 </EntitiesDescriptor>
diff --git a/nya-1.0/nya-16.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml
index 8b1c1603..8b1c1603 100644
--- a/nya-1.0/nya-16.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml
diff --git a/nya-1.0/nya-16.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml
index 53ad2c29..53ad2c29 100644
--- a/nya-1.0/nya-16.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml
diff --git a/nya-1.0/nya-16.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml
index a856fb2d..a856fb2d 100644
--- a/nya-1.0/nya-16.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml
diff --git a/nya-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
index f3eddfa2..f3eddfa2 100644
--- a/nya-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml
diff --git a/nya-1.0/nya-17.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-17.ladok.umu.se-aws-sp.xml
index 5f89c864..5f89c864 100644
--- a/nya-1.0/nya-17.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-aws-sp.xml
diff --git a/nya-1.0/nya-17.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml
index 9bb4bfbf..9bb4bfbf 100644
--- a/nya-1.0/nya-17.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml
diff --git a/nya-1.0/nya-17.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-17.ladok.umu.se-ecs-sp.xml
index c5f5050d..c5f5050d 100644
--- a/nya-1.0/nya-17.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-ecs-sp.xml
diff --git a/nya-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
index 0f5048c6..0f5048c6 100644
--- a/nya-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml
diff --git a/nya-1.0/nya-18.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-18.ladok.umu.se-aws-sp.xml
index cbee8e5e..cbee8e5e 100644
--- a/nya-1.0/nya-18.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-aws-sp.xml
diff --git a/nya-1.0/nya-18.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml
index 8b208b8d..8b208b8d 100644
--- a/nya-1.0/nya-18.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml
diff --git a/nya-1.0/nya-18.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-18.ladok.umu.se-ecs-sp.xml
index cffd282a..cffd282a 100644
--- a/nya-1.0/nya-18.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-ecs-sp.xml
diff --git a/nya-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
index a9bd04f5..a9bd04f5 100644
--- a/nya-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml
diff --git a/nya-1.0/nya-19.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-19.ladok.umu.se-aws-sp.xml
index e430cd78..e430cd78 100644
--- a/nya-1.0/nya-19.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-aws-sp.xml
diff --git a/nya-1.0/nya-19.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml
index 3ecc9af6..3ecc9af6 100644
--- a/nya-1.0/nya-19.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml
diff --git a/nya-1.0/nya-19.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml
index b19c9a1f..b19c9a1f 100644
--- a/nya-1.0/nya-19.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml
diff --git a/nya-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
index 7360a057..7360a057 100644
--- a/nya-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml
diff --git a/nya-1.0/nya-20.ladok.umu.se-aws-sp.xml b/swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml
index 712d56e6..712d56e6 100644
--- a/nya-1.0/nya-20.ladok.umu.se-aws-sp.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml
diff --git a/nya-1.0/nya-20.ladok.umu.se-dw-idp.xml b/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml
index 41eba6c3..41eba6c3 100644
--- a/nya-1.0/nya-20.ladok.umu.se-dw-idp.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml
diff --git a/nya-1.0/nya-20.ladok.umu.se-ecs-sp.xml b/swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml
index aa17b280..aa17b280 100644
--- a/nya-1.0/nya-20.ladok.umu.se-ecs-sp.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml
diff --git a/nya-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
index 1306ce15..1306ce15 100644
--- a/nya-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 28fd3742..56b3b4a1 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -58,4 +58,14 @@
   <xi:include href="swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml"/>
   <xi:include href="swamid-1.0/idptest.test.it.gu.se.xml"/>
   <xi:include href="swamid-1.0/login-dev.du.se.xml"/>
+  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-dw-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-dw-idp.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 8f6ee413..ac4ecc5c 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -51,4 +51,14 @@
   <xi:include href="swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/hubbletest.ladok.umu.se.xml"/>
   <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-16.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-17.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-18.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-19.ladok.umu.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-aws-sp.xml"/>
+  <xi:include href="swamid-1.0/nya-20.ladok.umu.se-ecs-sp.xml"/>
 </EntitiesDescriptor>