metadata files renamed to <entityid>.xml

nya-08.ladok.umu.se duplicated, removed
idp.kau.se.xml duplicate, removed
luigi.umdc.umu.se-dw-idp.xml duplicate, removed
luigi.umdc.umu.se-shibboleth-idp.xml duplicate, removed
swamid-1.0/ladok3-*gui-sp* duplicates, removed
old e5.onthehub.com in swamid-testing-1.0.xml replaced by swamid-2.0 metadata
www.bmcmediatek.uu.se.xml duplicate of ws3.bmc.uu.se-shibboleth.xml, removed
bad entityid of www2.teol.uu.se.xml, removed
bad entityid of dev.teol.uu.se.xml (sp.example.org-shibboleth.xml), removed

1 files changed, 83 insertions, 0 deletions

diff --git a/swamid-2.0/uraccess.se-shibboleth-sp.xml b/swamid-2.0/uraccess.se-shibboleth-sp.xml
new file mode 100644
index 00000000..c505c461
--- /dev/null
+++ b/swamid-2.0/uraccess.se-shibboleth-sp.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uraccess.se/shibboleth-sp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <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://uraccess.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>vm-uraccess-01.hig.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=vm-uraccess-01.hig.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAPUsAkPRkfQcMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFXZtLXVyYWNjZXNzLTAxLmhpZy5zZTAeFw0xMjEyMjgxNDA2NDZaFw0yMjEy
+MjYxNDA2NDZaMCAxHjAcBgNVBAMTFXZtLXVyYWNjZXNzLTAxLmhpZy5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZi4a5TDF3axO1a4SVbIV/yMJuh
+FA5dgRAbepHRugRnkeBrYuJZD5Nw9EDFrZzJBWUTuPwxIngZfsAUtdTKnvzjDtks
+1Zp7ZXl5EqayQ0pM5DMoTf2mJOXaduB1oqR6BJQVK1zgm7/pSeYmp4kwWsChBXKs
+E+qF26/ioxCQZ9lYm0hZB6gaDSIANr9hd3JAwWkDD1iGs3NErfS09TEmzYjxeRlf
+vn36fEm9yO1Kc0ZLfQNOSF240+QN7bxISnPAH+V/Bhxes7vXsMa25LUhkTCxuZte
+uFdeucgrS9B0kdRA1anuWUdfZLA2Zc/RQBsy6A+IHfv9n6z1jkLidJ+M8KkCAwEA
+AaNDMEEwIAYDVR0RBBkwF4IVdm0tdXJhY2Nlc3MtMDEuaGlnLnNlMB0GA1UdDgQW
+BBR4inZYnfGemGRVjiQcUPD0tgLCtTANBgkqhkiG9w0BAQUFAAOCAQEAjd8rcbPm
+1SYlzcKAjyBmxk4rGrw/xC34Q8wPdjSkCWuLSEHnHWZ8zligSG18NYnIAnF2HNcZ
+xDlKdNzUDfTLl6DO5Sj/14cp3KRCEguBBpA5mB1B0V1utNxDSSqmSETMIDfevDG+
+bHjvO72YCMTVdrTETXcEqQief7YOl23gNcA+UFBpJVy32Z1Ys2f/TDUO4zA7EIxO
+5wOyJXko37s+7C2zwiv58MNt4kXp7wfu8yLdwdUx26BSG/r4b6eFl3FOHM/4B/tO
+u+7JsZjXP5N3EUSAg15/2ohUY/eiLIpt2Rwnu4uscUN6P9hW5dL2ma0ooT9rrqxy
+KZxzSTvKUlilgw==
+</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>vm-uraccess-01.hig.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=vm-uraccess-01.hig.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAPUsAkPRkfQcMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFXZtLXVyYWNjZXNzLTAxLmhpZy5zZTAeFw0xMjEyMjgxNDA2NDZaFw0yMjEy
+MjYxNDA2NDZaMCAxHjAcBgNVBAMTFXZtLXVyYWNjZXNzLTAxLmhpZy5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZi4a5TDF3axO1a4SVbIV/yMJuh
+FA5dgRAbepHRugRnkeBrYuJZD5Nw9EDFrZzJBWUTuPwxIngZfsAUtdTKnvzjDtks
+1Zp7ZXl5EqayQ0pM5DMoTf2mJOXaduB1oqR6BJQVK1zgm7/pSeYmp4kwWsChBXKs
+E+qF26/ioxCQZ9lYm0hZB6gaDSIANr9hd3JAwWkDD1iGs3NErfS09TEmzYjxeRlf
+vn36fEm9yO1Kc0ZLfQNOSF240+QN7bxISnPAH+V/Bhxes7vXsMa25LUhkTCxuZte
+uFdeucgrS9B0kdRA1anuWUdfZLA2Zc/RQBsy6A+IHfv9n6z1jkLidJ+M8KkCAwEA
+AaNDMEEwIAYDVR0RBBkwF4IVdm0tdXJhY2Nlc3MtMDEuaGlnLnNlMB0GA1UdDgQW
+BBR4inZYnfGemGRVjiQcUPD0tgLCtTANBgkqhkiG9w0BAQUFAAOCAQEAjd8rcbPm
+1SYlzcKAjyBmxk4rGrw/xC34Q8wPdjSkCWuLSEHnHWZ8zligSG18NYnIAnF2HNcZ
+xDlKdNzUDfTLl6DO5Sj/14cp3KRCEguBBpA5mB1B0V1utNxDSSqmSETMIDfevDG+
+bHjvO72YCMTVdrTETXcEqQief7YOl23gNcA+UFBpJVy32Z1Ys2f/TDUO4zA7EIxO
+5wOyJXko37s+7C2zwiv58MNt4kXp7wfu8yLdwdUx26BSG/r4b6eFl3FOHM/4B/tO
+u+7JsZjXP5N3EUSAg15/2ohUY/eiLIpt2Rwnu4uscUN6P9hW5dL2ma0ooT9rrqxy
+KZxzSTvKUlilgw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uraccess.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uraccess.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uraccess.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uraccess.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uraccess.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uraccess.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uraccess.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uraccess.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uraccess.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uraccess.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uraccess.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uraccess.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uraccess.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uraccess.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uraccess.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>