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

diff --git a/swamid-2.0/nya-12.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-12.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..e5278d11
--- /dev/null
+++ b/swamid-2.0/nya-12.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-12.ladok.umu.se/aws-sp">
+  <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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-12.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-12.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-12.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO0W/XGdFVEaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODM4WhcNMjAxMTIx
+MTIxODM4WjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQ8oGOYvUseq+VwmjcD9KrTE0a6FYIcP
+L6f+HNg8onJIaIJoacq/XbslAP5M7+w4feV6sd6Nl5nnj7xzpN8SabN3kcxDhPtx
+8P+uWTSP4NYYCaPoI257mdgtAZVgU8VyjMaw/GkuIX7LtMWkECCp5gjhxsxCkUm8
+epWi5QMND0IpBuITwgyY5IdeJKf2VkxpVGetN4HLqGX4KwoA8SGa5Rq1tnkiq3Sc
+a7sfVkpZH0pZ1BL2rypzKyIaVRegh3rP0SAoDQxzk4wPd4RRIVHDrjjJ0nVBvLFp
+bmBXHYGcz9CcCtGx2hQ0Ks0T/Ecz6yMSj0HiROPzkvcnYNucwKIFhQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTIubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSK1oIfKBcJO3wMC41DGAmm
+VJ2tiTANBgkqhkiG9w0BAQUFAAOCAQEAWAhjUaqOxVHmtIvVV9EOj1fKo2J6nVPY
+a6eMz/D6zBuB6a65rkRp/6Ir455NBUN2MF9tCfS8aZrJm8UYeuzk7Bjvx9iBIO7O
+UljvJejwLRtcGlavyz71FcvLTUOV7lOYVt+xK0F4OoXeIUiKrhxoMFAlnf/3Qx9Z
+vJIAFf3qNg2amoQ9xja/pXJj7HsDCdEOIqhSeoqxP1Zgu/reJqCd/HSo//pC+Xxz
+c6AoJcfbdF3MmvViMoItA13RZPg5pr7SFdho8t+FKNoW/e0+J6l7+bRUthKCh92f
+Az4j0CNfaNbS78KQQcfiQxuTx9K1tyVdN42+LYD2jnfsXb9o8SbMGQ==
+</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>https://nya-12.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-12.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-12.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAO0W/XGdFVEaMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTAxMTI0MTIxODM4WhcNMjAxMTIx
+MTIxODM4WjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQ8oGOYvUseq+VwmjcD9KrTE0a6FYIcP
+L6f+HNg8onJIaIJoacq/XbslAP5M7+w4feV6sd6Nl5nnj7xzpN8SabN3kcxDhPtx
+8P+uWTSP4NYYCaPoI257mdgtAZVgU8VyjMaw/GkuIX7LtMWkECCp5gjhxsxCkUm8
+epWi5QMND0IpBuITwgyY5IdeJKf2VkxpVGetN4HLqGX4KwoA8SGa5Rq1tnkiq3Sc
+a7sfVkpZH0pZ1BL2rypzKyIaVRegh3rP0SAoDQxzk4wPd4RRIVHDrjjJ0nVBvLFp
+bmBXHYGcz9CcCtGx2hQ0Ks0T/Ecz6yMSj0HiROPzkvcnYNucwKIFhQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTIubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Mi5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSK1oIfKBcJO3wMC41DGAmm
+VJ2tiTANBgkqhkiG9w0BAQUFAAOCAQEAWAhjUaqOxVHmtIvVV9EOj1fKo2J6nVPY
+a6eMz/D6zBuB6a65rkRp/6Ir455NBUN2MF9tCfS8aZrJm8UYeuzk7Bjvx9iBIO7O
+UljvJejwLRtcGlavyz71FcvLTUOV7lOYVt+xK0F4OoXeIUiKrhxoMFAlnf/3Qx9Z
+vJIAFf3qNg2amoQ9xja/pXJj7HsDCdEOIqhSeoqxP1Zgu/reJqCd/HSo//pC+Xxz
+c6AoJcfbdF3MmvViMoItA13RZPg5pr7SFdho8t+FKNoW/e0+J6l7+bRUthKCh92f
+Az4j0CNfaNbS78KQQcfiQxuTx9K1tyVdN42+LYD2jnfsXb9o8SbMGQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-12.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>