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-34.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-34.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..657bcd3d
--- /dev/null
+++ b/swamid-2.0/nya-34.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-34.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-34.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-34.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-34.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-34.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPEqYuWyQ8g1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTQ1WhcNMjExMjEz
+MTQxNTQ1WjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArrNLM/FKIYTwkHrTEOjLqYlhhAJg7iWS
+7WTUFkh2nlhA4iDR4/GQw/yqAQWWotkI5S6dPCl4ZbVXth5j5vp6DubpGV58HRsO
+x1m9r3eKeHmK95TzyazgqbPawfUR1qe3hGVN1ad1J7tPR5T8/jBLWdxTrBZVMJZR
+LOiTSHfdz4KdODkqWqaeHyBxh3mulDpNf+ytllC9uyOV7qD+uBF9WViZnVqMh/B8
+ZOb74vRbvU8KOIVga9shbPUMegXot7IN1mhiuDVvmcYMc5PBTGe56M8toEn89z4n
+C1Llo8qafZA7g2lVPbAHyyNdZKoO/68khXlTm7z2Vs4mGNPV17hxvQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzQubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+NC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBR+uscChvQauczeC0kP
+80XBK6OIujANBgkqhkiG9w0BAQUFAAOCAQEAFnMvN0jc+3pzoiKfUS8hj/2AY4F3
+Stsjp6xqzlLCjJLrvtyjmQrLny44xuEzVUA/ptSFUJpBgRUo2ZemTPTEW5ImIAO4
+lTnNuyTfsJ3WS7dB6mw6tRdEKW7ECVkFvMLtK+GrZ4yvF40kM/Lf7PHARqsE9/r2
+uONP8RNcPjPXlxGWaJr4ZGEE6Np6vK7t8SE9KmyAxqDuJsSYSttm/rnxCxyJd2+Q
+gAQFMTUAce/nzKsaiT7Ln4EUErD+pBWI+gZUjJGJY/5X8WeKdckgK/EcIcptunhn
+/46cgE8tJBka35/XLdrnS66LA18NejHHcK3hNCeOoNgTRd0bs0QmuYIBXg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.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-34.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.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-34.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-34.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-34.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-34.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-34.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>