badly located mdui data/entity categories

5 files changed, 51 insertions, 47 deletions

diff --git a/swamid-2.0/ecsidp.testb.antagning.se-ecs-idp.xml b/swamid-2.0/ecsidp.testb.antagning.se-ecs-idp.xml
index 9e93cbf0..575568a8 100644
--- a/swamid-2.0/ecsidp.testb.antagning.se-ecs-idp.xml
+++ b/swamid-2.0/ecsidp.testb.antagning.se-ecs-idp.xml
@@ -3,6 +3,20 @@
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">ecsidp.testb.antagning.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">
+			Universitets- och högskolerådet
+		</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">
+			Swedish Council for Higher Education
+		</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">
+			Identity Provider för expertklient-användare av NyA-systemet(Test B).
+		</mdui:Description>
+        <mdui:Description xml:lang="en">
+			The Identity Provider for expert client users of the NyA-system(Test B).
+		</mdui:Description>
+      </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
@@ -25,20 +39,6 @@ MIIByDCCAXKgAwIBAgIJAMptPNMb9t58MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWVjc2lkcC50
   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">ecsidp.testb.antagning.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">
-			Universitets- och högskolerådet
-		</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">
-			Swedish Council for Higher Education
-		</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">
-			Identity Provider för expertklient-användare av NyA-systemet(Test B).
-		</mdui:Description>
-        <mdui:Description xml:lang="en">
-			The Identity Provider for expert client users of the NyA-system(Test B).
-		</mdui:Description>
-      </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
diff --git a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 5a56679a..091c33e8 100644
--- a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
   <md:Extensions>
-    <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-      <mdui:DisplayName xml:lang="sv"> 
+    <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:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv"> 
    Medlemsportalen 
     </mdui:DisplayName>
-      <mdui:DisplayName xml:lang="en"> 
+        <mdui:DisplayName xml:lang="en"> 
       Member Portal 
        </mdui:DisplayName>
-      <mdui:Description xml:lang="sv"> 
+        <mdui:Description xml:lang="sv"> 
 	 Medlemsportalen för Medicinska Föreningen i Stockholm 
 	  </mdui:Description>
-      <mdui:Description xml:lang="en"> 
+        <mdui:Description xml:lang="en"> 
 	    Member Portal for Medical Students' Association in Stockholm 
 	     </mdui:Description>
-    </mdui:UIInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.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:Attribute>
-      </mdattr:EntityAttributes>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
index 2d8d93af..7d93e856 100644
--- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
+++ b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://se.timeedit.net/lnu-employee-sp">
+  <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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="false">
     <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/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        </samla:Attribute>
-      </mdattr:EntityAttributes>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">TimeEdit för anställda vid Linnéuniversitetet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">TimeEdit for employees at Linaeus University</mdui:DisplayName>
diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
index b7b6c23c..e89ef6ed 100644
--- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
+++ b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://se.timeedit.net/lnu-student-sp">
+  <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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="false">
     <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/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        </samla:Attribute>
-      </mdattr:EntityAttributes>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">TimeEdit för studenter vid Linnéuniversitetet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">TimeEdit for students at Linaeus University</mdui:DisplayName>
diff --git a/swamid-2.0/sigma-test-localhost-sp-130705.xml b/swamid-2.0/sigma-test-localhost-sp-130705.xml
index 43f49279..6acd8494 100644
--- a/swamid-2.0/sigma-test-localhost-sp-130705.xml
+++ b/swamid-2.0/sigma-test-localhost-sp-130705.xml
@@ -21,17 +21,17 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-      <mdui:DisplayName xml:lang="sv">Sigma test-SP localhost</mdui:DisplayName>
-      <mdui:DisplayName xml:lang="en">Sigma test-SP localhost</mdui:DisplayName>
-      <mdui:Description xml:lang="sv">Sigma test-SP localhost</mdui:Description>
-      <mdui:Description xml:lang="en">Sigma test-SP localhost</mdui:Description>
-    </mdui:UIInfo>
   </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="http://localhost/Shibboleth.sso/Login"/>
       <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="http://localhost/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Sigma test-SP localhost</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Sigma test-SP localhost</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Sigma test-SP localhost</mdui:Description>
+        <mdui:Description xml:lang="en">Sigma test-SP localhost</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">