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

diff --git a/swamid-2.0/nya-48.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-48.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..e5662104
--- /dev/null
+++ b/swamid-2.0/nya-48.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-48.ladok.umu.se/aws-sp-en">
+  <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://nya-48.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-48.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-48.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-48.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKqMDl9k8exfMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS00OC5sYWRvay51bXUuc2UwHhcNMTIwMjIwMTIxMzQ3WhcNMjIwMjE3
+MTIxMzQ3WjAeMRwwGgYDVQQDExNueWEtNDgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3sEZxNqp5b8LIKWuxz4Tm8gc4WSvh8va
+d+uY27pWwZThUYPPVcghjx1PknTiu0Guk/hx0R6au49ISk2OPkn50zQZz3ZTEmfq
+QYuqsRFWqEIhPQh5pMp41pW5l93p3iQ4UxDd3MVYYut3+XOrM5V+E4ITE32hWSj7
+zGNlEAwY3/z4perUrHrlBURtPe2VPtJRgrWHUU1zZTyZj9JXKFTovYnoND30IW+l
+ypgHYd2nIEkg0ipnggBT5eAbWCfRHh6Hn0x6HwKjxvciGmRP/yQ0+A1iB+p7gKjo
+Ht+Rh+4Nim2Q3bS8M6sr7R6El0MA5PCYvzQIZGODa0qRcfw9g1gs1QIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtNDgubGFkb2sudW11LnNlhiVodHRwczovL255YS00
+OC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSJ0nbp3OFnKGbwbldL
+n2a+JedT8TANBgkqhkiG9w0BAQUFAAOCAQEANwWlJk9kNjgdiglNoI3+peHPpqJi
+EfOVP10VNSFJYWxww3G1YIUmABDF5z1/4z3OSbBi/sTbPM5LkrXITpZO1OoGRAPR
+7MufE3ZtwBkMKUuK2kT8RiBIHvHFFVl7DEJYGJIz+EG6XetkRRvQq8IuduTsro3+
+7ropOdBs0K7X9GV9IhCjCOyJeawAlRn0NB1L4bmKDfbJhxDLcGV6LxRrsVy7mcfl
+bp4cVLZwNNktOTYIP7rHzxthFF8fpi0846X/j/HkFRAfdv51Tz74KwJoZ8a3dC4n
+Ld+xpeD/skZA/APgHC4KyHTCFax4Bef7uRlKqxjhtnbjJgnBaduKEc4OgA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-48.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>