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

diff --git a/swamid-2.0/hubbletest.ladok.umu.se-aws-sp.xml b/swamid-2.0/hubbletest.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..e5ad3a10
--- /dev/null
+++ b/swamid-2.0/hubbletest.ladok.umu.se-aws-sp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hubbletest.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>https://hubbletest.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>hubbletest.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hubbletest.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAM5xCO8etNExMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1MVoXDTIw
+MTIwNTEwMjQ1MVowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZBNax9hbTmSFMa1tyqf2x
+pO+LvZvp8cmd/pthY7wx1hEq/zQ4aCESQhatTg0vHe1V7TTpLx18VSp2JpvjFUq2
+PH5JfPV4qukzMtrTfmOtXLacp785o1Qo/Vy1uUEs0397a9hIfgGkT82jYkU0nNe2
+E4z90m/vVLnn5gWlQgAJ8g1hiwahZfEpnxGG1+5+ffge7Uf1O6LblI7covNpVUid
+012lhQcqCocv32b4biCnJEEJ082o7qz0dKzFtDUQ7m3wld65NgAJi9MhQHEMPF6O
+dxGTTRLg/VxhUdIKos20OPa1zsFbMXu45Jgn9xAgp/9j/SCHvQ9I3mM4sGd0asBL
+AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2h1YmJsZXRlc3QubGFkb2sudW11LnNlhiZo
+dHRwczovL2h1YmJsZXRlc3QubGFkb2sudW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQU
+CbwIjkYHopEO5fqkOYeeZLCjCF4wDQYJKoZIhvcNAQEFBQADggEBADvxJ5lUZXFq
+46MOfG2w/XiRwnEJWZe5bqUum3XsdsSN7qEAhE0joe5BvFgran9JQygZnOiNworx
+o2XU0Wqm76BEvKS0la5SZRlLA2QMndR3IA45BZfBm3Qpqi8HH7Udc2JfZGNrMuin
+aBPrGMjEKKfqPVXWCMkpvM+8I3eUnqzt5rw6XIaWDzlHPCdPmKHlHH3cboZ41lDA
+o004uPuSEWzw8iAJONm77G1BLQctlKYyvvJaDtPq9UoLi5uLI1JQIWfHoDhtBfGe
+ijYpfmjFyi/A92GHFRNjE4QVGRR8kecHx0uC6ueWEXBXyxndSxTR9EPpCI9e6YNY
+DWzZe2mHU5s=
+</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>https://hubbletest.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>hubbletest.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hubbletest.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAM5xCO8etNExMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTEwMTIwODEwMjQ1MVoXDTIw
+MTIwNTEwMjQ1MVowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZBNax9hbTmSFMa1tyqf2x
+pO+LvZvp8cmd/pthY7wx1hEq/zQ4aCESQhatTg0vHe1V7TTpLx18VSp2JpvjFUq2
+PH5JfPV4qukzMtrTfmOtXLacp785o1Qo/Vy1uUEs0397a9hIfgGkT82jYkU0nNe2
+E4z90m/vVLnn5gWlQgAJ8g1hiwahZfEpnxGG1+5+ffge7Uf1O6LblI7covNpVUid
+012lhQcqCocv32b4biCnJEEJ082o7qz0dKzFtDUQ7m3wld65NgAJi9MhQHEMPF6O
+dxGTTRLg/VxhUdIKos20OPa1zsFbMXu45Jgn9xAgp/9j/SCHvQ9I3mM4sGd0asBL
+AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2h1YmJsZXRlc3QubGFkb2sudW11LnNlhiZo
+dHRwczovL2h1YmJsZXRlc3QubGFkb2sudW11LnNlL2F3cy1zcDAdBgNVHQ4EFgQU
+CbwIjkYHopEO5fqkOYeeZLCjCF4wDQYJKoZIhvcNAQEFBQADggEBADvxJ5lUZXFq
+46MOfG2w/XiRwnEJWZe5bqUum3XsdsSN7qEAhE0joe5BvFgran9JQygZnOiNworx
+o2XU0Wqm76BEvKS0la5SZRlLA2QMndR3IA45BZfBm3Qpqi8HH7Udc2JfZGNrMuin
+aBPrGMjEKKfqPVXWCMkpvM+8I3eUnqzt5rw6XIaWDzlHPCdPmKHlHH3cboZ41lDA
+o004uPuSEWzw8iAJONm77G1BLQctlKYyvvJaDtPq9UoLi5uLI1JQIWfHoDhtBfGe
+ijYpfmjFyi/A92GHFRNjE4QVGRR8kecHx0uC6ueWEXBXyxndSxTR9EPpCI9e6YNY
+DWzZe2mHU5s=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hubbletest.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>