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.testb.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml
new file mode 100644
index 00000000..4054c580
--- /dev/null
+++ b/swamid-2.0/www.testb.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.testb.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.testb.universityadmissions.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.testb.universityadmissions.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>www.testb.universityadmissions.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.testb.universityadmissions.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDYTCCAkmgAwIBAgIJAKCp5PactoVWMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
+BAMTIXd3dy50ZXN0Yi51bml2ZXJzaXR5YWRtaXNzaW9ucy5zZTAeFw0xMjA2MTgx
+MTEyNDFaFw0yMjA2MTYxMTEyNDFaMCwxKjAoBgNVBAMTIXd3dy50ZXN0Yi51bml2
+ZXJzaXR5YWRtaXNzaW9ucy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL17aPyf7P85FYjx8dWUN0/Re36zuNrMa/AH834NzAZHvYSFa2tqJwJ3bDL3
+xspNbHteBWWg8uzSCsLEjY8pyxa1W2JoziJUqs6yDguMCLgKw4aIn0C+QDlYvCIH
+p/CgyK1wSabdZwO/gYGSqsRWbQAt9ekB1Vb4hSKB1oe2n3acDVdpqQ7QqN/ygh0e
+ADRpBZUgJmOIJXqgjAaimINoKr6C5nksauSUcFG9jE6NM5OxUC18eJozza3VSyvR
+iBCCQR/gfkkYfMbYqs2bgvvJp9Bb379ALU/nmLXTYYKKjpkss8Tqcnd5zo9Ug66L
+YojXoPQTiPX4h/Ztl0J912u5zR8CAwEAAaOBhTCBgjBhBgNVHREEWjBYgiF3d3cu
+dGVzdGIudW5pdmVyc2l0eWFkbWlzc2lvbnMuc2WGM2h0dHBzOi8vd3d3LnRlc3Ri
+LnVuaXZlcnNpdHlhZG1pc3Npb25zLnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQU2sYX
+5cCdiCtTBI6SSqonLs7Ga54wDQYJKoZIhvcNAQEFBQADggEBAHb+Nw3yVFTujXGw
+hVunA8U/GYSxO09fbpfznOr+lu6onh1JmoRzo9KZLtybPwo7pG4UuYjZ6BFL/syd
+j5mYp9S9z/rVNFoOPwOPB+75yTz7W0JWyeGB4tmv2t9dUmahGYkASgufP91FhIjv
+bZRfbhmAcGOzBH+dQgtX8KrsWKJhLhycEpraEMheNCo2MsGTtCkgjRA9FT9BYnKB
+h88ksmL3tJCtzUidP5arZ0Jeou1HMgdU69Avp5Vcgec+79yfcBMdhvVPYhuEewRV
+OXby+4b8kS9dKf+yWvE6SBIlq4etX7nzJw/aPthRQvkvyaANQf8GhtLZFF4JgqQe
+Ozn4TSg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testb.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.testb.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.testb.universityadmissions.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>