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

diff --git a/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..1fcd5ab3
--- /dev/null
+++ b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://confluence.it.su.se/Shibboleth.sso">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://confluence.it.su.se/Shibboleth.sso/WAYF" 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://confluence.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>confluence-prod-app1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=confluence-prod-app1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAIF9hDgxtaCJMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFGNvbmZsdWVuY2UtcHJvZC1hcHAxMB4XDTEwMDgxNzEyNDg1OFoXDTIwMDgx
+NDEyNDg1OFowHzEdMBsGA1UEAxMUY29uZmx1ZW5jZS1wcm9kLWFwcDEwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTnCJFt8KxDiKGg8q4R98rpkGrGe8F
+IxSZX/rYsbOShpAS4BybJIBsYPcU+DbWC3YXyYfC+iI1lYczw2hhfiENmrv7KEdB
+hHxA6+hCuDuPcH44EjQ/mT0Hx/SWdBSglzcQRnPHKCdedlJhdsV3gDeWTV2EYgrT
+GOB/k9pfDr2T6nvMnI1aPj33esHKfeVLqNALDRQuFyo7vEU5pejlarjIG7F+2KES
+MVunVGglxJTWvTT1FNqxuAR9j04p8XcMLj6NU20W9C2WaRPHC80crKLgBqcuymAY
+k2swFURnV5ubBRtWY/tIjMoYNeWgadsaKJFy2x7hJruM3qxUhT+LhRR9AgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFGNvbmZsdWVuY2UtcHJvZC1hcHAxMB0GA1UdDgQWBBQR
+M1tnhL0IxstpiHXStoO0Ghr6YTANBgkqhkiG9w0BAQUFAAOCAQEA0DES8eLg3jwz
+tj0RkUS2IU574YX5B7WA/ZokuKVWnsZlhkVTQxzn1xvirV+wWhSf0mHQzSMfEEbR
+Gtattonij6QCTKIDC9Whay+xjZRKag49yu/GEzyPYx6vU8mn0C3xvSlZPAyzwLU3
+g4cLnO3NPUpsArNLkWBT5KZ9t7ms85fkwgYLVhOJVavbDbfvslx4R6Cuf1w6kyxa
+Uaa6b/2SBvN9dsAzmri0E4IEP21lWe9+k42cYuCbrJIQMJ3x7M+uvzi3JJB4s6ze
+qVpQDZd93P9YLQGNulZ1J4JdseJC6nAeXZY+iAiEBCyhx0+NQnlt+BZt7m76yNYi
+01e+X7VXbQ==
+</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>confluence-prod-app1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=confluence-prod-app1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAIF9hDgxtaCJMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFGNvbmZsdWVuY2UtcHJvZC1hcHAxMB4XDTEwMDgxNzEyNDg1OFoXDTIwMDgx
+NDEyNDg1OFowHzEdMBsGA1UEAxMUY29uZmx1ZW5jZS1wcm9kLWFwcDEwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTnCJFt8KxDiKGg8q4R98rpkGrGe8F
+IxSZX/rYsbOShpAS4BybJIBsYPcU+DbWC3YXyYfC+iI1lYczw2hhfiENmrv7KEdB
+hHxA6+hCuDuPcH44EjQ/mT0Hx/SWdBSglzcQRnPHKCdedlJhdsV3gDeWTV2EYgrT
+GOB/k9pfDr2T6nvMnI1aPj33esHKfeVLqNALDRQuFyo7vEU5pejlarjIG7F+2KES
+MVunVGglxJTWvTT1FNqxuAR9j04p8XcMLj6NU20W9C2WaRPHC80crKLgBqcuymAY
+k2swFURnV5ubBRtWY/tIjMoYNeWgadsaKJFy2x7hJruM3qxUhT+LhRR9AgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFGNvbmZsdWVuY2UtcHJvZC1hcHAxMB0GA1UdDgQWBBQR
+M1tnhL0IxstpiHXStoO0Ghr6YTANBgkqhkiG9w0BAQUFAAOCAQEA0DES8eLg3jwz
+tj0RkUS2IU574YX5B7WA/ZokuKVWnsZlhkVTQxzn1xvirV+wWhSf0mHQzSMfEEbR
+Gtattonij6QCTKIDC9Whay+xjZRKag49yu/GEzyPYx6vU8mn0C3xvSlZPAyzwLU3
+g4cLnO3NPUpsArNLkWBT5KZ9t7ms85fkwgYLVhOJVavbDbfvslx4R6Cuf1w6kyxa
+Uaa6b/2SBvN9dsAzmri0E4IEP21lWe9+k42cYuCbrJIQMJ3x7M+uvzi3JJB4s6ze
+qVpQDZd93P9YLQGNulZ1J4JdseJC6nAeXZY+iAiEBCyhx0+NQnlt+BZt7m76yNYi
+01e+X7VXbQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.it.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence.it.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.it.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.it.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.it.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence.it.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.it.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.it.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://confluence.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://confluence.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://confluence.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>