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.xml b/swamid-2.0/nya-34.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..4882534c
--- /dev/null
+++ b/swamid-2.0/nya-34.ladok.umu.se-aws-sp.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">
+  <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:444/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</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>MIIDJDCCAgygAwIBAgIJAOmGG2zu/LcUMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTEwODI0MDcxNzQ4WhcNMjEwODIx
+MDcxNzQ4WjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhXItgwlQx4pV1KQt4D+CaXOQMYjKqkJ
+sqxi1AsKVUNMrsohfmI2ywx0wWgzN82QME1VIl5k7lUcJNRnXa8KhHXW8g7P5H/j
+uaWgg/U0ja2P/3lk1V5S31RBgP/x0OZUOrCj1gkXYx3TNTVTNzn2y+izlH122Qrp
+PlUD0gYlXVt8wQyNp35L2RlcBiD8KwlIl005u4r5WP3xwoZCXlC3qWFdOXCW0r38
+c0/GWt9KKWRl/vQczJsvC1YwhlsvkUWpar/bgGw1ahaR9536JI9IeqND11IziDIp
+oAJkX4EG90cpUDbU5hXiCllwMbH1P1g0YWQCesstwnxDc5Xn7D/eZQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMzQubGFkb2sudW11LnNlhiJodHRwczovL255YS0z
+NC5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBSNeRKWkCDwdCfwVfjNoqQL
+/pu1fjANBgkqhkiG9w0BAQUFAAOCAQEAE6h/WKqFFCJW9CdoNcO5E6s8oGC5tdrg
+qRcHlnRoZ7+cqnbaOPjlkDh/mYEytsitLINplX7QugO2tNbqZ7QxJUt8xE92Cr4V
+vluAC7TDcA+SnuRFwmgkOMbDS4sE0GVr5T+MLGsQ/uOf1cIff6DeNimZT+bQm3QG
+3bOwh4+417OCYCSUW8s+vPVxh30HnJ2de02XMyeY/107Hhdq3fr6hHibBkPgo2Hj
+uNj5mCpWi3flvKo1L0jj1k8OybqqsCz+0gXqkNEhZDOFYbsZaMaTe3TawDVSvDBE
+EKeWQcVdXArhEYNg4mL2ZyOVgbqXqyIBehWErGmPaklzzBZB/163RQ==
+</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:444/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:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:444/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:444/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:444/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:444/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:444/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:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>