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

diff --git a/swamid-2.0/ab11.ladok.umu.se-aws-sp.xml b/swamid-2.0/ab11.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..4ed32872
--- /dev/null
+++ b/swamid-2.0/ab11.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ab11.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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ab11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOCaztGZ1FrrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYxOVoXDTIwMDkxNDE0
+NDYxOVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDRzRpIX0nRMFbY219IoEhunPNjy03/qcqeENV/
+vief+gAS3eSmWepgQ8ngQJxjAUqqseXxT1W5ZKVpfd2eNg3idpwJwW1Xa2eQsaOe
+jgu3Ptr5FEBDVbmUuKAWcFtcUk4WdQ4IjMC6qORFjB25WmxRQ20R2jaBqCv49z/p
+ht2BL4dYSEPKCZCJA/hjo6FsaYIveVqdQGwYFAIj/39g1cpp9w7boGtJLD37XaI7
+JaKoN+EnP1Sq9yetQyko/p6sEsjCkQQRrVU6ErySuYOaRIJYIusorbNOSWvS9ylt
+INk5JFaohCn9jj0Rih432zspDLTHupqRUaNps28GwGmRycT7AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQULWShNWaZrLPvxq+V1AjCPjfJ9T4wDQYJ
+KoZIhvcNAQEFBQADggEBAEGf2WdD7qdP35sARV68g71Ug3RO0YQtdg9njx1oYDqK
+qy7JmnaYLJxmSHRgis6TwSBK+vRRAh7y3dPpzcuWE9uSiGeqlXTtQkNbCqyj5Gr6
+cqcwlDeoKlkR42EIhfTGmlHk2rMR4whucjp1mPXAPlk5ykaya0oo0V6O7nVe5vbn
+bjnIB/F6gl6TM3PhWbEvdG5x5Skk2jcxSMCJtSYlh62lgVNWBOtHjUs6aqEoYKqP
+lg+tX0k+HRXpzoB+G+aNTbp9BUWsEyQMUrgEG90rjIzji4uUb/GAK7tZaAYvJwjh
+oYFeawU7Xe3LvlxWUDeIcsiuvI+k/qLYiHGrvfEwMGg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ab11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ab11.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ab11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAOCaztGZ1FrrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFiMTEubGFkb2sudW11LnNlMB4XDTEwMDkxNzE0NDYxOVoXDTIwMDkxNDE0
+NDYxOVowHDEaMBgGA1UEAxMRYWIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDRzRpIX0nRMFbY219IoEhunPNjy03/qcqeENV/
+vief+gAS3eSmWepgQ8ngQJxjAUqqseXxT1W5ZKVpfd2eNg3idpwJwW1Xa2eQsaOe
+jgu3Ptr5FEBDVbmUuKAWcFtcUk4WdQ4IjMC6qORFjB25WmxRQ20R2jaBqCv49z/p
+ht2BL4dYSEPKCZCJA/hjo6FsaYIveVqdQGwYFAIj/39g1cpp9w7boGtJLD37XaI7
+JaKoN+EnP1Sq9yetQyko/p6sEsjCkQQRrVU6ErySuYOaRIJYIusorbNOSWvS9ylt
+INk5JFaohCn9jj0Rih432zspDLTHupqRUaNps28GwGmRycT7AgMBAAGjYTBfMD4G
+A1UdEQQ3MDWCEWFiMTEubGFkb2sudW11LnNlhiBodHRwczovL2FiMTEubGFkb2su
+dW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQULWShNWaZrLPvxq+V1AjCPjfJ9T4wDQYJ
+KoZIhvcNAQEFBQADggEBAEGf2WdD7qdP35sARV68g71Ug3RO0YQtdg9njx1oYDqK
+qy7JmnaYLJxmSHRgis6TwSBK+vRRAh7y3dPpzcuWE9uSiGeqlXTtQkNbCqyj5Gr6
+cqcwlDeoKlkR42EIhfTGmlHk2rMR4whucjp1mPXAPlk5ykaya0oo0V6O7nVe5vbn
+bjnIB/F6gl6TM3PhWbEvdG5x5Skk2jcxSMCJtSYlh62lgVNWBOtHjUs6aqEoYKqP
+lg+tX0k+HRXpzoB+G+aNTbp9BUWsEyQMUrgEG90rjIzji4uUb/GAK7tZaAYvJwjh
+oYFeawU7Xe3LvlxWUDeIcsiuvI+k/qLYiHGrvfEwMGg=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ab11.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ab11.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://ab11.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://ab11.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ab11.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://ab11.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://ab11.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>