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-25.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-25.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..016ac579
--- /dev/null
+++ b/swamid-2.0/nya-25.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-25.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-25.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPyhXHCVywzcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQyWhcNMjEwMjI3
+MTYyODQyWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6kngf3uludc3rumLrFUX+8OQA5Z3gvC3
+TGfcWvPjpnF0mMvQt8lpB4Ctfg91IT3ogv9igZRvAyvEcyVNhQJHLpfK7oyeYeX2
+NBh8bYXhddYmrA4EgFyfpCHSavmleryM6yBV6PsdnatrL0B2for1lU2hbwqoZJyR
+zxer9xaFmeGe6tL2OcwYQfRGrPqKGeMd4qd0LYZ/ci0L90Mf4QDsZn1RuPLR8NkA
+nT9zuWaminu7+R37wP7YG86CLbbyR5mvPGyhR71at5Bbuash3F3iX3NfCFoRTV4Y
+ZUC/TahoCve1XWyT/wPomATKx5BLvaO8tHg7Cn3+5fU75XrSt57GzwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjUubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSL7XIkNrGrilg9Oc3VoNVY
+v5+wdTANBgkqhkiG9w0BAQUFAAOCAQEA1NNPHf278DOaknm7oixU9BYlCj4Xo48J
+tYX+aIkEZgSoC4lZKj5Aa5HZmPxYBha0Of9PnDf5CyFsOSZ6uzIBA+kK4M8fdsTm
+3cXDwoGktFHV6tPREKcM3y7vjzRj1NP4f5zmIRett0mGM2117hNxGbQ02ihr6r6G
+nfY+6KZTveW/1DOzr7X68zbFGS0+B2Kah6f2jzYuJcMsez86aurqjs1I7JG6wMEP
+gXBqbiL4/Fcu3K0+U3yZzaEhqoG4tbRiLyEG9QJRXilJNoe+uMgnKdRta+25WfUp
+kwG5TATa/a2H9EktIQdtJ999AW7b5P2xNRlNMuJmKup0wQLEEUS9aw==
+</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-25.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPyhXHCVywzcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODQyWhcNMjEwMjI3
+MTYyODQyWjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6kngf3uludc3rumLrFUX+8OQA5Z3gvC3
+TGfcWvPjpnF0mMvQt8lpB4Ctfg91IT3ogv9igZRvAyvEcyVNhQJHLpfK7oyeYeX2
+NBh8bYXhddYmrA4EgFyfpCHSavmleryM6yBV6PsdnatrL0B2for1lU2hbwqoZJyR
+zxer9xaFmeGe6tL2OcwYQfRGrPqKGeMd4qd0LYZ/ci0L90Mf4QDsZn1RuPLR8NkA
+nT9zuWaminu7+R37wP7YG86CLbbyR5mvPGyhR71at5Bbuash3F3iX3NfCFoRTV4Y
+ZUC/TahoCve1XWyT/wPomATKx5BLvaO8tHg7Cn3+5fU75XrSt57GzwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjUubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+NS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSL7XIkNrGrilg9Oc3VoNVY
+v5+wdTANBgkqhkiG9w0BAQUFAAOCAQEA1NNPHf278DOaknm7oixU9BYlCj4Xo48J
+tYX+aIkEZgSoC4lZKj5Aa5HZmPxYBha0Of9PnDf5CyFsOSZ6uzIBA+kK4M8fdsTm
+3cXDwoGktFHV6tPREKcM3y7vjzRj1NP4f5zmIRett0mGM2117hNxGbQ02ihr6r6G
+nfY+6KZTveW/1DOzr7X68zbFGS0+B2Kah6f2jzYuJcMsez86aurqjs1I7JG6wMEP
+gXBqbiL4/Fcu3K0+U3yZzaEhqoG4tbRiLyEG9QJRXilJNoe+uMgnKdRta+25WfUp
+kwG5TATa/a2H9EktIQdtJ999AW7b5P2xNRlNMuJmKup0wQLEEUS9aw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.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-25.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.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-25.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-25.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-25.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-25.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-25.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>