From dab9cf417a69881735615b16997368ef9b9ce21c Mon Sep 17 00:00:00 2001
From: Fredrik Aslund <fredrik.aslund@umu.se>
Date: Thu, 8 Jan 2015 10:17:18 +0100
Subject: bad commits fixed

---
 swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml  | 2 ++
 swamid-2.0/selfservice.hb.se-shibboleth.xml              | 8 --------
 swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml | 2 ++
 swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml  | 2 ++
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml
index a6f9ecdc..88bf3ec3 100644
--- a/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml
+++ b/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml
@@ -36,7 +36,9 @@ and do *NOT* provide it in real time to your partners.
       <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://dev.lararlyftet-validering.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Lärarlyftet Validering</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lärarlyftet Validation</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Valideringssystemet för Lärarlyftet</mdui:Description>
+        <mdui:Description xml:lang="en">This service is the validation system for Lärarlyftet</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/selfservice.hb.se-shibboleth.xml b/swamid-2.0/selfservice.hb.se-shibboleth.xml
index 2a782278..2607b8bf 100644
--- a/swamid-2.0/selfservice.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice.hb.se-shibboleth.xml
@@ -17,14 +17,6 @@
     <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"/>
-    <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://refeds.org/category/research-and-scholarship</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>
diff --git a/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
index 071246d6..98013824 100644
--- a/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
+++ b/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
@@ -35,7 +35,9 @@ and do *NOT* provide it in real time to your partners.
       <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://test.lararlyftet-validering.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Lärarlyftet Validering</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lärarlyftet Validation</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Valideringssystemet för Lärarlyftet</mdui:Description>
+        <mdui:Description xml:lang="en">This service is the validation system for Lärarlyftet</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
index cdc69279..6e13ef8f 100644
--- a/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
+++ b/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
@@ -36,7 +36,9 @@ and do *NOT* provide it in real time to your partners.
       <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://www.lararlyftet-validering.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Lärarlyftet Validering</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lärarlyftet Validation</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Valideringssystemet för Lärarlyftet</mdui:Description>
+        <mdui:Description xml:lang="en">This service is the validation system for Lärarlyftet</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
-- 
cgit v1.2.3