summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2010-12-06 23:11:55 +0100
committerLeif Johansson <leifj@sunet.se>2010-12-06 23:11:55 +0100
commitad60a3dc76558332555f8b0ee77f4c5f7249d395 (patch)
treea1335e2559f1423c42f4d41b1e187466ffc9aff7
parent9219b9ed8edc9cbac701f2524ced79ce27f19a58 (diff)
new testing metadata structure
-rw-r--r--swamid-testing-1.0.mxml8
-rw-r--r--swamid-testing-idp-1.0.mxml3
-rw-r--r--swamid-testing-sp-1.0.mxml2
3 files changed, 7 insertions, 6 deletions
diff --git a/swamid-testing-1.0.mxml b/swamid-testing-1.0.mxml
index 2b9cdfc1..7c57cabe 100644
--- a/swamid-testing-1.0.mxml
+++ b/swamid-testing-1.0.mxml
@@ -1,6 +1,6 @@
<?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.mxml"/>
- <xi:include href="swamid-testing-idp-1.0.mxml"/>
- <xi:include href="swamid-testing-sp-1.0.mxml"/>
+<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-testing-1.0.xml">
+ <xi:include href="swamid-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
+ <xi:include href="swamid-testing-idp-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
+ <xi:include href="swamid-testing-sp-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
</EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 153dfd34..e9cbde07 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -1,6 +1,7 @@
<?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">
+<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-testing-idp-1.0.xml">
<xi:include href="swamid-1.0/flax.nettst.chalmers.se.xml"/>
+ <xi:include href="swamid-1.0/coip-test.sunet.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"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index f86e9d7f..cde98033 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -1,5 +1,5 @@
<?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">
+<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-testing-sp-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"/>