resolves SWAMIDOPS-6249

6 files changed, 150 insertions, 150 deletions

diff --git a/swamid-1.0/connect8.sunet.se.xml b/swamid-1.0/connect8.sunet.se.xml
index e34c9e7e..6e1e9882 100644
--- a/swamid-1.0/connect8.sunet.se.xml
+++ b/swamid-1.0/connect8.sunet.se.xml
@@ -3,6 +3,11 @@
 
   <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>
+      <EntityAttributes xmlns="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
+         <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:mace:swami.se:SAML:attribute-profile">
+            <saml:AttributeValue>collaboration</saml:AttributeValue>
+         </saml:Attribute>
+      </EntityAttributes>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect8.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect8.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect8.sunet.se/Shibboleth.sso/DS/kalmar2" index="3"/>
diff --git a/swamid-1.0/expert.antagning.se.xml b/swamid-1.0/expert.antagning.se.xml
index d08a9252..227109c7 100644
--- a/swamid-1.0/expert.antagning.se.xml
+++ b/swamid-1.0/expert.antagning.se.xml
@@ -1,6 +1,4 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_1a9088c6417c5a7aee6f3edc63c95e75" entityID="https://expert.antagning.se/ecs-sp">
-
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.antagning.se/ecs-sp">
   <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:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -73,4 +71,4 @@ hMvkdB9ux/vPq93rCzcdDnW+zoZmsj1EXtqjDSSEgb/6zJ+ExbZ29Q==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 
-</md:EntityDescriptor>
\ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/its-pd0001.ad.umu.se.xml b/swamid-1.0/its-pd0001.ad.umu.se.xml
new file mode 100644
index 00000000..dfcf2a2f
--- /dev/null
+++ b/swamid-1.0/its-pd0001.ad.umu.se.xml
@@ -0,0 +1,57 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ITS-PD0001.ad.umu.se/shibboleth">
+  <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="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://ITS-PD0001.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/SU"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/KI"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>its-pd0001.ad.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@adm.umu.se,CN=its-pd0001.ad.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAODAFUWnpMJcMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYD
+VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
+CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEdMBsGA1UEAwwUaXRzLXBkMDAwMS5h
+ZC51bXUuc2UxJzAlBgkqhkiG9w0BCQEWGHRvbW15LmxhcnNzb25AYWRtLnVtdS5z
+ZTAeFw0xMTA1MTkwNTM1MzhaFw0xNDA0MDEwNTM1MzhaMIGXMQswCQYDVQQGEwJT
+RTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQwwCgYDVQQK
+DANJVFMxDDAKBgNVBAsMA0lUUzEdMBsGA1UEAwwUaXRzLXBkMDAwMS5hZC51bXUu
+c2UxJzAlBgkqhkiG9w0BCQEWGHRvbW15LmxhcnNzb25AYWRtLnVtdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYWYajF/EyJpqcdlhitNq358A4W
+iq6/wvKwfaoKSAZXFbM/mez01bOBa0woZf/xeGVbjjBPCOui8pqL90O5ThFcAAnM
+k1inJMGNYuzKoRSLlYpQ4zNBY4hm8fq3cT71AzaO6V6IiCeUfdV8dYmBONiiqHTc
+dvFc6NSebRbkpnGZlfq/HUhltQccLTjhvGf6vFA6HpKSbPfM5Q7/KIh0486zgJb7
+JJt/J2J616Mb9t/qStcXkGUnDup6oIrTfxBUGTt7trjh4RIyJvSWqJbNb/Vlr88l
++P8vdc49WTVSF3wWFHymJLqg+zl33foHjdaOBoqATxbHX8YfrQzqgLfI2SUCAwEA
+AaNQME4wHQYDVR0OBBYEFCiF/Tc1nNgp4QPU8LKYLT0lYbfCMB8GA1UdIwQYMBaA
+FCiF/Tc1nNgp4QPU8LKYLT0lYbfCMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+BQADggEBAHr0cb7fhCxXshy/ELi5rWVViwg9T5mdQbhNIyKmkgb7vJXXfx8kexPb
+y+DU2BR2JgGUdjrJkbU4zNPUFNF08NiC3g3GPFqFKKTxJ0mH9rJHRekhzmZriMLN
+9PtSqDuwYmnATLT15TGV57aBUypcu/SutdJAWGnK0toSsTXYy+zKDiBhOyqiVsqs
+2nRkodiGJA16Ig+q2WykUYEGRvxNjzgfKWvCsoSaaNCoZ+UAnnKv9DysN6FSg78h
+R5wJLs1ZiquE/l6Iq4DutimBvoNc6TNnTwGYWJIo4LTrJGLTxa/ZQl0uEYPS/SWP
+qo9cBPEaTnL1Lr1ecg2/SlL0KYppyWk=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ITS-PD0001.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/toylan3.umdc.umu.se.xml b/swamid-1.0/toylan3.umdc.umu.se.xml
deleted file mode 100644
index 45c7a149..00000000
--- a/swamid-1.0/toylan3.umdc.umu.se.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://toylan3.umdc.umu.se/shibboleth">
-
-  <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>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>toylan3.umdc.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=toylan3.umdc.umu.se,OU=TestShib Service Provider,O=TestShib</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDmTCCAoGgAwIBAgIBATANBgkqhkiG9w0BAQQFADA3MREwDwYDVQQKEwhUZXN0
-U2hpYjEiMCAGA1UEAxMZVGVzdFNoaWIgU2VydmljZSBQcm92aWRlcjAeFw0wNzAz
-MDgxNTM3MjZaFw0wOTAzMDgxNDM3MjZaMFUxETAPBgNVBAoTCFRlc3RTaGliMSIw
-IAYDVQQLExlUZXN0U2hpYiBTZXJ2aWNlIFByb3ZpZGVyMRwwGgYDVQQDExN0b3ls
-YW4zLnVtZGMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-xfM9MoLpJxjRj5uRYnNGLZA8fme2UjKKvmONqPC1l+N1HStnlvwh/kfT4GQUK6JE
-2CgCqLlUJFBO1B3G5CRPI1A+P4ZKfM6P8JxQxhi7cy/2EwkPVyWwYhdkblLpUHG9
-fAQ1Db2Ly3DHvEeRhwJvTFWbszK1qQYkLEBOfeH96oQh/sR8PeIWl29VrGv8iBl9
-eYEMV+N9EXpv+RA/4OoHw5gKvxEaisXudvjPcqTfzi+05jUqtIWvTkhqLyLEFqGq
-wozbY6/xqKHOAMEGjL0Xiz4TnXBEtBLCIFAJUKhh5nNzD0IQdyfsIVt+dvGQ5dWu
-lG/7lQEEfOp2eHnM1/BGbwIDAQABo4GRMIGOMB0GA1UdDgQWBBRkimJZ51LPqunO
-KtZDS5D1+ZGarDBfBgNVHSMEWDBWgBRkimJZ51LPqunOKtZDS5D1+ZGarKE7pDkw
-NzERMA8GA1UEChMIVGVzdFNoaWIxIjAgBgNVBAMTGVRlc3RTaGliIFNlcnZpY2Ug
-UHJvdmlkZXKCAQEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOCAQEAWtfB
-vtBEnBv55fG1204OmkimhP8p9M77Us6a3hwkXYLd1vKh+tA6XfPeKdHOZtLQoaUq
-a9j5xl6sbvGDhOrH4YOJCMheDICEolBRku0MyI5PJRMTlIE4Wu3B/v9p+J3jMeFg
-X0ZSH01EqeVuwtI1SiaLditmVYm//T19Q5ByArp0ccT+L6ly+p0BMnkDILJusTW8
-kRYTrk63kC8SepIQUNdQo7af1t5jtBn6o0+xx23QlQ13tx5WBbdT4AHaKZ/4NXEw
-vVCmr+myQKY0FH13453cRRwLleAQPHOkGO81eAo/9DPv6Udbjx4QBMYlObRQRzML
-z3kjuGkhemYpVSu78A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>toylan3.umdc.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=toylan3.umdc.umu.se,OU=TestShib Service Provider,O=TestShib</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDmTCCAoGgAwIBAgIBATANBgkqhkiG9w0BAQQFADA3MREwDwYDVQQKEwhUZXN0
-U2hpYjEiMCAGA1UEAxMZVGVzdFNoaWIgU2VydmljZSBQcm92aWRlcjAeFw0wNzAz
-MDgxNTM3MjZaFw0wOTAzMDgxNDM3MjZaMFUxETAPBgNVBAoTCFRlc3RTaGliMSIw
-IAYDVQQLExlUZXN0U2hpYiBTZXJ2aWNlIFByb3ZpZGVyMRwwGgYDVQQDExN0b3ls
-YW4zLnVtZGMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-xfM9MoLpJxjRj5uRYnNGLZA8fme2UjKKvmONqPC1l+N1HStnlvwh/kfT4GQUK6JE
-2CgCqLlUJFBO1B3G5CRPI1A+P4ZKfM6P8JxQxhi7cy/2EwkPVyWwYhdkblLpUHG9
-fAQ1Db2Ly3DHvEeRhwJvTFWbszK1qQYkLEBOfeH96oQh/sR8PeIWl29VrGv8iBl9
-eYEMV+N9EXpv+RA/4OoHw5gKvxEaisXudvjPcqTfzi+05jUqtIWvTkhqLyLEFqGq
-wozbY6/xqKHOAMEGjL0Xiz4TnXBEtBLCIFAJUKhh5nNzD0IQdyfsIVt+dvGQ5dWu
-lG/7lQEEfOp2eHnM1/BGbwIDAQABo4GRMIGOMB0GA1UdDgQWBBRkimJZ51LPqunO
-KtZDS5D1+ZGarDBfBgNVHSMEWDBWgBRkimJZ51LPqunOKtZDS5D1+ZGarKE7pDkw
-NzERMA8GA1UEChMIVGVzdFNoaWIxIjAgBgNVBAMTGVRlc3RTaGliIFNlcnZpY2Ug
-UHJvdmlkZXKCAQEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOCAQEAWtfB
-vtBEnBv55fG1204OmkimhP8p9M77Us6a3hwkXYLd1vKh+tA6XfPeKdHOZtLQoaUq
-a9j5xl6sbvGDhOrH4YOJCMheDICEolBRku0MyI5PJRMTlIE4Wu3B/v9p+J3jMeFg
-X0ZSH01EqeVuwtI1SiaLditmVYm//T19Q5ByArp0ccT+L6ly+p0BMnkDILJusTW8
-kRYTrk63kC8SepIQUNdQo7af1t5jtBn6o0+xx23QlQ13tx5WBbdT4AHaKZ/4NXEw
-vVCmr+myQKY0FH13453cRRwLleAQPHOkGO81eAo/9DPv6Udbjx4QBMYlObRQRzML
-z3kjuGkhemYpVSu78A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
diff --git a/swamid-1.0/www.servicedesk.its.umu.se.xml b/swamid-1.0/www.servicedesk.its.umu.se.xml
new file mode 100644
index 00000000..dfe4b47a
--- /dev/null
+++ b/swamid-1.0/www.servicedesk.its.umu.se.xml
@@ -0,0 +1,86 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.servicedesk.its.umu.se/shibboleth">
+
+  <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>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.servicedesk.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@adm.umu.se,CN=www.servicedesk.its.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDzCCAvegAwIBAgIJAK1n6INIIuwWMA0GCSqGSIb3DQEBBQUAMIGdMQswCQYD
+VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
+CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEjMCEGA1UEAwwad3d3LnNlcnZpY2Vk
+ZXNrLml0cy51bXUuc2UxJzAlBgkqhkiG9w0BCQEWGHRvbW15LmxhcnNzb25AYWRt
+LnVtdS5zZTAeFw0xMTA1MTYwNjM4NTBaFw0xNDAzMjkwNjM4NTBaMIGdMQswCQYD
+VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
+CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEjMCEGA1UEAwwad3d3LnNlcnZpY2Vk
+ZXNrLml0cy51bXUuc2UxJzAlBgkqhkiG9w0BCQEWGHRvbW15LmxhcnNzb25AYWRt
+LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJEvTU6sPUf
++QdTlHhSzEHHBraAqXnmBAtCH4PrpYZt5UBMnrDCfWMWI6rDQ0m5t/foWGMG/Eat
+EycsYbySEyDgiK7AK9ahC0Bpd6CyT1gYGOfBIdMDNOgCahr2GnnvNp78/sUaC7pU
+qDXOdMsB4iPiLtEYCa6XTJi/KVB487utrIMud4UpGojtXORSFHpPC45QHgZicj8R
+0jIL7VPCTgJBKWwqeMoOUtDl5iFgMXTkafXVKR+rrh8UFS4LmNNid0PbxofI/azG
+vc7CF0E59O184V6UnLHJwcLqaJkVzIdq1z5dUKxskPnm6xX1xZNC+DVW7ALEEfD8
+MZeVe3PJn9cCAwEAAaNQME4wHQYDVR0OBBYEFO3UOhgEKHKE36Id4OB/zbb73ZmK
+MB8GA1UdIwQYMBaAFO3UOhgEKHKE36Id4OB/zbb73ZmKMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBABQZkJyN0sgb+pGxw+sSeYSLhZxdLOySKZSr7LV4
+GinxtO41dwXNmGFPavO4sYExqo2FWUo2RItwUorOHCtlpypfWf+xBThD2uRR44+a
+tb0wNbW7y/hGwCCe1as2lewrvPOzWVG51I4Xxw5hiNpz+7ayNRX+icYgONP1ZSN+
+jrymeKjpHE9w443OiAkezSm2tXADbEugC+DhowF9PXnX2Gn8BfXrD1LPP1ze200S
+4tHrNMcpgz8mndg+eAvBnGxe/OdC+DuDO/33E559DYGi7Iw5GzGbCPLCuUsWvstm
+Ak0+kMSVOzv6UoGDUEbEh2o5K1iQnOzUKyTJrfW1if1I8Wg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.servicedesk.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@adm.umu.se,CN=www.servicedesk.its.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDzCCAvegAwIBAgIJAK1n6INIIuwWMA0GCSqGSIb3DQEBBQUAMIGdMQswCQYD
+VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
+CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEjMCEGA1UEAwwad3d3LnNlcnZpY2Vk
+ZXNrLml0cy51bXUuc2UxJzAlBgkqhkiG9w0BCQEWGHRvbW15LmxhcnNzb25AYWRt
+LnVtdS5zZTAeFw0xMTA1MTYwNjM4NTBaFw0xNDAzMjkwNjM4NTBaMIGdMQswCQYD
+VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
+CgYDVQQKDANJVFMxDDAKBgNVBAsMA0lUUzEjMCEGA1UEAwwad3d3LnNlcnZpY2Vk
+ZXNrLml0cy51bXUuc2UxJzAlBgkqhkiG9w0BCQEWGHRvbW15LmxhcnNzb25AYWRt
+LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJEvTU6sPUf
++QdTlHhSzEHHBraAqXnmBAtCH4PrpYZt5UBMnrDCfWMWI6rDQ0m5t/foWGMG/Eat
+EycsYbySEyDgiK7AK9ahC0Bpd6CyT1gYGOfBIdMDNOgCahr2GnnvNp78/sUaC7pU
+qDXOdMsB4iPiLtEYCa6XTJi/KVB487utrIMud4UpGojtXORSFHpPC45QHgZicj8R
+0jIL7VPCTgJBKWwqeMoOUtDl5iFgMXTkafXVKR+rrh8UFS4LmNNid0PbxofI/azG
+vc7CF0E59O184V6UnLHJwcLqaJkVzIdq1z5dUKxskPnm6xX1xZNC+DVW7ALEEfD8
+MZeVe3PJn9cCAwEAAaNQME4wHQYDVR0OBBYEFO3UOhgEKHKE36Id4OB/zbb73ZmK
+MB8GA1UdIwQYMBaAFO3UOhgEKHKE36Id4OB/zbb73ZmKMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBABQZkJyN0sgb+pGxw+sSeYSLhZxdLOySKZSr7LV4
+GinxtO41dwXNmGFPavO4sYExqo2FWUo2RItwUorOHCtlpypfWf+xBThD2uRR44+a
+tb0wNbW7y/hGwCCe1as2lewrvPOzWVG51I4Xxw5hiNpz+7ayNRX+icYgONP1ZSN+
+jrymeKjpHE9w443OiAkezSm2tXADbEugC+DhowF9PXnX2Gn8BfXrD1LPP1ze200S
+4tHrNMcpgz8mndg+eAvBnGxe/OdC+DuDO/33E559DYGi7Iw5GzGbCPLCuUsWvstm
+Ak0+kMSVOzv6UoGDUEbEh2o5K1iQnOzUKyTJrfW1if1I8Wg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/www.wisum.its.umu.se.xml b/swamid-1.0/www.wisum.its.umu.se.xml
deleted file mode 100644
index ca4280da..00000000
--- a/swamid-1.0/www.wisum.its.umu.se.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_8a25437b10fa2640b457e2946d5bde7e69ab6bbf" entityID="https://www.wisum.its.umu.se/shibboleth">
-
-  <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="https://www.wisum.its.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <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.wisum.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SU"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.wisum.its.umu.se/Shibboleth.sso/KI"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.wisum.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mats.larsson@adm.umu.se,CN=www.wisum.its.umu.se,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEsDCCA5igAwIBAgIJAPSljFRXQ/2WMA0GCSqGSIb3DQEBBQUAMIGWMQswCQYD
-VQQGEwJTRTEVMBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMQww
-CgYDVQQKEwNJVFMxDDAKBgNVBAsTA0lUUzEdMBsGA1UEAxMUd3d3Lndpc3VtLml0
-cy51bXUuc2UxJjAkBgkqhkiG9w0BCQEWF21hdHMubGFyc3NvbkBhZG0udW11LnNl
-MB4XDTExMDMyOTA0NTYwN1oXDTE0MDIwOTA0NTYwN1owgZYxCzAJBgNVBAYTAlNF
-MRUwEwYDVQQIEwxWYXN0ZXJib3R0ZW4xDTALBgNVBAcTBFVtZWExDDAKBgNVBAoT
-A0lUUzEMMAoGA1UECxMDSVRTMR0wGwYDVQQDExR3d3cud2lzdW0uaXRzLnVtdS5z
-ZTEmMCQGCSqGSIb3DQEJARYXbWF0cy5sYXJzc29uQGFkbS51bXUuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMoMQ5OKrObHhxztzsddelykKBWYrH
-IrQOTUROELgi8UvMhupoePJsxLEGtursJ34cUCJQbb+5z0llFpUHJVshCKnU1YYd
-V+3qIZJLTVStq7R2XkTD7+0OqP0+KqRtqMzaPUlb5QCZlhkGAvuH1s+5/T9ASzvw
-5bTX8aJ9Vcb7cceCxaY7meqCVP/6dd1uQErGgRK8o/+8M2+IwkPv9IzfQKfPchxq
-nKKU1q70ES1C60T0PgZiv4U0PFQcUKihXZPKNmijyHCk4uM092HbuQi9/xiLDFrq
-cVjz2rUd0hmzDN4KGrIAmBhgI3qGwJ/dGnXDI5E/Nm5IGQy76GREiZdVAgMBAAGj
-gf4wgfswHQYDVR0OBBYEFArY6dz4n9LgrjqUv/Kj7qQeCGlWMIHLBgNVHSMEgcMw
-gcCAFArY6dz4n9LgrjqUv/Kj7qQeCGlWoYGcpIGZMIGWMQswCQYDVQQGEwJTRTEV
-MBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMQwwCgYDVQQKEwNJ
-VFMxDDAKBgNVBAsTA0lUUzEdMBsGA1UEAxMUd3d3Lndpc3VtLml0cy51bXUuc2Ux
-JjAkBgkqhkiG9w0BCQEWF21hdHMubGFyc3NvbkBhZG0udW11LnNlggkA9KWMVFdD
-/ZYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAo7v8NM28YrhtT0Nu
-KV/DloFrVfhytyLNvqqununPPcbyLECvGDnT3OyqhbBdleXonFqa9wzacDUmFcms
-FRh6wVGgDy/w1sxmswdqZtXl7tKTjYmPAAoHScTkgSUAoQTOM+wJfhp9QhcbiYJT
-OcDpjfKHDLFsBPpZe+UjlqC/cNWZzLC4/hd1DnVldzZGeaVZxYv2IXFsXk1Kn5YL
-9Ly23JSd+CZxMhwnDbq07Lxr427ynvNezKoQj1befUeWNqODzIgudrCJ9ePHjTI9
-+y00LlpUhPJThokksq20YglJ6cnbKm206AQIZotZTkWDfZqrBXMkpd/T83v/RFrb
-9XlNvw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wisum.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wisum.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.wisum.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wisum.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wisum.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.wisum.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
\ No newline at end of file