entity-categories test sp:s added

SWAMIDOPS-6898

9 files changed, 695 insertions, 0 deletions

diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-coc-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-coc-sp.xml
new file mode 100644
index 00000000..d331db0b
--- /dev/null
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-coc-sp.xml
@@ -0,0 +1,77 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"

+                      xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"

+                      xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion"

+                      xmlns:ns4="http://www.w3.org/2000/09/xmldsig#"

+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+                      xmlns:xs="http://www.w3.org/2001/XMLSchema"

+                      entityID="http://xenosmilus.umdc.umu.se:8086/coc/sp.xml">

+    <ns0:Extensions>

+        <ns1:EntityAttributes>

+            <ns2:Attribute Name="http://macedir.org/entity-category">

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.edugain.org/dataprotection/coc-eu-01-draft

+                </ns2:AttributeValue>

+            </ns2:Attribute>

+        </ns1:EntityAttributes>

+    </ns0:Extensions>

+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"

+                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">

+        <ns0:KeyDescriptor use="encryption">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:KeyDescriptor use="signing">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/coc/redirect"

+                index="1"/>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/coc/post"

+                index="2"/>

+    </ns0:SPSSODescriptor>

+</ns0:EntityDescriptor>

diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-nren-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-nren-sp.xml
new file mode 100644
index 00000000..a6a71a94
--- /dev/null
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-nren-sp.xml
@@ -0,0 +1,77 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"

+                      xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"

+                      xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion"

+                      xmlns:ns4="http://www.w3.org/2000/09/xmldsig#"

+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+                      xmlns:xs="http://www.w3.org/2001/XMLSchema"

+                      entityID="http://xenosmilus.umdc.umu.se:8086/nren/sp.xml">

+    <ns0:Extensions>

+        <ns1:EntityAttributes>

+            <ns2:Attribute Name="http://macedir.org/entity-category">

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/nren-service

+                </ns2:AttributeValue>

+            </ns2:Attribute>

+        </ns1:EntityAttributes>

+    </ns0:Extensions>

+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"

+                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">

+        <ns0:KeyDescriptor use="encryption">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:KeyDescriptor use="signing">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/nren/redirect"

+                index="1"/>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/nren/post"

+                index="2"/>

+    </ns0:SPSSODescriptor>

+</ns0:EntityDescriptor>

diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re-sp.xml
new file mode 100644
index 00000000..254eabb4
--- /dev/null
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re-sp.xml
@@ -0,0 +1,77 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"

+                      xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"

+                      xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion"

+                      xmlns:ns4="http://www.w3.org/2000/09/xmldsig#"

+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+                      xmlns:xs="http://www.w3.org/2001/XMLSchema"

+                      entityID="http://xenosmilus.umdc.umu.se:8086/re/sp.xml">

+    <ns0:Extensions>

+        <ns1:EntityAttributes>

+            <ns2:Attribute Name="http://macedir.org/entity-category">

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/research-and-education

+                </ns2:AttributeValue>

+            </ns2:Attribute>

+        </ns1:EntityAttributes>

+    </ns0:Extensions>

+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"

+                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">

+        <ns0:KeyDescriptor use="encryption">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:KeyDescriptor use="signing">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/re/redirect"

+                index="1"/>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/re/post"

+                index="2"/>

+    </ns0:SPSSODescriptor>

+</ns0:EntityDescriptor>

diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_eu-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_eu-sp.xml
new file mode 100644
index 00000000..69acc314
--- /dev/null
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_eu-sp.xml
@@ -0,0 +1,80 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"

+                      xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"

+                      xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion"

+                      xmlns:ns4="http://www.w3.org/2000/09/xmldsig#"

+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+                      xmlns:xs="http://www.w3.org/2001/XMLSchema"

+                      entityID="http://xenosmilus.umdc.umu.se:8086/re_eu/sp.xml">

+    <ns0:Extensions>

+        <ns1:EntityAttributes>

+            <ns2:Attribute Name="http://macedir.org/entity-category">

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/research-and-education

+                </ns2:AttributeValue>

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/eu-adequate-protection

+                </ns2:AttributeValue>

+            </ns2:Attribute>

+        </ns1:EntityAttributes>

+    </ns0:Extensions>

+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"

+                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">

+        <ns0:KeyDescriptor use="encryption">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:KeyDescriptor use="signing">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/re_eu/redirect"

+                index="1"/>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/re_eu/post"

+                index="2"/>

+    </ns0:SPSSODescriptor>

+</ns0:EntityDescriptor>

diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_hei-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_hei-sp.xml
new file mode 100644
index 00000000..fa610631
--- /dev/null
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_hei-sp.xml
@@ -0,0 +1,80 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"

+                      xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"

+                      xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion"

+                      xmlns:ns4="http://www.w3.org/2000/09/xmldsig#"

+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+                      xmlns:xs="http://www.w3.org/2001/XMLSchema"

+                      entityID="http://xenosmilus.umdc.umu.se:8086/re_hei/sp.xml">

+    <ns0:Extensions>

+        <ns1:EntityAttributes>

+            <ns2:Attribute Name="http://macedir.org/entity-category">

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/research-and-education

+                </ns2:AttributeValue>

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/hei-service

+                </ns2:AttributeValue>

+            </ns2:Attribute>

+        </ns1:EntityAttributes>

+    </ns0:Extensions>

+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"

+                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">

+        <ns0:KeyDescriptor use="encryption">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:KeyDescriptor use="signing">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/re_hei/redirect"

+                index="1"/>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/re_hei/post"

+                index="2"/>

+    </ns0:SPSSODescriptor>

+</ns0:EntityDescriptor>

diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_nren-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_nren-sp.xml
new file mode 100644
index 00000000..c43c9d7e
--- /dev/null
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_nren-sp.xml
@@ -0,0 +1,80 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"

+                      xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"

+                      xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion"

+                      xmlns:ns4="http://www.w3.org/2000/09/xmldsig#"

+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+                      xmlns:xs="http://www.w3.org/2001/XMLSchema"

+                      entityID="http://xenosmilus.umdc.umu.se:8086/re_nren/sp.xml">

+    <ns0:Extensions>

+        <ns1:EntityAttributes>

+            <ns2:Attribute Name="http://macedir.org/entity-category">

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/research-and-education

+                </ns2:AttributeValue>

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/nren-service

+                </ns2:AttributeValue>

+            </ns2:Attribute>

+        </ns1:EntityAttributes>

+    </ns0:Extensions>

+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"

+                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">

+        <ns0:KeyDescriptor use="encryption">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:KeyDescriptor use="signing">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/re_nren/redirect"

+                index="1"/>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/re_nren/post"

+                index="2"/>

+    </ns0:SPSSODescriptor>

+</ns0:EntityDescriptor>

diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_sfs_hei-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_sfs_hei-sp.xml
new file mode 100644
index 00000000..411f3e18
--- /dev/null
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-re_sfs_hei-sp.xml
@@ -0,0 +1,83 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"

+                      xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"

+                      xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion"

+                      xmlns:ns4="http://www.w3.org/2000/09/xmldsig#"

+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+                      xmlns:xs="http://www.w3.org/2001/XMLSchema"

+                      entityID="http://xenosmilus.umdc.umu.se:8086/re_sfs_hei/sp.xml">

+    <ns0:Extensions>

+        <ns1:EntityAttributes>

+            <ns2:Attribute Name="http://macedir.org/entity-category">

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/research-and-education

+                </ns2:AttributeValue>

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/hei-service

+                </ns2:AttributeValue>

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/sfs-1993-1153

+                </ns2:AttributeValue>

+            </ns2:Attribute>

+        </ns1:EntityAttributes>

+    </ns0:Extensions>

+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"

+                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">

+        <ns0:KeyDescriptor use="encryption">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:KeyDescriptor use="signing">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/re_sfs_hei/redirect"

+                index="1"/>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/re_sfs_hei/post"

+                index="2"/>

+    </ns0:SPSSODescriptor>

+</ns0:EntityDescriptor>

diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-sfs-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-sfs-sp.xml
new file mode 100644
index 00000000..91195a14
--- /dev/null
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-sfs-sp.xml
@@ -0,0 +1,77 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"

+                      xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"

+                      xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion"

+                      xmlns:ns4="http://www.w3.org/2000/09/xmldsig#"

+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+                      xmlns:xs="http://www.w3.org/2001/XMLSchema"

+                      entityID="http://xenosmilus.umdc.umu.se:8086/sfs/sp.xml">

+    <ns0:Extensions>

+        <ns1:EntityAttributes>

+            <ns2:Attribute Name="http://macedir.org/entity-category">

+                <ns2:AttributeValue xsi:type="xs:string">

+                    http://www.swamid.se/category/sfs-1993-1153

+                </ns2:AttributeValue>

+            </ns2:Attribute>

+        </ns1:EntityAttributes>

+    </ns0:Extensions>

+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"

+                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">

+        <ns0:KeyDescriptor use="encryption">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:KeyDescriptor use="signing">

+            <ns4:KeyInfo>

+                <ns4:X509Data>

+                    <ns4:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns4:X509Certificate>

+                </ns4:X509Data>

+            </ns4:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/sfs/redirect"

+                index="1"/>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/sfs/post"

+                index="2"/>

+    </ns0:SPSSODescriptor>

+</ns0:EntityDescriptor>

diff --git a/swamid-2.0/xenosmilus.umdc.umu.se-8086-sp.xml b/swamid-2.0/xenosmilus.umdc.umu.se-8086-sp.xml
new file mode 100644
index 00000000..b4ca029b
--- /dev/null
+++ b/swamid-2.0/xenosmilus.umdc.umu.se-8086-sp.xml
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"

+                      xmlns:ns1="http://www.w3.org/2000/09/xmldsig#"

+                      entityID="http://xenosmilus.umdc.umu.se:8086/sp.xml">

+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true"

+                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">

+        <ns0:KeyDescriptor use="encryption">

+            <ns1:KeyInfo>

+                <ns1:X509Data>

+                    <ns1:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns1:X509Certificate>

+                </ns1:X509Data>

+            </ns1:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:KeyDescriptor use="signing">

+            <ns1:KeyInfo>

+                <ns1:X509Data>

+                    <ns1:X509Certificate>

+                        MIIC8jCCAlugAwIBAgIJAJHg2V5J31I8MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNV

+                        BAYTAlNFMQ0wCwYDVQQHEwRVbWVhMRgwFgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkx

+                        EDAOBgNVBAsTB0lUIFVuaXQxEDAOBgNVBAMTB1Rlc3QgU1AwHhcNMDkxMDI2MTMz

+                        MTE1WhcNMTAxMDI2MTMzMTE1WjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBxMEVW1l

+                        YTEYMBYGA1UEChMPVW1lYSBVbml2ZXJzaXR5MRAwDgYDVQQLEwdJVCBVbml0MRAw

+                        DgYDVQQDEwdUZXN0IFNQMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDkJWP7

+                        bwOxtH+E15VTaulNzVQ/0cSbM5G7abqeqSNSs0l0veHr6/ROgW96ZeQ57fzVy2MC

+                        FiQRw2fzBs0n7leEmDJyVVtBTavYlhAVXDNa3stgvh43qCfLx+clUlOvtnsoMiiR

+                        mo7qf0BoPKTj7c0uLKpDpEbAHQT4OF1HRYVxMwIDAQABo4G/MIG8MB0GA1UdDgQW

+                        BBQ7RgbMJFDGRBu9o3tDQDuSoBy7JjCBjAYDVR0jBIGEMIGBgBQ7RgbMJFDGRBu9

+                        o3tDQDuSoBy7JqFepFwwWjELMAkGA1UEBhMCU0UxDTALBgNVBAcTBFVtZWExGDAW

+                        BgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEQMA4GA1UECxMHSVQgVW5pdDEQMA4GA1UE

+                        AxMHVGVzdCBTUIIJAJHg2V5J31I8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF

+                        BQADgYEAMuRwwXRnsiyWzmRikpwinnhTmbooKm5TINPE7A7gSQ710RxioQePPhZO

+                        zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN

+                        +vffBGQ09mo+6CffuFTZYeOhzP/2stAPwCTU4kxEoiy0KpZMANI=

+                    </ns1:X509Certificate>

+                </ns1:X509Data>

+            </ns1:KeyInfo>

+        </ns0:KeyDescriptor>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/redirect"

+                index="1"/>

+        <ns0:AssertionConsumerService

+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"

+                Location="http://xenosmilus.umdc.umu.se:8086/acs/post"

+                index="2"/>

+    </ns0:SPSSODescriptor>

+</ns0:EntityDescriptor>