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-26.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-26.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..49a81b31
--- /dev/null
+++ b/swamid-2.0/nya-26.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-26.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-26.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-26.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALp4R33XExfvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTE3WhcNMjExMjEz
+MTQxNTE3WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqX2WYVXnZ96yShE0LWkOazS1RSJCkDVJ
+lyBMVBkt/Lo+N9iCgbCqRI2/evcF8OLBt5qy8pk97LZDh6Wy3qXtIXooEiUWH2pH
+iHsQQOCEa+YRIUE5L70ZamRG/AeoqpXBwnAfk1OUy1i+B7NO7uZt4VX9Y3Ttazb4
+6njnuWaNcVPCQo3HPfSaTeu76bx8ell97T0x4biYUi4/UcMDqQSrHXPyTDmCqcft
+4u2LZtJftFoialBPZErISoxs2Eyuky4xjQL2UH8CK0ro2Xx62T+6AOKd1kNoSFN/
+bztW/5M3+GNQtCZvDUKr/qt6lElMYbNR+1JhIZJsLGVZylmAzHJfuwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMjYubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
+Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTjXrOVbu1q1pc9HAtK
+FTf5reWyrDANBgkqhkiG9w0BAQUFAAOCAQEAcKjLV9sBDcLAYXLmnrtqpOZB+z48
+iF3UIn+kdWSL8zvnic5XlaK5zUYPQe76gICzDYXSCEYX5cidtliNvx21X2BjHM0Q
+mqU+DAtx2jMwib7Q3bG+5T8dX0D35/9vbak4EeLApAL1TkNq4NCCoqNqvYWE1fHo
+dyF+YgxLywhY4sZwz+KURwPeIqrqA7IYwb4uBtF9P0Gn9w5xfz5ujtAfUZKyhjma
+8vh/0Jzd+DEPKaqHGtsHQEPjhXP7ZqK5PAnAJ6CorBK4FgJu/EOGTcC3A4MXEoYq
+EN4xy84V9WE+bDj8Xp32IHk94hqWVgyHdCSTn37MxRLuMwE/Nof5YXRdSg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.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-26.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.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-26.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-26.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-26.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-26.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-26.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>