From dcb542ee16efeeca0b5b5b77e60117482e18889a Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Wed, 7 Aug 2013 10:34:46 +0200
Subject: entity categories should be located in EntityDescriptor/Extensiosn
 mdui should be located in EntityDescriptor/SPSSODescriptor/Extensiosn

---
 swamid-1.0/play.hig.se-shibboleth.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'swamid-1.0/play.hig.se-shibboleth.xml')

diff --git a/swamid-1.0/play.hig.se-shibboleth.xml b/swamid-1.0/play.hig.se-shibboleth.xml
index f612b91b..27ca7f8b 100644
--- a/swamid-1.0/play.hig.se-shibboleth.xml
+++ b/swamid-1.0/play.hig.se-shibboleth.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.hig.se/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://play.hig.se/Shibboleth.sso/DS/ds.sunet.se"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://play.hig.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        </samla:Attribute>
-      </mdattr:EntityAttributes>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-- 
cgit v1.2.3