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

diff --git a/swamid-2.0/nya-31.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-31.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..061afb18
--- /dev/null
+++ b/swamid-2.0/nya-31.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-31.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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-31.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-31.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-31.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKxhn4OjV3mfMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTEwODIzMTM0NjQzWhcNMjEwODIw
+MTM0NjQzWjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp20De30hR37Ei63X7J7M33q6VV5RY9BH
+dQdtqVYW9pMelKv2s38ZcwteQ3KH0WQt50f7pq9sXMHcYqTtkPz6PxRedYesIaf+
+rW9bibHsMzjNw+2RUkVYyN5HH0daIDUnYyX01Rj5ANaMjEoCzlmjlEQXnEq9+QiM
+CQAB8T7xzi0qAX2ixij8nGff4Uctcc+reqW6vFt+lwFSYEvn/lM7VGIJtZ8imrUR
+cLfiLQgKfvWzWVOnl4m1MBFUaxSGKuqQ1/4tUdO3VOjjXuszntLe5eIg9OFGgJxD
+qvLagdeAR1guMMHLjcj1Dt2/6KtRvzfYU8dKZciaF00pnyikAnLO/wIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzEubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRQUqPhsgCncjQkbhGvRaXo
+aHxSZDANBgkqhkiG9w0BAQUFAAOCAQEAeQS76KCkJi6Y3rOh31plrVND1pV57nyP
+nxaQYuHNd+J7s+TP9FMaP+iat6/gnnlTe/rLKJ54PCKcQI3YcjLd4TX45JL1iulm
+oAeY4H4sEBe06xtg8LZxyxgRd0GfsUO2X4qzexJZ7JUNmk916f2/mAW/ff/OO7c6
+BiuvGaKqNQWM8fCbAcPaO9kTwtOH6GRmaKRkUSgHzQ5WvirMr185XKWHVOSnHEzr
+yzEpJMRHKMR4oeByBm3dzcDS1he+MjX1/dwlxk5r9v4Qoex5EgXqu6V6bCOBoEJ9
+eSuhc4ni/xBH6cv/RIyt81eqFoj216n2KBlREVNbCYGYSIxwSuEpcA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.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-31.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.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-31.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-31.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-31.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-31.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-31.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>