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-01.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-01.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..4a284184
--- /dev/null
+++ b/swamid-2.0/nya-01.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-01.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-01.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPwYgR6CsjGPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE0WhcNMjAwOTE0
+MTQ0NzE0WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5TJ2HeR12MlaXej3M175e4/weoUNk66v
+1FeLXTKUxfT48MlRPD2dhd3sY6tpGhTYNDwmKf6s9lsdX/2wxdS1ENvoDJ/hIzpb
+Vpu/mFgwI4vXdKUQeDVxDR1eQSG4XOg4nyZIDZET5rIyoAcyXPwhNVJyQ5+9mmvP
+DFdnNhqYu0VwxtuF8giBMyhFWS9QFplG81SvlGKvOqbELq75EfiIWyfPmyORYOSR
+Mu2eMgkj6+PiLq4bEDKThvh9xIH3Hp8KCdKiGKOG0Cc2U7rkypD0UKi9vZFmALgB
+uqsmMBeBvVMnbl2wdx4uce1oIW1dtGwG3ULugPs4XdclLLyXY3aCUQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSBmHtt7nt3dKH4X8JjOI4R
+O3BNFTANBgkqhkiG9w0BAQUFAAOCAQEASwoCR2dzFsE+Dxk/wkKynrRKmgg7krYl
+SlAww9cjVDCbAQ6iBRBf7mA1ROkIZx4W20vjDwcdaMiCznI+ck3jzuyxRxRS9SJX
+l4fd7T1d/9rprOx9i9NwvCqdr2F8tEwDoP58Gr0SEQHVN/5DYH/kKYP4g+xQXZ09
+Sv2aBxA656sg9Gc9FRsM4mqtl7TFCBvC5KbcdjshsZv0SkZfWbv7O25kPjfK4lUm
+LbyNgYmpjRDbkWW5vqu2DXFtgYTzlSACORrtoG4GJED4eUVuSWK6VlWLuqG8Pn3+
+ToS4LnOiGXb8UoxcQ1aZizxhluGj4cJwAZd9iT/w1O55nldLLYoh/Q==
+</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-01.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPwYgR6CsjGPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzE0WhcNMjAwOTE0
+MTQ0NzE0WjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5TJ2HeR12MlaXej3M175e4/weoUNk66v
+1FeLXTKUxfT48MlRPD2dhd3sY6tpGhTYNDwmKf6s9lsdX/2wxdS1ENvoDJ/hIzpb
+Vpu/mFgwI4vXdKUQeDVxDR1eQSG4XOg4nyZIDZET5rIyoAcyXPwhNVJyQ5+9mmvP
+DFdnNhqYu0VwxtuF8giBMyhFWS9QFplG81SvlGKvOqbELq75EfiIWyfPmyORYOSR
+Mu2eMgkj6+PiLq4bEDKThvh9xIH3Hp8KCdKiGKOG0Cc2U7rkypD0UKi9vZFmALgB
+uqsmMBeBvVMnbl2wdx4uce1oIW1dtGwG3ULugPs4XdclLLyXY3aCUQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMDEubGFkb2sudW11LnNlhiJodHRwczovL255YS0w
+MS5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSBmHtt7nt3dKH4X8JjOI4R
+O3BNFTANBgkqhkiG9w0BAQUFAAOCAQEASwoCR2dzFsE+Dxk/wkKynrRKmgg7krYl
+SlAww9cjVDCbAQ6iBRBf7mA1ROkIZx4W20vjDwcdaMiCznI+ck3jzuyxRxRS9SJX
+l4fd7T1d/9rprOx9i9NwvCqdr2F8tEwDoP58Gr0SEQHVN/5DYH/kKYP4g+xQXZ09
+Sv2aBxA656sg9Gc9FRsM4mqtl7TFCBvC5KbcdjshsZv0SkZfWbv7O25kPjfK4lUm
+LbyNgYmpjRDbkWW5vqu2DXFtgYTzlSACORrtoG4GJED4eUVuSWK6VlWLuqG8Pn3+
+ToS4LnOiGXb8UoxcQ1aZizxhluGj4cJwAZd9iT/w1O55nldLLYoh/Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.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-01.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.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-01.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-01.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-01.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-01.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-01.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>