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

diff --git a/swamid-2.0/www.cambro.umu.se-shibboleth.xml b/swamid-2.0/www.cambro.umu.se-shibboleth.xml
new file mode 100644
index 00000000..565e8106
--- /dev/null
+++ b/swamid-2.0/www.cambro.umu.se-shibboleth.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cambro.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>
+      <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://www.cambro.umu.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>www.cambro.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.cambro.umu.se,OU=ITS,O=Umea universitet,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDIDCCAggCCQCrwXvQYCuIKDANBgkqhkiG9w0BAQUFADBSMRowGAYDVQQDDBF3
+d3cuY2FtYnJvLnVtdS5zZTEMMAoGA1UECwwDSVRTMRkwFwYDVQQKDBBVbWVhIHVu
+aXZlcnNpdGV0MQswCQYDVQQGEwJTRTAeFw0xMzA2MDQwNjM3MzBaFw0yMzA2MDIw
+NjM3MzBaMFIxGjAYBgNVBAMMEXd3dy5jYW1icm8udW11LnNlMQwwCgYDVQQLDANJ
+VFMxGTAXBgNVBAoMEFVtZWEgdW5pdmVyc2l0ZXQxCzAJBgNVBAYTAlNFMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw7NcByBKGr6sdRwoLHbFjF4itjU+
+KOK9wb+AlBLtGnzzA1G3JaIPem7jdX0G/ByIo5neGCqhD+TCqyvu2yx7ZTHdqFex
+WCSUfGpSLUl42JdIEcPsKeUSC04qJHVRqazj2T+unVTkpYMpPJGlYIqDZxim8Ted
+CDsWRMPlKu+tdQ+dsz6VJ1xu+CAfwVQPWEzUTb7QI23puB7kKqNlab1kcjFPUzE7
+75KAxpnqkV1plbnHGO7GaSjl7kLRdrPxY22RCMWr+WVQ+bnO4AGrTBU6xar9o0Z4
+As4XrGORzJotbbowyJhmMwMZ0X6ndRMlSt6XS1/nL1GgbB7J1ADqDM3f5wIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQBTKYMPSw+TP4CbRWoi5Qa5i1NxOswu+gt4wxEi
+7PNbLe7q/e/T+AVQxgWoGD9PPcwuwu0/wN8ABNmeumkD75WS+RFUOJ1gH9dCRu/o
+wngOp7z9KfO/OcTJ2aF/jH+A2/j8mT5WMM0LFGNM7k85kcjq+WRM9pj94t8b1oqz
+MM2JcTb0ViBut6iHLaTB8tJ76yLTsL5POpQP0As7Uvifa9UU4SASKJ39Zg3ZNfqf
+AniIXk0YiJnGEuQhOCZ8Zxk8V1BHwbjQc1p9xULgJ7mPc8bqAgpWS/ZEayrW65N7
+zQsPxKRowH5QqduxSzB1CnwAUlJXfWLmdsZctvs/EntiIcq+
+</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>www.cambro.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.cambro.umu.se,OU=ITS,O=Umea universitet,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDIDCCAggCCQCrwXvQYCuIKDANBgkqhkiG9w0BAQUFADBSMRowGAYDVQQDDBF3
+d3cuY2FtYnJvLnVtdS5zZTEMMAoGA1UECwwDSVRTMRkwFwYDVQQKDBBVbWVhIHVu
+aXZlcnNpdGV0MQswCQYDVQQGEwJTRTAeFw0xMzA2MDQwNjM3MzBaFw0yMzA2MDIw
+NjM3MzBaMFIxGjAYBgNVBAMMEXd3dy5jYW1icm8udW11LnNlMQwwCgYDVQQLDANJ
+VFMxGTAXBgNVBAoMEFVtZWEgdW5pdmVyc2l0ZXQxCzAJBgNVBAYTAlNFMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw7NcByBKGr6sdRwoLHbFjF4itjU+
+KOK9wb+AlBLtGnzzA1G3JaIPem7jdX0G/ByIo5neGCqhD+TCqyvu2yx7ZTHdqFex
+WCSUfGpSLUl42JdIEcPsKeUSC04qJHVRqazj2T+unVTkpYMpPJGlYIqDZxim8Ted
+CDsWRMPlKu+tdQ+dsz6VJ1xu+CAfwVQPWEzUTb7QI23puB7kKqNlab1kcjFPUzE7
+75KAxpnqkV1plbnHGO7GaSjl7kLRdrPxY22RCMWr+WVQ+bnO4AGrTBU6xar9o0Z4
+As4XrGORzJotbbowyJhmMwMZ0X6ndRMlSt6XS1/nL1GgbB7J1ADqDM3f5wIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQBTKYMPSw+TP4CbRWoi5Qa5i1NxOswu+gt4wxEi
+7PNbLe7q/e/T+AVQxgWoGD9PPcwuwu0/wN8ABNmeumkD75WS+RFUOJ1gH9dCRu/o
+wngOp7z9KfO/OcTJ2aF/jH+A2/j8mT5WMM0LFGNM7k85kcjq+WRM9pj94t8b1oqz
+MM2JcTb0ViBut6iHLaTB8tJ76yLTsL5POpQP0As7Uvifa9UU4SASKJ39Zg3ZNfqf
+AniIXk0YiJnGEuQhOCZ8Zxk8V1BHwbjQc1p9xULgJ7mPc8bqAgpWS/ZEayrW65N7
+zQsPxKRowH5QqduxSzB1CnwAUlJXfWLmdsZctvs/EntiIcq+
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cambro.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cambro.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cambro.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cambro.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cambro.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cambro.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>