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

diff --git a/swamid-2.0/ni.nordu.net-shibboleth.xml b/swamid-2.0/ni.nordu.net-shibboleth.xml
new file mode 100644
index 00000000..e38b995b
--- /dev/null
+++ b/swamid-2.0/ni.nordu.net-shibboleth.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ni.nordu.net/shibboleth">
+  <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>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ni.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ni.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ni.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ni.nordu.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ni.nordu.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJANlBBCgOgwlrMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDG5pLm5vcmR1Lm5ldDAeFw0xMTA0MTQwODI3NTVaFw0yMTA0MTEwODI3NTVa
+MBcxFTATBgNVBAMTDG5pLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL3yI93uBoodiAVYq3LgjDjxoLPqiUdD96LtCFqsHA1FSBk0oNwL
+Ds26j97qJ0xf9zN5BcZJ7skEybGgzOJviSjfwjhEyKjtBuZAnTVlj/p5w4WwBP98
+quEstH2kUOE2h+y4ZcUhIVO+isTC3D8aUKCdToYgirBd0l6vrvu/jOzjcwStPlZD
+RMNji2G8X3+0DJReGZE/Q71z+3PW5YGxs5XwyISOy+5ImVATVbSNuhAy7IL2HnjJ
+nCvsTcCxIJULA0XRkgkR4TBY6PLfrCks6ocaSxG1N/iseWa/BtJUl10VsbFnf+J8
+u4bUsUXFaWn/kTCFSrINgPedjjSPgDDNfKMCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+bmkubm9yZHUubmV0MB0GA1UdDgQWBBR977QeQ6awdBrt4qPsFwhwWvg3tzANBgkq
+hkiG9w0BAQUFAAOCAQEAdUD+WtILbxxXQ5W4ulCsoZa3UtqI5muH9o2mE00btQh9
+R8OWlj9qJ9AydqgyCOSGHoEjqHNLroF7FfAuOb3MpbBEiErgVSN3UEmdSywIKEiW
+gyqNK2iFvtFdaZcO2nnuScdiaoRkmBhpw9oZwHq3rHU89SJtWl3PL9EEosj1lsRa
+eYppZPKEQBdp0EwzEX19XOvt8CJa3kOytBP4B/VgRLyEMIEGTIwYSjRdKapQ1Pt9
++PzGf18iwZX9g40T7HG/1x6tWRaN6Uo28suG0ZJ7DlNIN7XREiookNmDgbokPFRe
+gr3luWR80XE/BadEH5ou361kFDqBeuskbdr357QtCw==
+</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>ni.nordu.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ni.nordu.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJANlBBCgOgwlrMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDG5pLm5vcmR1Lm5ldDAeFw0xMTA0MTQwODI3NTVaFw0yMTA0MTEwODI3NTVa
+MBcxFTATBgNVBAMTDG5pLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL3yI93uBoodiAVYq3LgjDjxoLPqiUdD96LtCFqsHA1FSBk0oNwL
+Ds26j97qJ0xf9zN5BcZJ7skEybGgzOJviSjfwjhEyKjtBuZAnTVlj/p5w4WwBP98
+quEstH2kUOE2h+y4ZcUhIVO+isTC3D8aUKCdToYgirBd0l6vrvu/jOzjcwStPlZD
+RMNji2G8X3+0DJReGZE/Q71z+3PW5YGxs5XwyISOy+5ImVATVbSNuhAy7IL2HnjJ
+nCvsTcCxIJULA0XRkgkR4TBY6PLfrCks6ocaSxG1N/iseWa/BtJUl10VsbFnf+J8
+u4bUsUXFaWn/kTCFSrINgPedjjSPgDDNfKMCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+bmkubm9yZHUubmV0MB0GA1UdDgQWBBR977QeQ6awdBrt4qPsFwhwWvg3tzANBgkq
+hkiG9w0BAQUFAAOCAQEAdUD+WtILbxxXQ5W4ulCsoZa3UtqI5muH9o2mE00btQh9
+R8OWlj9qJ9AydqgyCOSGHoEjqHNLroF7FfAuOb3MpbBEiErgVSN3UEmdSywIKEiW
+gyqNK2iFvtFdaZcO2nnuScdiaoRkmBhpw9oZwHq3rHU89SJtWl3PL9EEosj1lsRa
+eYppZPKEQBdp0EwzEX19XOvt8CJa3kOytBP4B/VgRLyEMIEGTIwYSjRdKapQ1Pt9
++PzGf18iwZX9g40T7HG/1x6tWRaN6Uo28suG0ZJ7DlNIN7XREiookNmDgbokPFRe
+gr3luWR80XE/BadEH5ou361kFDqBeuskbdr357QtCw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ni.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ni.nordu.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ni.nordu.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni.nordu.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ni.nordu.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ni.nordu.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ni.nordu.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni.nordu.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ni.nordu.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ni.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ni.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ni.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ni.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ni.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>