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-28.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-28.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..f6cab3af
--- /dev/null
+++ b/swamid-2.0/nya-28.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-28.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-28.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANukgTJ/UqfnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUxWhcNMjEwMjI3
+MTYyODUxWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2q7hl8tp4XMHOkh+SDalGBhbnasx5Mr/
+MSdOcvaJ2W6G+ipRD380xWc5+0k+ZGg8tG3PxwRJ78z+TYxwaxcNTsMSGulkQc9Q
+HQWE4xpF3p8GxY9DZPpV0VM+saCk0WfxGB5G/StzTdWisPJ1U4iToB8L1yc8m3/U
+Cs0oMBVisvr4oydXsh5FloDFic/vH9XCCulCyKn9dRoJK0MtbspGs4IYOKkxwLA3
+yf/A0OroWURqw1P3n7IIgC9blG/du9u33AZliYa7WkNYZWE7RUL1KVne58qMoCyd
+ITnUAb2MUueDQzBjj4xao8EgH/UOcLTcJAraKqtxHnZgQkGuPDme3QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjgubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQHe+vF9fqOJ4qdjHO5BPsU
+SipYDzANBgkqhkiG9w0BAQUFAAOCAQEAcZac+RHR1Z6XmQwyrSwC+FkZc/CtZbee
+2ToeJn9s7+DoltZBCw2ffMyYdIj4rVxOrLEwrWuTvNttL+z1tDrfyKZMHqu9FOL4
+urWdsYhThw+5D+CyR+9DD3I4PYn95yJgF933jGM+yD2/2z8paN8hlvE+uAYFvBjo
+zzQvIS/cX4YzUmLIRSZs+jx6zK75DuELMKy1tE2Muhck0GB2g2MO/3uL4xrAiNAu
+l26jHRksp7Q5PZWohHAuLyYxLwc9L7+hi8N7aUWF4WxIHxCOENU/8hKQn+ntr9h5
+lpKuCN+a4Gm0GAOQsh4RpV42hZ1KvNvEq+qIHaCv9hXWb6oNhYFpjw==
+</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-28.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANukgTJ/UqfnMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODUxWhcNMjEwMjI3
+MTYyODUxWjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2q7hl8tp4XMHOkh+SDalGBhbnasx5Mr/
+MSdOcvaJ2W6G+ipRD380xWc5+0k+ZGg8tG3PxwRJ78z+TYxwaxcNTsMSGulkQc9Q
+HQWE4xpF3p8GxY9DZPpV0VM+saCk0WfxGB5G/StzTdWisPJ1U4iToB8L1yc8m3/U
+Cs0oMBVisvr4oydXsh5FloDFic/vH9XCCulCyKn9dRoJK0MtbspGs4IYOKkxwLA3
+yf/A0OroWURqw1P3n7IIgC9blG/du9u33AZliYa7WkNYZWE7RUL1KVne58qMoCyd
+ITnUAb2MUueDQzBjj4xao8EgH/UOcLTcJAraKqtxHnZgQkGuPDme3QIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMjgubGFkb2sudW11LnNlhiJodHRwczovL255YS0y
+OC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBQHe+vF9fqOJ4qdjHO5BPsU
+SipYDzANBgkqhkiG9w0BAQUFAAOCAQEAcZac+RHR1Z6XmQwyrSwC+FkZc/CtZbee
+2ToeJn9s7+DoltZBCw2ffMyYdIj4rVxOrLEwrWuTvNttL+z1tDrfyKZMHqu9FOL4
+urWdsYhThw+5D+CyR+9DD3I4PYn95yJgF933jGM+yD2/2z8paN8hlvE+uAYFvBjo
+zzQvIS/cX4YzUmLIRSZs+jx6zK75DuELMKy1tE2Muhck0GB2g2MO/3uL4xrAiNAu
+l26jHRksp7Q5PZWohHAuLyYxLwc9L7+hi8N7aUWF4WxIHxCOENU/8hKQn+ntr9h5
+lpKuCN+a4Gm0GAOQsh4RpV42hZ1KvNvEq+qIHaCv9hXWb6oNhYFpjw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.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-28.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.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-28.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-28.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-28.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-28.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-28.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>