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-10.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-10.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..81b0b13c
--- /dev/null
+++ b/swamid-2.0/nya-10.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-10.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-10.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPx+QPPWsNFUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM5WhcNMjAwOTE0
+MTQ0NzM5WjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+BJW+zN2mSSbkBzMB9nWRf2R4iz3WAuL
+5B9U7eOY+hY2H/47l6CMb6SLi/X2mwWNcd7l7rEI4HhsfXZwh0iKS1UKZnIn17OJ
+5Gvh0DfqMMdYS9/d19dTcuR6Qf3DuXEaCM7Y09Mu2RS+X8CAiZP3XCy51vNKahWR
+naIw+Bd2RyGqF3STPibD61zgp8pVLhXqNXQFWMYQreJ/KS0QTDO9xG/moNMQGl4y
+hBIYqT3RA+/6mjsFElflkpkXGdcjUO7PL2L2vMwtZ/HevtUztPJHwNrqYNp67NCx
+hJEoieVI3SJyj4smC3Kwq0UggrSDK85Dxjz+03Zipy2h00+n6jdOrwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSWnI4NkPSjVmtWZ+nOvuDQ
+GkxwZDANBgkqhkiG9w0BAQUFAAOCAQEAPMS3m82rmlJZ/RylQec408zyDCnKtziM
+FL2OB7DervL+mlA+IZFZmIfdxNBJVCSRqadoS5k0lh6E40j8lh21VJRxhRvG3ZIF
+vd0wDumfqROV5DIkL13O9hb5YNEG3kWbvjQBfafk7TgiESesQLnQlWIXRBH6q2Gn
+uu137DYDdqoH+CEBV7VxML6Ldq2//mpuBsvqvC0kmYfFQlBejWMBJJ/aDSkGls3N
+Wy2u1rwUbNZ4BvAFP6U6NXgk7TEbugelbA0/GA+GFYyEqbL4vhSr/zDwuSsE346x
+dXRc7dsG9+6oKEWsDp6tE9AUZKLjv6CG7javNjvgnZUnWhad6R4HlQ==
+</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-10.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPx+QPPWsNFUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTAwOTE3MTQ0NzM5WhcNMjAwOTE0
+MTQ0NzM5WjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+BJW+zN2mSSbkBzMB9nWRf2R4iz3WAuL
+5B9U7eOY+hY2H/47l6CMb6SLi/X2mwWNcd7l7rEI4HhsfXZwh0iKS1UKZnIn17OJ
+5Gvh0DfqMMdYS9/d19dTcuR6Qf3DuXEaCM7Y09Mu2RS+X8CAiZP3XCy51vNKahWR
+naIw+Bd2RyGqF3STPibD61zgp8pVLhXqNXQFWMYQreJ/KS0QTDO9xG/moNMQGl4y
+hBIYqT3RA+/6mjsFElflkpkXGdcjUO7PL2L2vMwtZ/HevtUztPJHwNrqYNp67NCx
+hJEoieVI3SJyj4smC3Kwq0UggrSDK85Dxjz+03Zipy2h00+n6jdOrwIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTAubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+MC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSWnI4NkPSjVmtWZ+nOvuDQ
+GkxwZDANBgkqhkiG9w0BAQUFAAOCAQEAPMS3m82rmlJZ/RylQec408zyDCnKtziM
+FL2OB7DervL+mlA+IZFZmIfdxNBJVCSRqadoS5k0lh6E40j8lh21VJRxhRvG3ZIF
+vd0wDumfqROV5DIkL13O9hb5YNEG3kWbvjQBfafk7TgiESesQLnQlWIXRBH6q2Gn
+uu137DYDdqoH+CEBV7VxML6Ldq2//mpuBsvqvC0kmYfFQlBejWMBJJ/aDSkGls3N
+Wy2u1rwUbNZ4BvAFP6U6NXgk7TEbugelbA0/GA+GFYyEqbL4vhSr/zDwuSsE346x
+dXRc7dsG9+6oKEWsDp6tE9AUZKLjv6CG7javNjvgnZUnWhad6R4HlQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.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-10.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.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-10.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-10.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-10.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-10.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-10.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>