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

diff --git a/swamid-2.0/ni.nordu.net-saml2-metadata.xml b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
new file mode 100644
index 00000000..eef0e705
--- /dev/null
+++ b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ni.nordu.net/saml2/metadata/">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAI32hx6m/IFWMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDG5pLm5vcmR1Lm5ldDAeFw0xMjA4MzAxMjAyMTFaFw0yMjA4MjgxMjAyMTFa
+MBcxFTATBgNVBAMTDG5pLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKIsfzWwYgW2y9+K58VQi35/weisNzGlYYJbpYY8+AqGhtkSpB8D
+z46HVvyZ1L6lgShGQ5fNUzB/zT9GuYnR1BbJMmz0t/XU1eLz1btyD11/DtL9FMm2
+c/FYPe9Srn9x0n6mtncZofWVeD+a8cdRoOOrLwjL25QGCfAPynSf0OdUraUM6qKt
+u4KGAK8FMDss8uLDaJjJVc1saeDg6NpvYralAY+CnyiuskLYhilmLb0tMu63+ma8
+XVtZV9bWPMyB1RnT9aRYXPL3GjiH/Pun1r74SsNP9M77RS7j3PD5Jf1wmPpIBZL0
+Dk6l3RnuVzK6D9zwTiAEDu3a+trzu5BzNMcCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+bmkubm9yZHUubmV0MB0GA1UdDgQWBBTPG/xsbxF7Q8OHyhUIktltkneGJTANBgkq
+hkiG9w0BAQUFAAOCAQEAI+gTmUEi7+iXxLJwhhnTm2w07fI8r/Rx3HXVQJ7fk0k9
+ZX+yVo16pG7uxzWu88w9urMpjlRMBV9xT7oE+7xuOppeSJbQpjxfYCArq/VD+Qr/
+WjzMRZMjN4LkL+s6m0f4ASItLF5MBXmStmxl5ZE0UajyR08i87sg9QcTVXBpyirr
+iRfdxDA4R+g0xwEZhpg2HbKRHeP8Uy/8SrOLYMFsblex5vc/96eZCOc88FlH1ydk
+zj16pWsjoYc1j+cnJBREpOJCeotrkBKte+OL1J5ku6e3qoQ+4Oyrsu4qhU/8geIo
+GtDqiUnI4ewwuxmNcK7kU1vUmBsiKlS5lyo8c+hpTA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ni.nordu.net/saml2/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni.nordu.net/saml2/acs/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NOCLook</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet A/S</md:Company>
+    <md:GivenName>Johan</md:GivenName>
+    <md:SurName>Lundberg</md:SurName>
+    <md:EmailAddress>lundberg@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>