1 files changed, 40 insertions, 45 deletions
diff --git a/swamid-2.0/se.timeedit.net-umu-student-sp.xml b/swamid-2.0/se.timeedit.net-umu-student-sp.xml
index 6859857b..a625e6fa 100644
--- a/swamid-2.0/se.timeedit.net-umu-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-umu-student-sp.xml
@@ -1,82 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://se.timeedit.net/umu-student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-08-22T15:36:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-08-22T15:36:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="false">
+  <md:SPSSODescriptor AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="false">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">TimeEdit för studenter vid Umeå universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">TimeEdit for students at Umeå University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">TimeEdit, utvecklat av Evolvera AB</mdui:Description>
-        <mdui:Description xml:lang="en">TimeEdit, developed by Evolvera AB</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://administrationsverktyg.umu.se/Privacy/Information?system=https://se.timeedit.net/umu-employee-sp&amp;lang=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://administrationsverktyg.umu.se/Privacy/Information?system=https://se.timeedit.net/umu-employee-sp&amp;lang=sv</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.umu.se/en/about-the-website/legal-information/processing-of-personal-data/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.umu.se/om-webbplatsen/juridisk-information/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="sv">TimeEdit, utvecklat av TimeEdit AB</mdui:Description>
+        <mdui:Description xml:lang="en">TimeEdit, developed by TimeEdit AB</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.timeedit.com/info-url-se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.timeedit.com/info-url</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.timeedit.com/privacy-statement-se</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.timeedit.com/privacy-statement</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDcDCCAlgCCQDVKUGzGrt/2jANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJT
-RTEYMBYGA1UECAwPVmFzdHJhIGdvdGFsYW5kMRMwEQYDVQQHDApHb3RoZW5idXJn
-MRQwEgYDVQQKDAtUaW1lRWRpdCBBQjELMAkGA1UECwwCSVQxGTAXBgNVBAMMEGF1
-dGgudGltZWVkaXQuc2UwHhcNMTUwNjE1MTAwMjEzWhcNMjUwNjEyMTAwMjEzWjB6
-MQswCQYDVQQGEwJTRTEYMBYGA1UECAwPVmFzdHJhIGdvdGFsYW5kMRMwEQYDVQQH
-DApHb3RoZW5idXJnMRQwEgYDVQQKDAtUaW1lRWRpdCBBQjELMAkGA1UECwwCSVQx
-GTAXBgNVBAMMEGF1dGgudGltZWVkaXQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCgv6XIGV5MzRQbAY8tc9x8Eyuiac+o/z6qUT6s6zSYRu83Jd0R
-ZPRnk/9egxV8RElBDq/kMAkXhzejUGI+yFkvxyPpB0u4lct9U0a7mbOr+UqkH+ff
-xjhxZjEjI20FxX29woMhFRtA//bucQ8yxuzYhoJd/pXeXfJCpvKZlPJ3ycF9lkUb
-3nMMoFNIPlRDddb4tu+MpJljioOPIWR45+PyRXKW1ZMdEy8pMoYt42sbIIWJoxj+
-9/IDbaA7LPg7Zxj+ioWzz7zYA6zdKLj54aQUCrcJ0RZIThzr2gOvMRaT5sqDHDmr
-KFZD/Xd6HwCJkwN6qFPurfZG2GoSnwZ/A8zVAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBADv6hhEsCrpbERGv6rFlEvHmYtYrjgJBLF3a91PIvVGPENI6HwJhsges/5id
-ijAIcJyeItd0+UAfeTCMriyNnrqfOdOMaHMC+OXcS1+SV+ZLY6SlAWUzbNlwCTyj
-ETfteMEX70fcKIT+Suv+4nA1ZS9og3y728pny0W+yhYxgjs7mSfG2XZIjzV53qGq
-CscLu8ASWmlSsqtiUfGueWAfGWHEVDDIr95IMy/uTG/lyQTEzr6BTeWusqhm6UXK
-HguQTvdcpUfH+n4L34gCi0CwMcSfyeRecYdLYPbWKAksD570x5RdYFMsQoFZQd+f
-5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
+          <ds:X509Certificate>MIIDcDCCAlgCCQDVKUGzGrt/2jANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJTRTEYMBYGA1UE
+CAwPVmFzdHJhIGdvdGFsYW5kMRMwEQYDVQQHDApHb3RoZW5idXJnMRQwEgYDVQQKDAtUaW1lRWRp
+dCBBQjELMAkGA1UECwwCSVQxGTAXBgNVBAMMEGF1dGgudGltZWVkaXQuc2UwHhcNMTUwNjE1MTAw
+MjEzWhcNMjUwNjEyMTAwMjEzWjB6MQswCQYDVQQGEwJTRTEYMBYGA1UECAwPVmFzdHJhIGdvdGFs
+YW5kMRMwEQYDVQQHDApHb3RoZW5idXJnMRQwEgYDVQQKDAtUaW1lRWRpdCBBQjELMAkGA1UECwwC
+SVQxGTAXBgNVBAMMEGF1dGgudGltZWVkaXQuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCgv6XIGV5MzRQbAY8tc9x8Eyuiac+o/z6qUT6s6zSYRu83Jd0RZPRnk/9egxV8RElBDq/k
+MAkXhzejUGI+yFkvxyPpB0u4lct9U0a7mbOr+UqkH+ffxjhxZjEjI20FxX29woMhFRtA//bucQ8y
+xuzYhoJd/pXeXfJCpvKZlPJ3ycF9lkUb3nMMoFNIPlRDddb4tu+MpJljioOPIWR45+PyRXKW1ZMd
+Ey8pMoYt42sbIIWJoxj+9/IDbaA7LPg7Zxj+ioWzz7zYA6zdKLj54aQUCrcJ0RZIThzr2gOvMRaT
+5sqDHDmrKFZD/Xd6HwCJkwN6qFPurfZG2GoSnwZ/A8zVAgMBAAEwDQYJKoZIhvcNAQELBQADggEB
+ADv6hhEsCrpbERGv6rFlEvHmYtYrjgJBLF3a91PIvVGPENI6HwJhsges/5idijAIcJyeItd0+UAf
+eTCMriyNnrqfOdOMaHMC+OXcS1+SV+ZLY6SlAWUzbNlwCTyjETfteMEX70fcKIT+Suv+4nA1ZS9o
+g3y728pny0W+yhYxgjs7mSfG2XZIjzV53qGqCscLu8ASWmlSsqtiUfGueWAfGWHEVDDIr95IMy/u
+TG/lyQTEzr6BTeWusqhm6UXKHguQTvdcpUfH+n4L34gCi0CwMcSfyeRecYdLYPbWKAksD570x5Rd
+YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Location="https://cloud.timeedit.net/umu/web/timeedit/ssoLogout/umu_stud_saml2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cloud.timeedit.net/umu/web/timeedit/ssoLogout/umu_stud_saml2"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService index="0" isDefault="false" Location="https://cloud.timeedit.net/umu/web/timeedit/ssoResponse/umu_stud_saml2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" isDefault="false" index="0" Location="https://cloud.timeedit.net/umu/web/timeedit/ssoResponse/umu_stud_saml2"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">TimeEdit AB</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">TimeEdit AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">TimeEdit AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">TimeEdit AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">TimeEdit AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.timeedit.com</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.timeedit.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.timeedit.com/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.timeedit.com/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@timeedit.com</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:Company>Umea University</md:Company>
-    <md:SurName>ITS datordrift</md:SurName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+    <md:GivenName>TimeEdit</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@timeedit.com</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
-    <md:Company>Umea University</md:Company>
-    <md:SurName>ITS datordrift</md:SurName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
+    <md:GivenName>TimeEdit</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@timeedit.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>