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/www3.genuinetext.com-shibboleth.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'swamid-1.0/www3.genuinetext.com-shibboleth.xml')

diff --git a/swamid-1.0/www3.genuinetext.com-shibboleth.xml b/swamid-1.0/www3.genuinetext.com-shibboleth.xml
index dbe8ea9f..d8f5e1fe 100644
--- a/swamid-1.0/www3.genuinetext.com-shibboleth.xml
+++ b/swamid-1.0/www3.genuinetext.com-shibboleth.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www3.genuinetext.com/shibboleth">
+  <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/eu-adequate-protection</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
   <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <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/eu-adequate-protection</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        </samla:Attribute>
-      </mdattr:EntityAttributes>
-    </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-- 
cgit v1.2.3