1 files changed, 9 insertions, 7 deletions
diff --git a/swamid-1.0/adfs01.fhs.se.xml b/swamid-1.0/adfs01.fhs.se.xml
index 6b636442..f8cb8e82 100644
--- a/swamid-1.0/adfs01.fhs.se.xml
+++ b/swamid-1.0/adfs01.fhs.se.xml
@@ -1,4 +1,5 @@
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs01.fhs.se/adfs/services/trust">
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" ID="_0e2fd9e0-7e83-4b62-9479-18fb4ad93292" entityID="http://adfs01.fhs.se/adfs/services/trust">
   <Extensions>
     <shibmd:Scope regexp="false">fhs.se</shibmd:Scope>
   </Extensions>
@@ -6,24 +7,25 @@
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC3DCCAcSgAwIBAgIQTa58Ax8v6rVMQDDG2RT/8jANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTEzMDEyNTExMTYzNloXDTE0MDEyNTExMTYzNlowKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALKTZiDPXFEiefxhJzAhIUEqxhDmESvd/fzZDnfm3YHuIqDQRwy0chjIBULg2eBcbLhPpyaGzJPkwADbGmkDNMVG/QfZKGE6sthOOy7CHFbcw+Z9zv0bpuzoZMPofncx4L7QZqkgH0a9fMvPpoyJLJZ+xJhJH0f7dLT+eN1YklynfHPIcqO4H4P9OJj5qs9xLEHAPsK6fxcLhgSQrVQmXsCiwlU7Z8ODtTqKhP+Px22rNNswGJVKx53JTr4ilhSgwixCfsioZDkr1BXy8XYx0JbQTlXB0pOtTG8ryWq+xlmsQ34s1JKTX4ObJ22Rw25D64xORLQt7N2ihT7R8QnPevUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAo44KNhB4i6HEvI4fndgskDvZX07NR+d0cMLqxbTF0ypLJ7Bu9e/kmQUMXKsb4e/SfeFf6qwgWOINojTUuopZ62s1qJscxT1Hag4/iwp86Lgk8Z47GEmTpp666F1VzmGB3UIqsYYfIPS2AuSfrgma/quYfQzMyHC+hOiI9WYO8DduIj0ucp1qZcC1yrIoCFxIngmpW5YIfX+L3Qb5U+pBr2iKpfMJc19jMWz1ldEuuyVNIUE4n6yit9t5PBSwmvx+dtnIkz4eBvnXRdSlkW/M7efTQJpm07/W9eSkjfcN8Xw5caAtkb+EhmX+QavDiQ0quVftR+TpXRZM2MyOdaj9Hw==</X509Certificate>
+          <X509Certificate>MIIC3DCCAcSgAwIBAgIQYNkK/dJqwqZPH4XxymtDHjANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTEzMDIwMTE3MTQ1MFoXDTE0MDIwMTE3MTQ1MFowKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPDtM/dMEsLl/yQJ6RlX19ngHPmBDqwnW67qeDaitEi9Fw5+dIcU22zKJ6psSAVqBwj/HHVS7qCfPCAsHaY6XlLLqn6VReSo1qgDxsMOu0J41So04dV55FIQj1ExjzuYCE50XLC12m2jva+ijOabf8Up1snFgOze1CYmYiArJg283Rivl3CfGrMV1S7UuCBbjhnctI9t2OyvZknsvIgz/G5DZVEPIZS2phHKIyqFAA4zD3DaPTW1m9Rknq7MDw6wL1jnicTRSf5RaXPu7r5JBBgPfdgZw2SG/b+JJWL9FmDgE6otD6JQg6M4LPOI0uEg5Lk6RAfwBG3/hYwi/jEmGYcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA0MPoTO+0FDbpX0bXfx6nqL++gLgFEoMZk7QU5WRAIbB7ueoAql7vpadfamvx+Sy70+C4xmY3Ud52M6G2649TOgS5nXOMPB7lCpSS3yGJklRnuhdlRJCl+tfPn0+Q3fmGFNMAhgcy63PNat3Cg/ucDD+XhM4jLw2Yp7aGZy6ZFocQdD4oRPcph3wlmHmb5E4u3ONrG1Gr/SZjPugEi+fqWZdezcYM+PqFwvhqrmu1Y92l4T2u95UZEL0i/oJC0m/9xDMMTL3pWILwY0KDe3rlDjOhBuTKTUM5FYFjaQwBHtnB6n1zbFIdAFbASSJ9CFUXySboEVqEnSwLJn7ztgV+bg==</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
     <KeyDescriptor use="signing">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC1jCCAb6gAwIBAgIQGpau6ax7GqZH1kZlbNFd+jANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTEzMDEyNTExMTYzNloXDTE0MDEyNTExMTYzNlowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALN0JQIf7ryr5MQc3PU1GxT+cZ+y/PFVkt35y3Mt7o53HRPfPuPSUQBRbLdTgtJpdnbvVbqNuFz78afJWNhSIgCDvsLccwvZd/0NmDP2p9021aPuNmsg9X6HdiAT7R9edvsyf+vDULZmqS20vV1r3BTGbvAoTlxQ0YncWienYJR573OHUepqsK0WZbH2Qn5aATtGpABEThTiJJbhxVXUBb2vb4i7Clglnv59Q9/zw2jgjGNdANcw3HJuiP3b/Bp9sGsIdSs5Ji67nROy9cXdGSObcqVap+wUYxDCE2GvHKMcIqhv4lKQrmEtAzQ/3Nr8ZUzsr3FYjYR0f0PcDYoNB+0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEADH0bHypij+Aid1LEuW5TSSYuTiRDDCIdU4VKJ5KpTkCRW1JQzUW3P8Kiq18VpU+x1wFworEDP+cc1Xxuwki5DP/WgxgWNiRh4OoXiuwj7aYzpSw9BCoaoP9EBjqLeB+RLSdyHT/FScUjkiD+b2W+5IF6lAD/96WmsEd0pyA1XGKJqLzMLiTeyMAGsxeN7HfW7UgkqoyYai7VFRG7Xve8P9x/jNrUI732bnnl88o2aMMmpSxm6sKUe1s0hbHiaosxpoXIRkIt1Rwhf1swO2FfeuPxsxkn2Gs9Qf7GlNIEW5DHxUOEHLHKwsTu076rN48ZMmw8s6jIoTVD9nKhS1AoFg==</X509Certificate>
+          <X509Certificate>MIIC1jCCAb6gAwIBAgIQKhAv7tvnLoFM2et83uQ/XzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTEzMDIwMTE3MTQ1MFoXDTE0MDIwMTE3MTQ1MFowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKEoDVI2vLh+TIPAvDrrjoai+qVbI6lHzcH9Hkx7UzJrlKu3JKYl/YaXL3j+UrXviCKFnML2J7ufFTmw4YoTx25eoSWHK88YXNqPh42EoQd0Y9OeSh/TJzNI/EBakIR0T9RZtRsmzLluuWdWUONEaUNHVhOg9334gXRbN6teZiHGXaq+TelM38a3uKNsLQ63NWKRwc4vWLiT1LqflFVkGEb5gY553SSAygbQOqBfd1R2DCmdG6VoQsvqPSXYO5BpGll4TgllcAr2cOwojU3tvGjU+gZqxKKQ47Tm0J6Dyz+6VSvMqaIJP9weCY6WpPaRyMXKDT8CUNP+pl0vLWH6MLMCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAeTQ53HiJVFr6xFGXFoTNwOeT3Jv0uGQyGIgrebRC3/bf/mOnNcALyMI+WJz2MQC9HEtymf2hJ1qUGs+wpJbMwrCywjTzkQYKgKRTuayQaXc8YpDQF8f6WBlIeA6W1NgYem1Tmli5UVwqpcelYOMWFpsE6s4MrTHy5EvptWUoDtQtobu0zwmPibv1ObBfkLaIvdCbMuEHL7p+deVlTdRlnTe+77CqhMAT8jv4aNDD1IJONU0XpXdVrtmWOOiwijrmLuvR2JlRAyym505sQokdo/5Um8hrhu+dSRWy5RHvBQ+xDRRuZQvhtHtuYiZMtmfUpGjXpO/xC9mxxnFHZzZBog==</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs01.fhs.se/adfs/services/trust/artifactresolution" index="0"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs01.fhs.se/adfs/ls/"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs01.fhs.se/adfs/ls/"/>
     <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs01.fhs.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://adfs01.fhs.se/adfs/ls/"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs01.fhs.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs01.fhs.se/adfs/ls/"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
@@ -49,13 +51,13 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="sv-SE">F&#246;rsvarsh&#246;gskolan</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv-SE">F&#246;rsvarsh&#246;gskolan</OrganizationDisplayName>
+    <OrganizationName xml:lang="sv-SE">F&#xF6;rsvarsh&#xF6;gskolan</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv-SE">F&#xF6;rsvarsh&#xF6;gskolan</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv-SE">http://www.fhs.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Alex</GivenName>
-    <SurName>Sj&#246;blom</SurName>
+    <SurName>Sj&#xF6;blom</SurName>
     <EmailAddress>helpdesk@fhs.se</EmailAddress>
     <TelephoneNumber>+46(0)855342545</TelephoneNumber>
   </ContactPerson>