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

diff --git a/swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml
new file mode 100644
index 00000000..fc48ea0a
--- /dev/null
+++ b/swamid-2.0/umdac-utv2.ad.umu.se-shibboleth.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umdac-utv2.ad.umu.se/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>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>Tommy Larsson</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@adm.umu.se,CN=Tommy Larsson,OU=ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEnjCCA4agAwIBAgIJAIDYaU8/yyu2MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
+VQQGEwJTRTEVMBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMQww
+CgYDVQQKEwNJVFMxDDAKBgNVBAsTA0lUUzEWMBQGA1UEAxMNVG9tbXkgTGFyc3Nv
+bjEnMCUGCSqGSIb3DQEJARYYdG9tbXkubGFyc3NvbkBhZG0udW11LnNlMB4XDTEx
+MDIwMzA4MzM0NloXDTEzMTIxNzA4MzM0NlowgZAxCzAJBgNVBAYTAlNFMRUwEwYD
+VQQIEwxWYXN0ZXJib3R0ZW4xDTALBgNVBAcTBFVtZWExDDAKBgNVBAoTA0lUUzEM
+MAoGA1UECxMDSVRTMRYwFAYDVQQDEw1Ub21teSBMYXJzc29uMScwJQYJKoZIhvcN
+AQkBFhh0b21teS5sYXJzc29uQGFkbS51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCwJB8hLp6xfRSvszffewqylgUKoW2ToLuSiPeGlHgLdJ68
+4C3nq3eA8REZswiYewrCVAh4Hy8rHTFZY6l1RbmPcVGKM9v+VBv1zLZm0UO3m1N1
+K8I90TvLMw6L5uQqrLwWlNSTUY2ymWIuJ9ySIKVuDp8zrsMDCy1fd8q0fk+uNmJb
+b8cFxiyFZEBS1dzNyiJswo8Coz98qZWUKZKNUZbDFNCD/dts9bjDQF+RbT2sbr8I
+Di3iwVFN1w75T7yEmetfnQYaVZbMbJsLnpuAKGyZJP4rEHsSHxmwd7R162OcWGON
+dvXNTBQ+ktgbLO+GM2T3tOPdCwtFWRRxt4oKfHYLAgMBAAGjgfgwgfUwHQYDVR0O
+BBYEFHhciuUqHJCUY3mPFShUUaYl5wSBMIHFBgNVHSMEgb0wgbqAFHhciuUqHJCU
+Y3mPFShUUaYl5wSBoYGWpIGTMIGQMQswCQYDVQQGEwJTRTEVMBMGA1UECBMMVmFz
+dGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMQwwCgYDVQQKEwNJVFMxDDAKBgNVBAsT
+A0lUUzEWMBQGA1UEAxMNVG9tbXkgTGFyc3NvbjEnMCUGCSqGSIb3DQEJARYYdG9t
+bXkubGFyc3NvbkBhZG0udW11LnNlggkAgNhpTz/LK7YwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEApDIyfp40njKA2PkfcYFwgQ9D8inVeSoo+KoT1V5/
+G830v6ktogoFYZlFjNDw5fLLnHzR7ackx4Q9cqwwrh98Y1HNu9q2O9PjSfa8xlBx
+bKgEGLA2dfz16TwGrz5Iiuhc52dCM+ku3o5wnq1ErnEjistoyw4oaaM5GvbHjacr
+uChj7vnqXL6TWRUDNudQHxv2OrI0ackn0E0xJ0kFVC0F0bs3JqzJhXptJKxSwt4U
+IwcvNZ22AhW8bZD/RMUowQiX33v/36OxNsF+tkYhjgpFKVnVUBCzSjoHXG8hYRbi
+o8j07LCWpvQalz9EX/Vzzp3OYkp52mwu4bYgg//8pASD0A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umdac-utv2.ad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>