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

diff --git a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
new file mode 100644
index 00000000..6f23e667
--- /dev/null
+++ b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.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.universityadmissions.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.universityadmissions.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>www.universityadmissions.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.universityadmissions.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDRzCCAi+gAwIBAgIJAPXTNM83oP+DMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG3d3dy51bml2ZXJzaXR5YWRtaXNzaW9ucy5zZTAeFw0xMjAyMTMwOTUxMDFa
+Fw0yMjAyMTAwOTUxMDFaMCYxJDAiBgNVBAMTG3d3dy51bml2ZXJzaXR5YWRtaXNz
+aW9ucy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/i8atiZRz6
+tGlOqjfywbRHg3BN22NXS0GDOCL7N7Ges+27Cir2X6cKxgkvkmIYTKM/CwxBpbVA
+6aCzwJR0aiwF7Yk+iCd+lZN1UZ+zqGAwVaYFWwJvJj9Pml1JBKtrI2UtWD6giUO1
+M4ADSc+v8c2GI99XuqicJ7RshRFfptzMgQD1EHzXrqcAWKWKcgk0cE7Im7i+Gf8t
+vqIGfWXTyQz/vLRN9TEuqC5lWUpxQthyydCfUxoNhVuP5r2C5f+xNspEmLXGCGy/
+LqPp8Qzti+A2ep93ycTYQ7UWsREjIc7mSSxJA2yNR0KiXAwhqCMEi2K2ifB5vQiA
+nw2d9qprbI8CAwEAAaN4MHYwVQYDVR0RBE4wTIIbd3d3LnVuaXZlcnNpdHlhZG1p
+c3Npb25zLnNlhi1odHRwczovL3d3dy51bml2ZXJzaXR5YWRtaXNzaW9ucy5zZS9h
+d3Mtc3AtZW4wHQYDVR0OBBYEFDCP8QQn4b49RQahrkPcr6O5x69eMA0GCSqGSIb3
+DQEBBQUAA4IBAQBx6LWrsGdO0RGf/p1gPt1Ss9x6FwqzFflqEwr1ogN9eLl+0svq
+r170nch935DrVqLU6v1CpMaCXrx2IG9OY3f9+JIU0xWCfjDwv8/l9JQ29cCZMBG5
+cer8XBtDmhZn/VZcCxD+E1USlg2kZdITY1PVH9V7BMNvGgAHFhWeGeSHPVNb6y0W
+j18Hf2KbZy+9Zod8DFQKzznA4j5qqAjX+4JsaXpJjcw2pteRbz6GwOWbMTDQYqc0
+UVO3Je8b81cYnxOzkTjcC46OOnwfKMCulFfBWoiza3xbuiS+Iv/lBbEPdRVN4HKa
+kLtKCIiImX90JFDcYwMMQyXM3dXWrJFi7exA
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.universityadmissions.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.universityadmissions.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.universityadmissions.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.universityadmissions.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.universityadmissions.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.universityadmissions.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.universityadmissions.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.universityadmissions.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.universityadmissions.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.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.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.universityadmissions.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.universityadmissions.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.universityadmissions.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.universityadmissions.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>