swamid-1.0* removed

nya-1.0* removed
non-used metadata moved to swamid-2.0-obsolete
swamid-1.0/* moved to swamid-2.0/
nya-1.0/* moved to swamid-2.0/
mxml cleaned from swamid-1.0 data
Makefile cleaned from nya-1.0 and swamid-1.0 data

1 files changed, 72 insertions, 0 deletions

diff --git a/swamid-2.0/sp.tools.sunet.se-shibboleth.xml b/swamid-2.0/sp.tools.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..7481a0e9
--- /dev/null
+++ b/swamid-2.0/sp.tools.sunet.se-shibboleth.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.tools.sunet.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://tools.sunet.se/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sampo.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sampo.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAI+J1ypxJJViMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDnNhbXBvLnN1bmV0LnNlMB4XDTEwMDMxNjEyNDg0NloXDTIwMDMxMzEyNDg0
+NlowGTEXMBUGA1UEAxMOc2FtcG8uc3VuZXQuc2UwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC/ptcTBImyhr19TLXOQ3D2TmMvIVPY1o1xcFiqUPdQrsPV
+N/gNBH296AKnnrNvD5q6fCDug6I08VwiBa5FFtzcUAT7bMf0Vgvh4Cnun3PiHnTJ
+AWfdI6yuSXyf3rIiUcJAXQWpNkR1vbl7w18GiU21T7GFjUTcXsr1vsLpdaWG4+/I
+IYpZmK3CtQcI7Rv/uCQLRVWdOzp3Ds/TRmXeF4q7QV17nEnz/02WOaEZsCJurPOg
+sgzgemBXd8VE/vobqYTfn7yUvmgJKcHFpVqwwkIoVyNoVoIKBjiKYbRjuXThdDfp
+EYv5gtevD6szDBRNskTrzbPWpXnA/yne8yaspNgrAgMBAAGjPDA6MBkGA1UdEQQS
+MBCCDnNhbXBvLnN1bmV0LnNlMB0GA1UdDgQWBBT5t2mmKUW7CUXjzz7ewQVxdSMf
+mjANBgkqhkiG9w0BAQUFAAOCAQEALmHceqzrAarhcb7qAc8RfR3sezshQhMd6roh
+L3xFzwkAHeUnw4ZbMkbvnl+R8LUrbJRiLEPFFtNbUqa68TcS3c/B2dDK+qpbu6nC
+jBc2tZW8Nz9ZCfxArqLn6WfJGg4Yhgo9OlfJxZbmdc0Ld0tp0d/F2FHYkVc1SbXk
+VWCSzQ48/y05mpXMcbhdp5PJuLOfX1R6VFvu04oWuA1J9NN03IYF5DwqupZIhN7i
+3+2PmYs4x/dZ1/1cYva9JUCwffmjo7sx6LbedNkKYQL/skTlL8CHo9snghUSYJSZ
+XyNIJHaDalIvdnrWnQFVketJt+fje9CgALP1Btsk1g0AyD7tYw==
+</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>sampo.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sampo.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAI+J1ypxJJViMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDnNhbXBvLnN1bmV0LnNlMB4XDTEwMDMxNjEyNDg0NloXDTIwMDMxMzEyNDg0
+NlowGTEXMBUGA1UEAxMOc2FtcG8uc3VuZXQuc2UwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC/ptcTBImyhr19TLXOQ3D2TmMvIVPY1o1xcFiqUPdQrsPV
+N/gNBH296AKnnrNvD5q6fCDug6I08VwiBa5FFtzcUAT7bMf0Vgvh4Cnun3PiHnTJ
+AWfdI6yuSXyf3rIiUcJAXQWpNkR1vbl7w18GiU21T7GFjUTcXsr1vsLpdaWG4+/I
+IYpZmK3CtQcI7Rv/uCQLRVWdOzp3Ds/TRmXeF4q7QV17nEnz/02WOaEZsCJurPOg
+sgzgemBXd8VE/vobqYTfn7yUvmgJKcHFpVqwwkIoVyNoVoIKBjiKYbRjuXThdDfp
+EYv5gtevD6szDBRNskTrzbPWpXnA/yne8yaspNgrAgMBAAGjPDA6MBkGA1UdEQQS
+MBCCDnNhbXBvLnN1bmV0LnNlMB0GA1UdDgQWBBT5t2mmKUW7CUXjzz7ewQVxdSMf
+mjANBgkqhkiG9w0BAQUFAAOCAQEALmHceqzrAarhcb7qAc8RfR3sezshQhMd6roh
+L3xFzwkAHeUnw4ZbMkbvnl+R8LUrbJRiLEPFFtNbUqa68TcS3c/B2dDK+qpbu6nC
+jBc2tZW8Nz9ZCfxArqLn6WfJGg4Yhgo9OlfJxZbmdc0Ld0tp0d/F2FHYkVc1SbXk
+VWCSzQ48/y05mpXMcbhdp5PJuLOfX1R6VFvu04oWuA1J9NN03IYF5DwqupZIhN7i
+3+2PmYs4x/dZ1/1cYva9JUCwffmjo7sx6LbedNkKYQL/skTlL8CHo9snghUSYJSZ
+XyNIJHaDalIvdnrWnQFVketJt+fje9CgALP1Btsk1g0AyD7tYw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tools.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tools.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tools.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tools.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tools.sunet.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tools.sunet.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tools.sunet.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tools.sunet.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tools.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tools.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tools.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tools.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tools.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tools.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>