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, 84 insertions, 0 deletions

diff --git a/swamid-2.0/connect.funet.fi-shibboleth.xml b/swamid-2.0/connect.funet.fi-shibboleth.xml
new file mode 100644
index 00000000..19ec84f8
--- /dev/null
+++ b/swamid-2.0/connect.funet.fi-shibboleth.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.funet.fi/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://connect.funet.fi/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://connect.funet.fi/Shibboleth.sso/DS/haka.funet.fi" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect.funet.fi</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect.funet.fi</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAKZpZsXKkzHCMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGNvbm5lY3QuZnVuZXQuZmkwHhcNMTIwMjE2MTE0NTMwWhcNMTUwMjE1MTE0
+NTMwWjAbMRkwFwYDVQQDExBjb25uZWN0LmZ1bmV0LmZpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA9qHZQfn+2SyyuRhpm+wnEIxXj4eZjNkfQvy/hSih
+fDvnx5QpNerbXt+SIy2YQHmFhn5N5Hdn1onPf91IzshAQVXacIdzqFEXdwl2k4M9
+Bw7FiObtFokW4ukEZTEnDPhwTu89oaVuXLLsGt9tCiNBKaSniip4HpMMBEK41jU4
+wzmm+LSQF8xYl+AgagZaydHCVSIQC1PnXqPR1dcnoBzP2t01YqWCfCyxHjHVBYtk
+jrXpse9rb0pj1xlurvG1lveqeAStM8AkXiP2gSBQpv88y/YU6UgT1eOLsI65Ox2w
+ZWTd36jYbUxHOsRAsZxSy0IokvGIHDK6ykjU9wLthwWXYwIDAQABoz4wPDAbBgNV
+HREEFDASghBjb25uZWN0LmZ1bmV0LmZpMB0GA1UdDgQWBBRxLCa7bCuoP7HKshs5
+Fyw8ab6LXzANBgkqhkiG9w0BAQUFAAOCAQEAxw74TU9pNDmMVFq7AXkvHOlnKM9q
+l7c5F7D/KVXOrigwiIn0xwj+kr4ElZp1qrVLgC+fEHk9C2uKR9iJiR1z2SnOEn1U
+TeFtpdM7HaGBivCjsX5d1zMiTILSNkU7u+cJPH9EASOnTjSIbktDfHLApZ+t9yfg
+NPPGeZN6Q8qZuKoJBi7obLAsWbcTSxgIBrYK4G0BS9Hiy3W4gp1gqTflpYx0YBHv
+rNvLo5T1BgsjLc1kQsoAAn8pUP8GHb1KSJ0SY2IKV+k9oWEF3Nd1n/+43bPB666B
+EMBSvHkNXEFDf/FDbw4kjn5ie1pmF4qu+jHVHyB4y4Roz0QFoYIeOWaRMw==
+</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>connect.funet.fi</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect.funet.fi</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAKZpZsXKkzHCMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGNvbm5lY3QuZnVuZXQuZmkwHhcNMTIwMjE2MTE0NTMwWhcNMTUwMjE1MTE0
+NTMwWjAbMRkwFwYDVQQDExBjb25uZWN0LmZ1bmV0LmZpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA9qHZQfn+2SyyuRhpm+wnEIxXj4eZjNkfQvy/hSih
+fDvnx5QpNerbXt+SIy2YQHmFhn5N5Hdn1onPf91IzshAQVXacIdzqFEXdwl2k4M9
+Bw7FiObtFokW4ukEZTEnDPhwTu89oaVuXLLsGt9tCiNBKaSniip4HpMMBEK41jU4
+wzmm+LSQF8xYl+AgagZaydHCVSIQC1PnXqPR1dcnoBzP2t01YqWCfCyxHjHVBYtk
+jrXpse9rb0pj1xlurvG1lveqeAStM8AkXiP2gSBQpv88y/YU6UgT1eOLsI65Ox2w
+ZWTd36jYbUxHOsRAsZxSy0IokvGIHDK6ykjU9wLthwWXYwIDAQABoz4wPDAbBgNV
+HREEFDASghBjb25uZWN0LmZ1bmV0LmZpMB0GA1UdDgQWBBRxLCa7bCuoP7HKshs5
+Fyw8ab6LXzANBgkqhkiG9w0BAQUFAAOCAQEAxw74TU9pNDmMVFq7AXkvHOlnKM9q
+l7c5F7D/KVXOrigwiIn0xwj+kr4ElZp1qrVLgC+fEHk9C2uKR9iJiR1z2SnOEn1U
+TeFtpdM7HaGBivCjsX5d1zMiTILSNkU7u+cJPH9EASOnTjSIbktDfHLApZ+t9yfg
+NPPGeZN6Q8qZuKoJBi7obLAsWbcTSxgIBrYK4G0BS9Hiy3W4gp1gqTflpYx0YBHv
+rNvLo5T1BgsjLc1kQsoAAn8pUP8GHb1KSJ0SY2IKV+k9oWEF3Nd1n/+43bPB666B
+EMBSvHkNXEFDf/FDbw4kjn5ie1pmF4qu+jHVHyB4y4Roz0QFoYIeOWaRMw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.funet.fi/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.funet.fi/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.funet.fi/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.funet.fi/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.funet.fi/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.funet.fi/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.funet.fi/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.funet.fi/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.funet.fi/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.funet.fi/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://connect.funet.fi/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.funet.fi/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect.funet.fi/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.funet.fi/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.funet.fi/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">FUNET E-Meeting Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">FUNET E-Meeting Service (Adobe Connect)</md:ServiceDescription>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>