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-30.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-30.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..804a19ff
--- /dev/null
+++ b/swamid-2.0/nya-30.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-30.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-30.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMNd1ScqbllRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU4WhcNMjEwMjI3
+MTYyODU4WjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6KU+c+CoR3+SoFgRLl4CnkEa3/AqMdTn
+FkfJGSjf96dgwnffTmvv6EmLyrsOg8jkFM4/Mjz/9TO4z8RRqGJHTgJK8TGve/+n
+AhxVGdPvoUsynk2MclH7MhzPBHdkiYDdtyOJCwER6YXTirIvLNEyrZlWyFSPTNoE
+0xOWEd+4AuUbUC0xdS6H0A9VpYGF2DN0KgJFFiutJm+ud8Zm3gNAp6cV/maJEt3H
+YjbYtxLnDfJLzY6E4Qxf4ke1xz1VqhT1j7M/+NYb+zezS2dUtlLK4cvBO3bMyuwz
+FdapV7vv1tP+aXopA3ZaRsy5GcFY0zG7nAq1r4f3M0x4l2HErqjdawIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzAubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBT98XvKkDyfqY3JUHqVKD15
+coPVUTANBgkqhkiG9w0BAQUFAAOCAQEAaPoG+HDhkqRh2aJp9aR4jp5NRYDNH4Sx
+Qlon8dHQQ7a2HmaIXNOfylCCpj94JdBC1nh8V0RvDMmNwntKi+NgzBF2yX/5CQbQ
+gVNOVvoycPYWAd8PjRUsqZOgYngu3pqQ3f1ggHE3Ja3AtMQf/V2KiQGp9xgewqUG
+gyY2dgGyzEFQPty9GaB8GI98Vg2gN4V7vW/2GbUo+ygn5+AzaNKX6M3LCZ0Dzb0s
+Laj4dZXOB7DCaqioXTJ2jBets1VNaSlrKqbDzL613Qw85qAdegE+ArVUNGPDBP+e
+fu+NS3DQCM8W/DUtyPBzIKRfEBXjcpZaL5iD2xmr+MEDPQ5oGoBRRQ==
+</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-30.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAMNd1ScqbllRMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTEwMzAyMTYyODU4WhcNMjEwMjI3
+MTYyODU4WjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6KU+c+CoR3+SoFgRLl4CnkEa3/AqMdTn
+FkfJGSjf96dgwnffTmvv6EmLyrsOg8jkFM4/Mjz/9TO4z8RRqGJHTgJK8TGve/+n
+AhxVGdPvoUsynk2MclH7MhzPBHdkiYDdtyOJCwER6YXTirIvLNEyrZlWyFSPTNoE
+0xOWEd+4AuUbUC0xdS6H0A9VpYGF2DN0KgJFFiutJm+ud8Zm3gNAp6cV/maJEt3H
+YjbYtxLnDfJLzY6E4Qxf4ke1xz1VqhT1j7M/+NYb+zezS2dUtlLK4cvBO3bMyuwz
+FdapV7vv1tP+aXopA3ZaRsy5GcFY0zG7nAq1r4f3M0x4l2HErqjdawIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzAubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBT98XvKkDyfqY3JUHqVKD15
+coPVUTANBgkqhkiG9w0BAQUFAAOCAQEAaPoG+HDhkqRh2aJp9aR4jp5NRYDNH4Sx
+Qlon8dHQQ7a2HmaIXNOfylCCpj94JdBC1nh8V0RvDMmNwntKi+NgzBF2yX/5CQbQ
+gVNOVvoycPYWAd8PjRUsqZOgYngu3pqQ3f1ggHE3Ja3AtMQf/V2KiQGp9xgewqUG
+gyY2dgGyzEFQPty9GaB8GI98Vg2gN4V7vW/2GbUo+ygn5+AzaNKX6M3LCZ0Dzb0s
+Laj4dZXOB7DCaqioXTJ2jBets1VNaSlrKqbDzL613Qw85qAdegE+ArVUNGPDBP+e
+fu+NS3DQCM8W/DUtyPBzIKRfEBXjcpZaL5iD2xmr+MEDPQ5oGoBRRQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.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-30.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.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-30.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-30.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-30.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-30.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-30.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>