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/aktivera-test.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..af7e9088
--- /dev/null
+++ b/swamid-2.0/aktivera-test.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://aktivera-test.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://aktivera-test.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://aktivera-test.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>signuptool-test-app1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=signuptool-test-app1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAK5pPeHRZOXtMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHNpZ251cHRvb2wtdGVzdC1hcHAxMB4XDTExMDIyMTE1MjYxNloXDTIxMDIx
+ODE1MjYxNlowHzEdMBsGA1UEAxMUc2lnbnVwdG9vbC10ZXN0LWFwcDEwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDY+owzEC+S0BF0nCbN13lR0CHlp7mg
+/7YhK3ESVboh9kUtM4/awXRjvJFMfcuFbaJV2DXCX85hFvBIw0D4u6bjNNPye9oS
+VPAFenaFnHAE75O5C3FYnuB5X3P9HDdBoc5m21CDwLmGek7KwPTxpJtqevNUAO2C
+/EEtdk1xe+2T4+fikdRMP9uvf6xz7/WgGzm1V/olbV3tgph7ye4KEB2F6Z/hsyyn
+JaekNZD3oKOk3DsXfxHKRhD/nUjqXoGoUwkD4HLT1fKdP5VYb+T/SzdxLSaoUoJJ
+fVv2Xs/wlD3Vx3zvV5l3x8EJ4paySeh4RdNsUAylbshYUXN9frk5g/WzAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHNpZ251cHRvb2wtdGVzdC1hcHAxMB0GA1UdDgQWBBSt
+cBtmU+scg9g8iK1x07dqKTh+QDANBgkqhkiG9w0BAQUFAAOCAQEAw0NLLpKeYIhn
+rL0edePtkGr3sFNmOyg8k9qkPxgwrozjLg/+AkssNft+rs7nZp87IIhZUiNZxr7w
+qnRPJXoxq56IfsbZpQwAH0QIRc9gl5BjzvdqByGH76Z5dDPFUaTrxnd7XdWybOiZ
+bX4d2LgWklI0aTw7xQEjw0qX/nWW0guZRC/nJfgiHjV7xEJLcoxcyn0+dqo1+XkU
+y60nYKhdp2qnCnRCR8by5ykruSaDJ4c/OCsGh9WIE6HvpDunTTzisfqrdZ22LTLR
+vaJm+7MsfXQvQZz6YUW2MGSYOa6G9v2dS4Dz9v/9JQjn6bBqqSouw3spYPDAbzGp
+u/S7d9rEGQ==
+</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>signuptool-test-app1</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=signuptool-test-app1</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAK5pPeHRZOXtMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHNpZ251cHRvb2wtdGVzdC1hcHAxMB4XDTExMDIyMTE1MjYxNloXDTIxMDIx
+ODE1MjYxNlowHzEdMBsGA1UEAxMUc2lnbnVwdG9vbC10ZXN0LWFwcDEwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDY+owzEC+S0BF0nCbN13lR0CHlp7mg
+/7YhK3ESVboh9kUtM4/awXRjvJFMfcuFbaJV2DXCX85hFvBIw0D4u6bjNNPye9oS
+VPAFenaFnHAE75O5C3FYnuB5X3P9HDdBoc5m21CDwLmGek7KwPTxpJtqevNUAO2C
+/EEtdk1xe+2T4+fikdRMP9uvf6xz7/WgGzm1V/olbV3tgph7ye4KEB2F6Z/hsyyn
+JaekNZD3oKOk3DsXfxHKRhD/nUjqXoGoUwkD4HLT1fKdP5VYb+T/SzdxLSaoUoJJ
+fVv2Xs/wlD3Vx3zvV5l3x8EJ4paySeh4RdNsUAylbshYUXN9frk5g/WzAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHNpZ251cHRvb2wtdGVzdC1hcHAxMB0GA1UdDgQWBBSt
+cBtmU+scg9g8iK1x07dqKTh+QDANBgkqhkiG9w0BAQUFAAOCAQEAw0NLLpKeYIhn
+rL0edePtkGr3sFNmOyg8k9qkPxgwrozjLg/+AkssNft+rs7nZp87IIhZUiNZxr7w
+qnRPJXoxq56IfsbZpQwAH0QIRc9gl5BjzvdqByGH76Z5dDPFUaTrxnd7XdWybOiZ
+bX4d2LgWklI0aTw7xQEjw0qX/nWW0guZRC/nJfgiHjV7xEJLcoxcyn0+dqo1+XkU
+y60nYKhdp2qnCnRCR8by5ykruSaDJ4c/OCsGh9WIE6HvpDunTTzisfqrdZ22LTLR
+vaJm+7MsfXQvQZz6YUW2MGSYOa6G9v2dS4Dz9v/9JQjn6bBqqSouw3spYPDAbzGp
+u/S7d9rEGQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aktivera-test.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aktivera-test.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aktivera-test.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aktivera-test.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera-test.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aktivera-test.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aktivera-test.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aktivera-test.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera-test.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aktivera-test.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aktivera-test.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aktivera-test.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aktivera-test.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aktivera-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>