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/accountcheckout.lnu.se.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'swamid-1.0/accountcheckout.lnu.se.xml')

diff --git a/swamid-1.0/accountcheckout.lnu.se.xml b/swamid-1.0/accountcheckout.lnu.se.xml
index 80fb7751..3c3196d0 100644
--- a/swamid-1.0/accountcheckout.lnu.se.xml
+++ b/swamid-1.0/accountcheckout.lnu.se.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://accountcheckout.lnu.se">
+  <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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>
-      <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/hei-service</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-        </samla:Attribute>
-      </mdattr:EntityAttributes>
-    </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>accountcheckout.lnu.se</ds:KeyName>
-- 
cgit v1.2.3