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

diff --git a/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml b/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml
new file mode 100644
index 00000000..bd905ffa
--- /dev/null
+++ b/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nyainloggning.slu.se/shibboleth-sp">
+  <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <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://nyainloggning.slu.se/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>nyainloggning.ad.slu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nyainloggning.ad.slu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAPNvtwQGu5raMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF255YWlubG9nZ25pbmcuYWQuc2x1LnNlMB4XDTEwMDYwNzEzMDY0MFoXDTIw
+MDYwNDEzMDY0MFowIjEgMB4GA1UEAxMXbnlhaW5sb2dnbmluZy5hZC5zbHUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrvkY2EP9gO6kh+rPYDHnO
+TOVOJfAF8EQpC963TUWQAY/EYwQ+5Boz9fgahLt2xcd8TUFxDefFTh1PPxLCQxqB
+VNBp27KlZujuESk2JOkvotU6sSJaGJKun2P5SeH+LbO3/hifJ9KkO2hBv1uhz1cV
+/64Hza2+EqjJmQ7vY5MmUH6NTydVUdM63DewsQokyBJSXwLFzCPoZQr+G3Gwd8GM
+Dc4YbZUnwRv1wFSUP+0KF2UaYANTuDddj8T83FWSPmAL1qExZLGaULTNnjIrBA2c
+N2P0j8iAUpvWAQovdkIjzo+O2L0fhO85DCk2zVvOev4R00+ut6gL1WYjBEAc3gy1
+AgMBAAGjRTBDMCIGA1UdEQQbMBmCF255YWlubG9nZ25pbmcuYWQuc2x1LnNlMB0G
+A1UdDgQWBBSeAB6mREIQclJ7ntJqvwXYhc6BYzANBgkqhkiG9w0BAQUFAAOCAQEA
+XR17owAC8V1WxsMbjxmNrjXlcQxoQM8sSiCGkI6gM0yZRW4NEiiifC9LA2Ncj0p6
+lM3gS1rZw7Op/MjdgpIgguH6odezNCJNErzxy9+akiloUVrcbgXSgQ6YoPreZ5Ru
+XZzLGkuwQIl6iTcV4DsqdRR/Onnd5AIPS+kK7L7DaT32w1uMTa1Az4ZhpskGcAlw
+oedluZRMipYG3KN1dTvzTZZ9adC7tzaURUQdyBivNg0XsENhOw8EQZirOssqDdgM
+1ojDx5WxuWm2qh9fdLSXiYDSn1nvy2LEyx8AJKz7WfJNcpCMQ8c0YuYN3Pz5Tqiy
+z20UtLAP2AqEvO2tJbiVIw==
+</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>nyainloggning.ad.slu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nyainloggning.ad.slu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAPNvtwQGu5raMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF255YWlubG9nZ25pbmcuYWQuc2x1LnNlMB4XDTEwMDYwNzEzMDY0MFoXDTIw
+MDYwNDEzMDY0MFowIjEgMB4GA1UEAxMXbnlhaW5sb2dnbmluZy5hZC5zbHUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrvkY2EP9gO6kh+rPYDHnO
+TOVOJfAF8EQpC963TUWQAY/EYwQ+5Boz9fgahLt2xcd8TUFxDefFTh1PPxLCQxqB
+VNBp27KlZujuESk2JOkvotU6sSJaGJKun2P5SeH+LbO3/hifJ9KkO2hBv1uhz1cV
+/64Hza2+EqjJmQ7vY5MmUH6NTydVUdM63DewsQokyBJSXwLFzCPoZQr+G3Gwd8GM
+Dc4YbZUnwRv1wFSUP+0KF2UaYANTuDddj8T83FWSPmAL1qExZLGaULTNnjIrBA2c
+N2P0j8iAUpvWAQovdkIjzo+O2L0fhO85DCk2zVvOev4R00+ut6gL1WYjBEAc3gy1
+AgMBAAGjRTBDMCIGA1UdEQQbMBmCF255YWlubG9nZ25pbmcuYWQuc2x1LnNlMB0G
+A1UdDgQWBBSeAB6mREIQclJ7ntJqvwXYhc6BYzANBgkqhkiG9w0BAQUFAAOCAQEA
+XR17owAC8V1WxsMbjxmNrjXlcQxoQM8sSiCGkI6gM0yZRW4NEiiifC9LA2Ncj0p6
+lM3gS1rZw7Op/MjdgpIgguH6odezNCJNErzxy9+akiloUVrcbgXSgQ6YoPreZ5Ru
+XZzLGkuwQIl6iTcV4DsqdRR/Onnd5AIPS+kK7L7DaT32w1uMTa1Az4ZhpskGcAlw
+oedluZRMipYG3KN1dTvzTZZ9adC7tzaURUQdyBivNg0XsENhOw8EQZirOssqDdgM
+1ojDx5WxuWm2qh9fdLSXiYDSn1nvy2LEyx8AJKz7WfJNcpCMQ8c0YuYN3Pz5Tqiy
+z20UtLAP2AqEvO2tJbiVIw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nyainloggning.slu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nyainloggning.slu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nyainloggning.slu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyainloggning.slu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyainloggning.slu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nyainloggning.slu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nyainloggning.slu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyainloggning.slu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyainloggning.slu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyainloggning.slu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nyainloggning.slu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyainloggning.slu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nyainloggning.slu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nyainloggning.slu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nyainloggning.slu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>