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

diff --git a/swamid-2.0/ladok-test.su.se-shibboleth.sso.xml b/swamid-2.0/ladok-test.su.se-shibboleth.sso.xml
new file mode 100644
index 00000000..d0b8e327
--- /dev/null
+++ b/swamid-2.0/ladok-test.su.se-shibboleth.sso.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok-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://ladok-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://ladok-test.su.se/Shibboleth.sso/WAYF/wavelan" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lpwtool-test-ladok1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lpwtool-test-ladok1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAMVcirJT+6VyMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHGxwd3Rvb2wtdGVzdC1sYWRvazEuaXQuc3Uuc2UwHhcNMTAwNDE5MTMxMDQ4
+WhcNMjAwNDE2MTMxMDQ4WjAnMSUwIwYDVQQDExxscHd0b29sLXRlc3QtbGFkb2sx
+Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Ri0W5ti
+3fLLdRMqqHTATq3B5kJ4Ys1pNbq/QXFrBtC6z9cvkkA0Bo4K4rMos5ddrwfkHWI+
+5PFJGRxeJnmzGR4S13pQ2xRTcrUKGxosnfYFUAG0y3ySDUjH/O4eU+nBmqQA5yRQ
+RYZ6O1sBN++soWRPSvDekiN5qUhjIbVKTriMPmgwWgB1NgpBuedU72l2mkakw/Eb
+X8lfkLs3gKlipttf4mHSc1OHrRGFvEfUiXQPtft4TURcSWF2w8ZF7OvOFaytQ5B8
+T1LGXx+meuzw36MSvsWiJ66mLTeCelrQmEIPNyTDU0PR8asUKI6wL3ZqW7fi/QdL
+x+OVozQUqLcpkQIDAQABo0owSDAnBgNVHREEIDAeghxscHd0b29sLXRlc3QtbGFk
+b2sxLml0LnN1LnNlMB0GA1UdDgQWBBTva47ARyx1kRrWDD9X9QK60b14SjANBgkq
+hkiG9w0BAQUFAAOCAQEAkWsA6bZZhjoVIL73BLyQ9vgZ33oey/wed0DzuGAJjJw8
+lFPoS1pO7dhSBGzoAqE6ZQAKgnt/1TERx6QsRCAV7zK2KqxDty+4UbHBgm/44zx/
+0xf68ag4URas3zoVT8iNf0/CcuZAbQ07pDO2fN0utS7vj9XuTyyViu4rMXhilNNw
+q1zkyPJTFmWA+NnWjVQrbM4Z6TJd4ImhLcItPySQDol17n7NCIWOUWIxWGjSX6Xu
+h3J6sZ7bOI4N1bWlNUIKoqzjWniHt0+6VwsmZ+XZOVgNnDkHQmta4y9/jmTbm4Vv
+fPPBQCZRQrV5zV0+mNOLgZEjYh4zXLJOA4dDFYq2gg==
+</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>lpwtool-test-ladok1.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lpwtool-test-ladok1.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJAMVcirJT+6VyMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHGxwd3Rvb2wtdGVzdC1sYWRvazEuaXQuc3Uuc2UwHhcNMTAwNDE5MTMxMDQ4
+WhcNMjAwNDE2MTMxMDQ4WjAnMSUwIwYDVQQDExxscHd0b29sLXRlc3QtbGFkb2sx
+Lml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Ri0W5ti
+3fLLdRMqqHTATq3B5kJ4Ys1pNbq/QXFrBtC6z9cvkkA0Bo4K4rMos5ddrwfkHWI+
+5PFJGRxeJnmzGR4S13pQ2xRTcrUKGxosnfYFUAG0y3ySDUjH/O4eU+nBmqQA5yRQ
+RYZ6O1sBN++soWRPSvDekiN5qUhjIbVKTriMPmgwWgB1NgpBuedU72l2mkakw/Eb
+X8lfkLs3gKlipttf4mHSc1OHrRGFvEfUiXQPtft4TURcSWF2w8ZF7OvOFaytQ5B8
+T1LGXx+meuzw36MSvsWiJ66mLTeCelrQmEIPNyTDU0PR8asUKI6wL3ZqW7fi/QdL
+x+OVozQUqLcpkQIDAQABo0owSDAnBgNVHREEIDAeghxscHd0b29sLXRlc3QtbGFk
+b2sxLml0LnN1LnNlMB0GA1UdDgQWBBTva47ARyx1kRrWDD9X9QK60b14SjANBgkq
+hkiG9w0BAQUFAAOCAQEAkWsA6bZZhjoVIL73BLyQ9vgZ33oey/wed0DzuGAJjJw8
+lFPoS1pO7dhSBGzoAqE6ZQAKgnt/1TERx6QsRCAV7zK2KqxDty+4UbHBgm/44zx/
+0xf68ag4URas3zoVT8iNf0/CcuZAbQ07pDO2fN0utS7vj9XuTyyViu4rMXhilNNw
+q1zkyPJTFmWA+NnWjVQrbM4Z6TJd4ImhLcItPySQDol17n7NCIWOUWIxWGjSX6Xu
+h3J6sZ7bOI4N1bWlNUIKoqzjWniHt0+6VwsmZ+XZOVgNnDkHQmta4y9/jmTbm4Vv
+fPPBQCZRQrV5zV0+mNOLgZEjYh4zXLJOA4dDFYq2gg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok-test.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok-test.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok-test.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok-test.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok-test.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok-test.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok-test.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok-test.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok-test.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok-test.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok-test.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok-test.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok-test.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok-test.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>