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-09.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-09.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..fa86dcd0
--- /dev/null
+++ b/swamid-2.0/nya-09.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-09.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-09.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIADv/HieAD/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM2WhcNMjAwOTE0
+MTQ0NzM2WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWYwLlK/hQ8eCdGU3MdGfM6U80Cptqf+
+I1Hy+QdyZpUnQxJUSfDxVAxq4lJGdyuQzQZo7K+QTxPsyeVoFZkyQV8KLSmU//xr
+SKVKt6nN35pDuB3DvrUG6xeXo4ROJ6IAZP2p08SRiEOZ2chJLmnjpC8wCYxX7Jr7
+I6F7w576XOKaFJAPDMc+9clbk6je5KaBTe5xS0rVG325zExasRUYWTj+NXkzsEyT
+rNDRuLSukzUwMYCIRDlitU3WdQnHRU70/I1XWfxEtz7BvNMKmMebqfhBkEUpV1A/
+qdb8ejFR6l3dcxwiQkaJmSYErI7EAzRMxXaxjqpWlC0zPk7tysHsLQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR1Kfrhx7UIjYEDge0TBxf2
+9l96CzANBgkqhkiG9w0BAQUFAAOCAQEAIsKH+jc/Ru9CGPzqjBe2oF6Hr5dsAiV0
+atsSCoudFTmqbtqq5N/L41Vjl1qhBbKCaJWTpj1ybEmCurCY3P9F30ITkyZUAJG7
+qeEI1jBrH0UjaFePy28AZmBh1/joTkk+x4+/tdNTBcbbhOknGtIAAHJihPQAZHre
+MOHKZVNBjUkqbJggpa7VZVwZBDIZZzLCEBJs/nCzml0/lQSTM6UvEnZp7acRXB+n
+p4Gl/a9rNwn/rm+sxpbZG4fYGE4CNGRqdXGinUxCK8lDcZR9Q/ZIB3Tmdf3nqEMg
+O1wfhChOc7wNrN85/YHGnqWoHEF4T8x06phcm8zI0j4jJBePFZ7Tnw==
+</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-09.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIADv/HieAD/MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM2WhcNMjAwOTE0
+MTQ0NzM2WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWYwLlK/hQ8eCdGU3MdGfM6U80Cptqf+
+I1Hy+QdyZpUnQxJUSfDxVAxq4lJGdyuQzQZo7K+QTxPsyeVoFZkyQV8KLSmU//xr
+SKVKt6nN35pDuB3DvrUG6xeXo4ROJ6IAZP2p08SRiEOZ2chJLmnjpC8wCYxX7Jr7
+I6F7w576XOKaFJAPDMc+9clbk6je5KaBTe5xS0rVG325zExasRUYWTj+NXkzsEyT
+rNDRuLSukzUwMYCIRDlitU3WdQnHRU70/I1XWfxEtz7BvNMKmMebqfhBkEUpV1A/
+qdb8ejFR6l3dcxwiQkaJmSYErI7EAzRMxXaxjqpWlC0zPk7tysHsLQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDkubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+OS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBR1Kfrhx7UIjYEDge0TBxf2
+9l96CzANBgkqhkiG9w0BAQUFAAOCAQEAIsKH+jc/Ru9CGPzqjBe2oF6Hr5dsAiV0
+atsSCoudFTmqbtqq5N/L41Vjl1qhBbKCaJWTpj1ybEmCurCY3P9F30ITkyZUAJG7
+qeEI1jBrH0UjaFePy28AZmBh1/joTkk+x4+/tdNTBcbbhOknGtIAAHJihPQAZHre
+MOHKZVNBjUkqbJggpa7VZVwZBDIZZzLCEBJs/nCzml0/lQSTM6UvEnZp7acRXB+n
+p4Gl/a9rNwn/rm+sxpbZG4fYGE4CNGRqdXGinUxCK8lDcZR9Q/ZIB3Tmdf3nqEMg
+O1wfhChOc7wNrN85/YHGnqWoHEF4T8x06phcm8zI0j4jJBePFZ7Tnw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.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-09.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.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-09.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-09.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-09.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-09.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-09.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>