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/nya-17.ladok.umu.se-aws-sp.xml b/swamid-2.0/nya-17.ladok.umu.se-aws-sp.xml
new file mode 100644
index 00000000..a4758fe2
--- /dev/null
+++ b/swamid-2.0/nya-17.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://nya-17.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://nya-17.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIc/FExfYq+AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA2WhcNMjEwMjA4
+MDYzMDA2WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxoTPC9BSjlUw89mL0/2CBs8CMmI1iVwq
+1D1e3CoTUydpJ8CnJiSk6FHXhVsU5JbHFx5fecvDzcoXz73HeZR1y6niE/5IHuID
+AZs3Gpt+stRLDj14Dz0e0W645KV2LXat2AJWvCFsgBeVjmV06ySGv7M8Gu/VVlUs
+2pplhhvYkIW/dQziTN9zsPrxE6rg5x69xfkCJxFZxIKiq5wTzkGxmEItoJEC2Z44
+lSsEfqPfs4qq5Ga/D5bVaMYX6ZLGfCTnaIp2kQFepnbRx1kt5EDfwKcrBfIZiKDG
+MvsdzvjCRNftkdWI5pittlaUH+ZzhcyVto5XweaECyucQDxVWPuMjQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRW5LeNB9A98NTsIeeUHjF2
+2GJuRTANBgkqhkiG9w0BAQUFAAOCAQEAPpUbzWGHQ6Ri70zXgOV7KfJqubC5nKoS
+1IkkGRBRUe5qbQoTnrapW16Xgy7QAu/c58NqoaDaz03VbNrBuX7lfpYPr3DtSx6o
+CbmyxBA2H3Wefugnv/d4ngRhJzol2btJyhGD5l1zCfrPgFsRMtgVVwNNlBHScCza
+HBAAgxdgK7nsZIfTCGbUVzsVnkRatFt9qE7DWK1Lzc8nh0eUXpmBF7BKgUoO70LB
+z4XDZ3jsIvDuHopN8NJCa0su9qNpzgZdN3afvgyqMTpYBdMvUG9i/mkgzY6wnj2J
+mBLbTEgd82FHOsjHBGCNpKLEtUeClgJQ1jt7hyFC5Z2prF954OXu7w==
+</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://nya-17.ladok.umu.se/aws-sp</ds:KeyName>
+        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAIc/FExfYq+AMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTEwMjExMDYzMDA2WhcNMjEwMjA4
+MDYzMDA2WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxoTPC9BSjlUw89mL0/2CBs8CMmI1iVwq
+1D1e3CoTUydpJ8CnJiSk6FHXhVsU5JbHFx5fecvDzcoXz73HeZR1y6niE/5IHuID
+AZs3Gpt+stRLDj14Dz0e0W645KV2LXat2AJWvCFsgBeVjmV06ySGv7M8Gu/VVlUs
+2pplhhvYkIW/dQziTN9zsPrxE6rg5x69xfkCJxFZxIKiq5wTzkGxmEItoJEC2Z44
+lSsEfqPfs4qq5Ga/D5bVaMYX6ZLGfCTnaIp2kQFepnbRx1kt5EDfwKcrBfIZiKDG
+MvsdzvjCRNftkdWI5pittlaUH+ZzhcyVto5XweaECyucQDxVWPuMjQIDAQABo2Uw
+YzBCBgNVHREEOzA5ghNueWEtMTcubGFkb2sudW11LnNlhiJodHRwczovL255YS0x
+Ny5sYWRvay51bXUuc2UvYXdzLXNwMB0GA1UdDgQWBBRW5LeNB9A98NTsIeeUHjF2
+2GJuRTANBgkqhkiG9w0BAQUFAAOCAQEAPpUbzWGHQ6Ri70zXgOV7KfJqubC5nKoS
+1IkkGRBRUe5qbQoTnrapW16Xgy7QAu/c58NqoaDaz03VbNrBuX7lfpYPr3DtSx6o
+CbmyxBA2H3Wefugnv/d4ngRhJzol2btJyhGD5l1zCfrPgFsRMtgVVwNNlBHScCza
+HBAAgxdgK7nsZIfTCGbUVzsVnkRatFt9qE7DWK1Lzc8nh0eUXpmBF7BKgUoO70LB
+z4XDZ3jsIvDuHopN8NJCa0su9qNpzgZdN3afvgyqMTpYBdMvUG9i/mkgzY6wnj2J
+mBLbTEgd82FHOsjHBGCNpKLEtUeClgJQ1jt7hyFC5Z2prF954OXu7w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.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-17.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.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-17.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-17.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-17.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-17.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-17.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>