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-23.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-23.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..4cc25cc3
--- /dev/null
+++ b/swamid-2.0/nya-23.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-23.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-23.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANbg77cPnGZEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM2WhcNMjEwMjI3
+MTYyODM2WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxhH9acWrdKXqRaTkncTfzdWDFiwsyddB
+MeM6AZdLeOUT8bp1i4UDh388Tx8mj2h9G9Ih7T9TEHRehsU8WL/A64LuLEmCaO3a
+YcWYE9u20yPXalX98W+SqNq7CuhxVJLHVIayHR+iM1Qa0rvsWrBxMwFJWVocbgOu
+mseXFNlwhFCJFqXhkiC6s6GBQYw6L3e/CsArOpnPsoAQ2B2ldoWIG7keFN+NPmv2
+u9TR2/bb0LH6jOBmphH+BsvF9dnoagnWAFV20JHoW06gqYDMBWTOElvc8jRqm2za
+meFgYp3/aTQMVSlvHLZXt+Zbhnxxbu4JbTC3bi/SU1IhxXvL1OBdTwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjMubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPllnJxLu+OmPTLGSpcc2q
+fXPYEjANBgkqhkiG9w0BAQUFAAOCAQEAASmwzSeiFNVIEkdomh0mug9XdAli42Co
+djyoL5+EMO0GYqzdM0lv99sTWWk6VEwIn0qHRZmqbxZ+Cr32Rqc0V6sSkCtiVzf5
+iIsaRCBb53NFd1JjLAGsyTm7pbQTp+nt/eM9QLn3MELe6f897Y9TPJcaFOfqOuSw
+1oN2G9n1//65GYs8De0E8aKPJ8lLueOzwXA+KcgdpqJgyxCfWb/e5QMe77YKngB5
+WZDPkTH+If/IESR6HxMc2YFQ6YqDT0WfwVWhOIeZInre6nAycOA9uBtjYLhWtved
+/6CV2q2TLkNFEO7evEjnea6czBgrgQSL3NBVAtv/rIoH2e2vIrAmKg==
+</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-23.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANbg77cPnGZEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODM2WhcNMjEwMjI3
+MTYyODM2WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxhH9acWrdKXqRaTkncTfzdWDFiwsyddB
+MeM6AZdLeOUT8bp1i4UDh388Tx8mj2h9G9Ih7T9TEHRehsU8WL/A64LuLEmCaO3a
+YcWYE9u20yPXalX98W+SqNq7CuhxVJLHVIayHR+iM1Qa0rvsWrBxMwFJWVocbgOu
+mseXFNlwhFCJFqXhkiC6s6GBQYw6L3e/CsArOpnPsoAQ2B2ldoWIG7keFN+NPmv2
+u9TR2/bb0LH6jOBmphH+BsvF9dnoagnWAFV20JHoW06gqYDMBWTOElvc8jRqm2za
+meFgYp3/aTQMVSlvHLZXt+Zbhnxxbu4JbTC3bi/SU1IhxXvL1OBdTwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjMubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+My5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQPllnJxLu+OmPTLGSpcc2q
+fXPYEjANBgkqhkiG9w0BAQUFAAOCAQEAASmwzSeiFNVIEkdomh0mug9XdAli42Co
+djyoL5+EMO0GYqzdM0lv99sTWWk6VEwIn0qHRZmqbxZ+Cr32Rqc0V6sSkCtiVzf5
+iIsaRCBb53NFd1JjLAGsyTm7pbQTp+nt/eM9QLn3MELe6f897Y9TPJcaFOfqOuSw
+1oN2G9n1//65GYs8De0E8aKPJ8lLueOzwXA+KcgdpqJgyxCfWb/e5QMe77YKngB5
+WZDPkTH+If/IESR6HxMc2YFQ6YqDT0WfwVWhOIeZInre6nAycOA9uBtjYLhWtved
+/6CV2q2TLkNFEO7evEjnea6czBgrgQSL3NBVAtv/rIoH2e2vIrAmKg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.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-23.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.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-23.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-23.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-23.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-23.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-23.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>