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, 61 insertions, 0 deletions

diff --git a/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml
new file mode 100644
index 00000000..23ada522
--- /dev/null
+++ b/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.testa.universityadmissions.se/aws-sp-en">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <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:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.testa.universityadmissions.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>www.testa.universityadmissions.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.testa.universityadmissions.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDYTCCAkmgAwIBAgIJALaHWD91lN/0MA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
+BAMTIXd3dy50ZXN0YS51bml2ZXJzaXR5YWRtaXNzaW9ucy5zZTAeFw0xMjAxMTIw
+ODUyMTJaFw0yMjAxMDkwODUyMTJaMCwxKjAoBgNVBAMTIXd3dy50ZXN0YS51bml2
+ZXJzaXR5YWRtaXNzaW9ucy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALbfTMa6QUT6f3OMkFHSpDQFwuEc9lU5jq3t4VJZXJjbYtRe1wq6P8NAPE0X
+iE+GGm+E3rO7D6XlRNUSMhYCByL5sF8fcuU8mv/dnyrktSt6Bpznys7nkG+tZ3G1
+BqFbNRkn4RqhS7f2DcyRDENIfpVX+8kqI9AtHhcvr2c94jHjeXezTSSSt104eb5F
+k2hqUx3F+8G4VH3QPXPxm24k9ka1QY8c3362OOJEV7X/TBg444AM/l/Et/NxI47j
+s0XOHw9ThUNx/MCdd80xGA62hmwIu+iewstfgmvSp8Y9+0sUEXtTcwrJi7/GFJ2a
+9P8OlIfZ+XM8a6s9wn1U1us+boUCAwEAAaOBhTCBgjBhBgNVHREEWjBYgiF3d3cu
+dGVzdGEudW5pdmVyc2l0eWFkbWlzc2lvbnMuc2WGM2h0dHBzOi8vd3d3LnRlc3Rh
+LnVuaXZlcnNpdHlhZG1pc3Npb25zLnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUrWWQ
+AHLNSBUZDheT8ClXNWdru0cwDQYJKoZIhvcNAQEFBQADggEBAFwOmKvbegaxrx6k
+xnrA6maO2O6r5CMKtinTFu1E5IdkEh+FesDl7X8T1ccy6bkGBAg4L3Vd1J6GfoNy
+7wPoVJsL+DwFZ8LUccweI8PDBmrTx3z5ji3fdiYhBNCbu8x/jJ7D8zfd6WCnRmmP
+hzQNYoV1JN8UBP5Rs1YaXJHBKSw0lkU1sf/esYTJdBA1hmloykA6P45Qez92pHdl
+uVnNfkBr7UdYjz8IiPTitv+Yn7FUuXSacFejhLoHOeeskNdYJ3W4CtY9kB2FO4cF
+TEgTnrYK7hYZuU8O+wJUDDJkahZN9Kuf56JVejRBQZZ6mpVdMHs/Mj2XzxpHlDTe
+aERyA2E=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>