From 94bc7263d33f16452186dfa4475003c952d0eb1f Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 30 May 2013 17:00:57 +0000
Subject: [PATCH] Merge: Better support client certificate authorization
 https://www.argeo.org/bugzilla/show_bug.cgi?id=160

git-svn-id: https://svn.argeo.org/commons/trunk@6317 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/argeo_node_web.properties                |   2 +-
 demo/log4j.properties                         |   1 +
 demo/ssl/ca.crt                               |  64 +++++------
 demo/ssl/ca.key                               | 100 +++++++++---------
 demo/ssl/demo@demo.crt                        |  32 ++++++
 demo/ssl/demo@demo.csr                        |  28 +++++
 demo/ssl/demo@demo.key                        |  54 ++++++++++
 demo/ssl/demo@demo.p12                        | Bin 0 -> 5717 bytes
 demo/ssl/root@demo.crt                        |  60 +++++------
 demo/ssl/root@demo.csr                        |  52 ++++-----
 demo/ssl/root@demo.key                        | 100 +++++++++---------
 demo/ssl/root@demo.p12                        | Bin 5741 -> 5725 bytes
 demo/ssl/server.ks                            | Bin 3900 -> 6953 bytes
 demo/ssl/server.ts                            | Bin 1587 -> 1575 bytes
 demo/ssl/ssl.txt                              |  25 +++--
 demo/ssl/tomcat.crt                           |  59 +++++------
 demo/ssl/tomcat.csr                           |  44 ++++----
 .../modules/org.argeo.server.catalina/pom.xml |   1 +
 .../catalina/start/CatalinaActivator.java     |  12 +++
 .../osgi/web/tomcat/internal/Activator.java   |  17 ++-
 .../resources/conf/default-server-ssl.xml     |   0
 21 files changed, 399 insertions(+), 252 deletions(-)
 create mode 100644 demo/ssl/demo@demo.crt
 create mode 100644 demo/ssl/demo@demo.csr
 create mode 100644 demo/ssl/demo@demo.key
 create mode 100644 demo/ssl/demo@demo.p12
 rename demo/tomcat-server-ssl.xml => server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server-ssl.xml (100%)

diff --git a/demo/argeo_node_web.properties b/demo/argeo_node_web.properties
index 57f812aeb..a63e68feb 100644
--- a/demo/argeo_node_web.properties
+++ b/demo/argeo_node_web.properties
@@ -18,7 +18,7 @@ org.springframework.osgi.web.extender,\
 #org.argeo.security.ui.initialPerspective=org.argeo.jcr.ui.explorer.perspective
 
 log4j.configuration=file:../../log4j.properties
-#argeo.server.tomcat.config=file:../../tomcat-server-ssl.xml
+argeo.server.tomcat.config=conf/default-server-ssl.xml
 
 argeo.i18n.availableLocales=en,fr,de,ru,ar
 eclipse.registry.MultiLanguage=true
diff --git a/demo/log4j.properties b/demo/log4j.properties
index 21c1ca862..9f9b7c645 100644
--- a/demo/log4j.properties
+++ b/demo/log4j.properties
@@ -12,6 +12,7 @@ log4j.logger.org.argeo.server.webextender.TomcatDeployer=INFO
 
 log4j.logger.org.apache.catalina=INFO
 log4j.logger.org.apache.coyote=INFO
+
 log4j.logger.org.apache.directory=INFO
 log4j.logger.org.apache.directory.server=ERROR
 log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR
diff --git a/demo/ssl/ca.crt b/demo/ssl/ca.crt
index 4b46c47fb..1aef41837 100644
--- a/demo/ssl/ca.crt
+++ b/demo/ssl/ca.crt
@@ -1,34 +1,34 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+gZlju4Nu4PKD2RWyBihI4YF1AA==
 -----END CERTIFICATE-----
diff --git a/demo/ssl/ca.key b/demo/ssl/ca.key
index 0888ad39b..2effee0e4 100644
--- a/demo/ssl/ca.key
+++ b/demo/ssl/ca.key
@@ -1,54 +1,54 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,EBD71584ADEE8FE7
+DEK-Info: DES-EDE3-CBC,1E365E4A0FD2EC89
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/demo/ssl/demo@demo.crt b/demo/ssl/demo@demo.crt
new file mode 100644
index 000000000..d9f01043c
--- /dev/null
+++ b/demo/ssl/demo@demo.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFfzCCA2cCAQQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
+VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBH
+bWJIMQwwCgYDVQQLDANSJkQxEDAOBgNVBAMMB0RlbW8gQ0ExHTAbBgkqhkiG9w0B
+CQEWDmNhQGV4YW1wbGUub3JnMB4XDTEzMDUyODExMzAwNFoXDTIzMDUyNjExMzAw
+NFowgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+cmxpbjEVMBMGA1UECgwMRXhhbXBsZSBHbWJIMQwwCgYDVQQLDANSJkQxDTALBgNV
+BAMMBGRlbW8xHzAdBgkqhkiG9w0BCQEWEGRlbW9AZXhhbXBsZS5vcmcwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDBuEqxINyrCP2IauWReizNWl6J+WgV
+pqTAViqlEtbSbGCzvHE4eF07uCazWmAwWRmXxwf2h4M3siC8Q382n7ri/eS4mijk
+kw7FxoQh1W/jLDFcZ2orY4bz+DoexL+ClVAf8AKBQ68NNbf1aZnUctnDx5Ymrzq/
+KHvgUAIsRmcRzhE5mjWxem33iAVibrQ6LhY5tNDw+VfXZ0IzvTl/ZHfKyOGq4NTl
+21C0iWqksj6sJtvYv88wSHmnzokOXb5rJo5q07HN5b5eHuoAM74SS36ScXpQixDS
+Z4tCjxzo/QwRqQdlWJBv9PSPEq4HNHlCu/zbWZNCbRVKmRf0qYq9dxjxunyj+HjT
+Dj4OfvpmOhTrX78x9ZDOfWmYV/PpoyQ+5PKDhXfFYRGAY97CN1UlQhccdnJCgM3o
+bYkQ+fDXXvgNQLazbOVmeRd5is4TXdcNJIN3LcXXdEOa+O6X8fVTwxzXMD8Uy7fo
+CRvhCrF6gqZZyt+pIJMucLzydiCJHqqDK0xjJ4wtfJNGEyIDJ82hUDEae9X4ao6m
+ti146PH1zbKWS2EYaoEFeXgIqDiU8dKIZNrTd+nflIGd/TLf3LgY43qGEwd/oWtd
+I1hICu173WGdPNnZWbvJtqb4nHag2ldd+jnYHFFF0jnH+neRq4lqW+CAFjWz7c8J
+NtCr+RBVS6bYjwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQAO6FbFXoYrM1OvUHdF
+mul7cP7jVys3dRNfIdTcKF9tYf5sWS7/2PbFeQ+bjLGxQJcZhQ8BvK2J00/+kExo
+JMEFqQ5BZRorwdnrQxJNJcHrvrQ6ZTaiBhuyktbWGblCAWkuhqw6NLYxhcE1Wq6s
+6w978F/qHCvqGSi1QkVX+9WjVx48K2JqBRKR04THWlgf+llOJsuMv4Rk75iH385L
+FNsQAXIquQHqgBDqKjcSAR0VAQSXV0gnMadaUrHv7H+QqsYo0zp19cX/WF0HNti6
+GHk+mCnDeZh6Z2z7xii+9fQGIMgQ8YhAJwzOhbk72y8WMqfHtFqcY1KnZq52c7wz
+3+kMx+XJ6t6YiJnWAWs4M/mk7RVPOvNqOAh8y+pnd6tZEzdRcvuDiv+U/HwNS6TS
+nEsUHK0rwWD3Sjfwe9LO9TMxdSZkWePlY2v5oAL4YxJnJGfbeBo/OynUkIa0fRXf
+FtKdAENfpijpuNiN3O92q8FwXpLjr38aTHy0o5n2Zrlly7ydGwRXJ8P7FdbGRXj5
+UPaN6b808kysE9zS6BA0XMslLPqQrFgqZFK2fnv/QW87jyXQkTAAgTVrHODJXVsr
+YLIpWTmykOxyNFGYiT9BCxHXTO7LvlGdK3OqRwbzTcD+CHKZsUxALg/q7FbSBS6i
+OZrgJYlxzdsI061+rLsaW02FOA==
+-----END CERTIFICATE-----
diff --git a/demo/ssl/demo@demo.csr b/demo/ssl/demo@demo.csr
new file mode 100644
index 000000000..4ace678f2
--- /dev/null
+++ b/demo/ssl/demo@demo.csr
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEyjCCArICAQAwgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzAN
+BgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBHbWJIMQwwCgYDVQQLDANS
+JkQxDTALBgNVBAMMBGRlbW8xHzAdBgkqhkiG9w0BCQEWEGRlbW9AZXhhbXBsZS5v
+cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDBuEqxINyrCP2IauWR
+eizNWl6J+WgVpqTAViqlEtbSbGCzvHE4eF07uCazWmAwWRmXxwf2h4M3siC8Q382
+n7ri/eS4mijkkw7FxoQh1W/jLDFcZ2orY4bz+DoexL+ClVAf8AKBQ68NNbf1aZnU
+ctnDx5Ymrzq/KHvgUAIsRmcRzhE5mjWxem33iAVibrQ6LhY5tNDw+VfXZ0IzvTl/
+ZHfKyOGq4NTl21C0iWqksj6sJtvYv88wSHmnzokOXb5rJo5q07HN5b5eHuoAM74S
+S36ScXpQixDSZ4tCjxzo/QwRqQdlWJBv9PSPEq4HNHlCu/zbWZNCbRVKmRf0qYq9
+dxjxunyj+HjTDj4OfvpmOhTrX78x9ZDOfWmYV/PpoyQ+5PKDhXfFYRGAY97CN1Ul
+QhccdnJCgM3obYkQ+fDXXvgNQLazbOVmeRd5is4TXdcNJIN3LcXXdEOa+O6X8fVT
+wxzXMD8Uy7foCRvhCrF6gqZZyt+pIJMucLzydiCJHqqDK0xjJ4wtfJNGEyIDJ82h
+UDEae9X4ao6mti146PH1zbKWS2EYaoEFeXgIqDiU8dKIZNrTd+nflIGd/TLf3LgY
+43qGEwd/oWtdI1hICu173WGdPNnZWbvJtqb4nHag2ldd+jnYHFFF0jnH+neRq4lq
+W+CAFjWz7c8JNtCr+RBVS6bYjwIDAQABoAAwDQYJKoZIhvcNAQEFBQADggIBAKYk
+c1LiB2iNqjJMPEjzJ0wpKizHoqv7Tt55Slz4Q9bTgTYmevt8SIpQCKK+ZtMxCPIy
+9tfqjsdYqBxahfXnhXUDQQOYEAKcffEZd/c3LX16kOupximycFOj0iqJDe5VZ/NJ
+7fRXlJqqkufoQQ3OqPYzS/G5mP61gadvReAkTh78StlWMNxwg6wYgQ3p4ZD1GKNI
+M7A1Z99HyJeRZcT+yx1wuyvX2MJY15Kg6m9xaM1N+q4BJ82+u76pNX+pTw6A12mB
+XhmIKqRh+KN7YGSVMtU4dBwHMlZD3CRiGUE9RFg/5aqJeXZgCVnLgzTzJUFQqRqZ
+OehYdizkI6TgTLl3xIJWHFqYc5GhY9NwghYn0BjiC/8xpOmj+soAG4hDkydejtf1
+8lFeTxW8Ga560zjvaUOqntQTLHiAnZai7lVFxE+o3/b284OYu5wWyAFh9j+eE7qP
+pnObCpeFanlsuTnQIXZD4KcojI33dmBXIVhCfe0cvtDEPLl2MYJNguO40tJwPCzL
+JBpdwqh+rBKQjX+pn56js3BgB4qrcQnWGEHWOb/Z+ooRkaIIliRLBTS5DbbnsQWp
+jyVKVhTVLNdp4L2oy94hGi9wJSCujXyBFXH4+e3HpYrZwGSJKrpnRPChm9XW520A
+EFgLzv2Oh0zXJiBJ+EtVwWfkDCImakD1u5QAHW7h
+-----END CERTIFICATE REQUEST-----
diff --git a/demo/ssl/demo@demo.key b/demo/ssl/demo@demo.key
new file mode 100644
index 000000000..b1066d85d
--- /dev/null
+++ b/demo/ssl/demo@demo.key
@@ -0,0 +1,54 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,955EFD4E985DC326
+
+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
+-----END RSA PRIVATE KEY-----
diff --git a/demo/ssl/demo@demo.p12 b/demo/ssl/demo@demo.p12
new file mode 100644
index 0000000000000000000000000000000000000000..9f60819deb9e33614d0824a33315900c27ec87e0
GIT binary patch
literal 5717
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

literal 0
HcmV?d00001

diff --git a/demo/ssl/root@demo.crt b/demo/ssl/root@demo.crt
index 1f8a18c0a..b79404bc5 100644
--- a/demo/ssl/root@demo.crt
+++ b/demo/ssl/root@demo.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFiDCCA3ACAQMwDQYJKoZIhvcNAQEFBQAwgYsxCzAJBgNVBAYTAkRFMQ8wDQYD
-VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEOMAwGA1UECgwFQXJnZW8xEzAR
-BgNVBAsMCkFyZ2VvIERlbW8xFjAUBgNVBAMMDUFyZ2VvIERlbW8gQ0ExHTAbBgkq
-hkiG9w0BCQEWDmRlbW9AYXJnZW8ub3JnMB4XDTEyMDgxMzEzMjM0MloXDTIyMDgx
-MTEzMjM0MlowgYcxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNV
-BAcMBkJlcmxpbjEOMAwGA1UECgwFQXJnZW8xEzARBgNVBAsMCkFyZ2VvIERlbW8x
-DTALBgNVBAMMBHJvb3QxIjAgBgkqhkiG9w0BCQEWE3Jvb3RAZGVtby5hcmdlby5v
-cmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCrOC1BS1Qotq9D5NAg
-5761ATNjMNMsg3SFkbnVIY5bzraY+lxs2qW5I9BXEHGDIGXJoden8VmBI7Bd5vCE
-8yNu8VlhfwNOuDF2NQVCSzUU7LUzJuEW/CBo1zgES2RYaH8Rt6+/4VVEm6DFI+Dr
-7GVeJh/f2LIZuKvurz8wyxvbGAXeF1p6lerS5/Qw4JE/wgVLCecD92WP3zbMyj3I
-Of9njNJQ8w8lNVcu4LX0pNQHFyTotasMPAgnu6YZ9uWGjwb6fItl8JbFZSuQER1B
-d7stjbzvcFCBJ/ZdWm237nqfQXLakOqJvUEvzo1cVcDW8slTX/Ird2LKN5VslPyV
-pBxRUT8FhOANVnGP6E4iqhRMYyRW1i0e9+QRvhhwVIrC6NpMCYnZm3DponNIzZGF
-B7cHkT//vS2w4r5OtLVb2RleXGzxLag6GsVNyI74Abi4bsM/H+9CKN6NsSXn07BB
-kJERdOBO80L9W7zFhJ3IVRCIXGujCcOF0WZAareWESI1CVOPMgC32xdBbw/IrnGv
-dUc5BdsOInjsOcO17LbsNpEDQQavF5SUR1SLAmsrftQoYqtsBjzCiVcAFCOF8lwk
-lcEEWLSRwCOEtsieBtxKz7UvizFPn34iqvUwoN5BdceJQVry4wjXfraScIjnrHv8
-/6pvW/N63WJJODhQVEK499BM9wIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQAy1dBM
-ViLw4/eBUTtpZvlMotw0booS6opEKxAUuC7YDMkKwW4rqDxJTpyVKgC61q4Q5wyH
-fripqwJPgF6+aqDlRE3YHbHFHq+iKYSD582MIy7Bb1kmqvw+CkSWgaZFJiRuDT/2
-QCdEcWPYFRWP23/GuNZurd3M8GA+7Pd10XnqYbZgXLAdVVz+I4JzFT9KReVOY4Ne
-ZWSnzXb092FCpy/REUg0vUKKze5GzCiBfTTEAb4CpnY8HHlvcBsL2tNABhcP+gu2
-b7/LlhRZqlMaidJhGz2UH6WqXWweYce7ldpZ8khuxF2Rbnb0upIUuJgCKeJ1HckE
-JIVTiOJ7ZV2KSphpkVgiGqJidonTPOY46lihk0ZqGnbXfHXtI4JYKorLikefztS6
-8ExVVpbHZpTz9plqxc7/VpNqLGLwwDXRkIEMBR0OgIecVnSTe5vCdFnGZACwqHa4
-iy4hDmf6iBb7CmOAcP5W0w3yZ/p/jrc2K2lKglcU161pR7uCsStLaRh5Mec9MGpx
-K38Qaecm8NtC06I5aCPMA+5UrXdrsNvmeKZUwaztskkBzV9RibW/ogfoZeDpCh66
-HHG4Tgpkra4X82D6g71Mtkl3ez3tlFiUR9K0cuxtDxwaavPAmUo7tKOAG1UBgRlS
-t8DoCPRbx0o98O/x6g37H1UWe4sEiQSUaW1LiA==
+MIIFfzCCA2cCAQMwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
+VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBH
+bWJIMQwwCgYDVQQLDANSJkQxEDAOBgNVBAMMB0RlbW8gQ0ExHTAbBgkqhkiG9w0B
+CQEWDmNhQGV4YW1wbGUub3JnMB4XDTEzMDUyODExMjgyNVoXDTIzMDUyNjExMjgy
+NVowgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJl
+cmxpbjEVMBMGA1UECgwMRXhhbXBsZSBHbWJIMQwwCgYDVQQLDANSJkQxDTALBgNV
+BAMMBHJvb3QxHzAdBgkqhkiG9w0BCQEWEHJvb3RAZXhhbXBsZS5vcmcwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDjfJpz+c2ompElZtBWC5HUJ6NevhMm
+I7VCAZjMEa8l64cCXlULOyKYbEZ2oQupg5iqHVbEK1d4UJ7b2EWTFc8bZT+cQODL
+7x3hPJ2856PNSg2Rcsna40Vy/1jieRE1gpLVZBi/myFuCBU5uQkhja+VikgIltfX
+uvYilMEkcEVSQniFJCB91xaNPWPJwuyy5JEMoRXprCjHmChaE+MGnWOXyU5+nSp7
+FuLAOZDXbNi+I8J01q2W+iWVlqvIKAa5ogq5TYayo9foVX6ftnNlkoG14gJUGn8C
+CNSAx8ZGNR16952H1UGQycDXM7T3T1MMYT8gB9qDK90ko1EgvITy2UPyWGhTxh9U
+dKkwpenVgn+hDER5ObTlDmSucCooVKZCAITimb4TjJm1pRfupaJlZfKboFmnmx2Y
+4JvZdbM7sTcCmFRv6P0UEJ3MSptzl/GBqSYFyTKmsVWq1NaRzytUKkTQP3TDpf9c
+vtJKu/CPUWKVtamf2d4U+34MLKIQ2zDRkUWDmEypjHitW9y4PlBYVtZ2ks1rdLCl
+ei7cDgwG6uwLZ9FSjHQgy0BF0lVHKnefrR+c1HZ8/vg12pDtmLvP9tL3rxWQ+fGj
+PluaIgPh/moMEKAWDHH+EeAlJ5mmutIU6HS8cL9G/doV7wfqx7TNGhbCbRIawF+x
+jBYCwiRDmNocGwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCm+WvHykMS7opbbfDu
+reOEt+2i/jyWuPPJB51HheyCQtV5MXyuCRflZpJJdI8iWb3DtayKCI18oK7SakcN
+hVGY+3GJyr5yYVsoeRbyFUgz4apBLb2CeEC7rHbbC39hYVc+FxIUbGiP70dm1TJW
+dZEWeyINScR/YVLitx99g6AVByRjaTDpSDr+Rbw0HWZiuJ2Sb7DqCdwaH5nJqLqN
+N8Vx4+vCCDyOD7kH7cqF3eJ6qepBIYPHib8IAqyLFDcd1OXLMQHv3rrYcQ0WM34P
+NkF7wTO1I8gzpcFyrtOBLOyx/wkoxWhqVcWzYXQrgLbgwp8Z/bJz9MyBnqX2NWq0
+qrGoRBqyLkT4W6acJ2SkgCqMLXhMXfne6wziG+nFiYexeKL+cLEB/CkarxRMEta7
+Hyb/zfWLrXATznjeeXanbgBC9f32Xo2IttLw7hPTAkOqulm7/k/U72/n21g9dLdR
+EtmfzYuDZEOH2QdBqPkrwuqY20t4qvqJITomE8GDFqguJFF5T0h0BS04oSA24J/m
+pwuaccHKuo2j7wapWhqQWZj+3CwYqZDKxIsmWCXAsreUj0GmZEKCgdOI3zzNpAI3
+F6puzfejkHze2rE9Obu71c4q0ibmo8MPx7ovoD9yIZPAvHK8HLiQaRNYP9xvv3FL
+g2zA6bTCQMYERNb1YTBv5xeuOQ==
 -----END CERTIFICATE-----
diff --git a/demo/ssl/root@demo.csr b/demo/ssl/root@demo.csr
index 54c05433e..34c6cedad 100644
--- a/demo/ssl/root@demo.csr
+++ b/demo/ssl/root@demo.csr
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE REQUEST-----
-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
+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
 -----END CERTIFICATE REQUEST-----
diff --git a/demo/ssl/root@demo.key b/demo/ssl/root@demo.key
index 0c6c32d98..65923d77e 100644
--- a/demo/ssl/root@demo.key
+++ b/demo/ssl/root@demo.key
@@ -1,54 +1,54 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,8B121EE89E94390B
+DEK-Info: DES-EDE3-CBC,4A5FB12597A1CBF1
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/demo/ssl/root@demo.p12 b/demo/ssl/root@demo.p12
index 889f0b4165a2e3b0d2073ff1e93534bd06d32fbd..d9a86030aa0157b7831ce62763224309ecd28948 100644
GIT binary patch
literal 5725
zcmY+HRZtuXlSXlu3;{xL1|Mt&cNrjq1h;T;*WeP|odkCo+zB2uI0Scx;O+$X&8^zq
zfA^uQtIk*5&))$D5^EzNB7*~osn9S%p)#SjxQOV8If2A)Py&f@{$dPpAP(PuBD9=9
z9HzgB4ha$A@1pomf(Rx@!}{+JIEZLqJQR!r*;Xb~17mt5Bn$-qK<sm;Wdqcdfb~IQ
zGLE~7n1Ae7yE8`2_+Gd*{qjo{Xr?9xl~SXu%Wxvt*}tVN*m*oAEPV4s*AHOaTM|m@
z(|@!s>&I?p#bIEqcGvt(i*~bx*fy{8d_Z=lbj=79?sogVZWO?J*MZQD=#t2+gAp(d
z>*N$m8N5~!PN^?XA-|)K+B$V?9F(w(Z~!kfK4f2L2kq5)xLfo8@MUOkOm?|oES#s5
z^Zd499~nrf)N!_M0eYq(=yqX|dm1;0FkU*`o~S8JJ<P6+0@*KX<et6U9cKsb_}-4+
zAeT`I9$P_`K00UB^*jX=qwm@id$p>iYvdO%tK0uUzjqER2tFiPG65hjSKoRsc37(M
zzI5qZ8#vf(Ig)`ZD!;L$l<|Y{{g|ncXSA`=ap=z^rQgDN5A9Mc0(^VI*C^ldO)%?s
zdhg<d_-trleouPdo;KL`?(r{_s0)wfNsS-@)$(^&l>Gjl@~p4+B+EOU>rY@!@+au*
zgY%PGSwq+$rqS$OIta?Edm`rx^6O@5nmT>9>3Is5=5T?u{=7m?sS}rHYnlYnhigK*
z7#NJcATLC$=4Vh@EQ^$aEZ<KrxqN?&Py0Na+ESIStdD|oOoNMUav?GX4e8A<F0|Ap
z<PK+*>p^ErNZ*#(N5QX5VtF`!dv!`11OinV5lnt0!HJ83Cnd!~4HDYiN%9V(lcd?b
z1{6$f4V&4}w5%H!HOgx_r4NjTu936kuK8za(FI5-#grl?2HZ$q!oR6CF)pU;)ROe6
zW9m%i+NVgfb6ui$X`%cWU_sRufz7G3t(qMaZP0Iw#NpU|xF}Lo*n8OsHn0JWwppqW
z7DRN{Lr&yM%^FRD8fI;4`OQAv*5?w{v2GRHR#~X)s{ogbFEzeW#GjClHTm>v;Bf)U
zOk1qxnL{(EmGIn_dhW(cuDKM$w}V7k|Hvs`_BN;fyiHn>#?_v);rf8?*0R44)vBP^
ze@i(}K|9eDA~7MLXcpIS?dj2g?cJ@BX<m2ao4{P>S!h=u`G$j?_aTV}s9rUzW*<O{
zjT`A-x|G&i$yn9QwIzPg*DWpd;ODlEu!?xTYo*z^dbOL!0-u&Ss6;CicW&+cQ?5U`
z`b{J?^|8I0!bj?17b*9Rd$3j8O40i_7a0mZ<ot}5;vO{sU~rl{7A1ko8lj$Gn}lq@
z4qiOBPbSJCxR=bTP%2vT4+Mssz4TQ1Rm8@Qh;a&c2_sX=Dfxkt*+xr%tiE;l`;$H2
zo>}#w4d}$X0NPLtK=l=zl<rUyEZ*ZAwLNyYbtAjr$7`YJg*?lmDdXTNCru2&eIAZ8
zJhD_&*iGM0lfr+zrVf=~NLlGZSxVeU4wIV-4&`n7il5@*ZPo?*?ibTZVS?GDCJa($
zBDxDVW-_^@G1z0SEt{5zoUVu2(<iVBTfuwYC4t+;D{Qt-Ky$H5eXHx`N(lS~Z)nhR
zOa~UKE#ga4Isp-T>F{?i@X?ZVP#<$q{uzbNcCx3)+aC%p369_r7!*N$Mg7u&oi&Np
zSfH<ZK3L^(*(dhP_R%XxZ_y~K6?s))B|D1ZQFT;&R${=~#KAzLKGBT@OJFvk@Qq8%
zvs>#9fvA{QW1Hi!TK5w2_-A3vF3qF<Eov0^p!tG^)Ic&}BAgC<82w;m(O4+p&ClmG
zEU}N53V155o~Ajy$;<~(r1~25%~weOWa>B?p#`<Y7QsJREjJ?4a#wTxOG+b|f@9n$
z<I6MDsOoHZAqQUE6LQNim^y|$O5x*;nN^*shIiMicnpUiR=8Z}!gWku>JcMYnB*>K
zlP9fTxsUQ_LoTyq^@>X-B$uf)TU%URt9O5GMNSjuyZO$HpOUg<xUmt0Y2j`9RSz4_
z$*{rAS*Xh4i`P))S5b2nio6%fhJm`iin9j)AHp8g;c@1rm_qfpT?rUdL@jAT`TNH9
z?6iOcS)zN2vo7R!3bprlJgY#kxyllmHz<V`&u9ic+9Tj5%tUnpYWsj`kT^}NtKcgY
z{d0PjXO0D-+-fe^K8yTbL0y#+NIr{uh|}MJJ4s)g=EuGFD663<((tVG+fC6EWo0-C
z#|TL@nGEf$G~O^I&xur}!Lt+y|8s@{8EVPBgqIog7bBF8N*0ij)tPY#Kc1Do78SAr
z=0-?sS-Vd#ar(NVD-wO!YH!m!9i{qVq*B`(D?9_}JKQg3MQkgZbeO?pl7fb|!%0wR
z&D9PtG0yNv1@A55=fO-)66)4eJyV#upNqe6mLc|cZ<A)iA45wvo_cy2>MMX_xh9o_
zF}oNc$pQtbT<*1G#PXfQUl5s7r_Hd|@lqM8=Bedks+`mv$6J5)IOqCWIqnb#B@MUi
zk_a+e`!B)5v~1Qz9F&n#%zz5Os2RbTfSB<olSjFlA&SThGJk@~M+B9DHomXltWC9h
zmu|BwZt@$*tFed2em?%=B+&a_803#qP-m2v<ChH|<nv79#esZPn7CjX<}<-c2z#UK
z#^qdJkTDi`p~AZL#~X4WPvGxFTi%#;UT{OAn}&_|>COCjzoDHdpv|2uM%~154PiY-
z!kaIip6KoO=083`9xP)O7@RRb5^fIo3$_=W@69@^%ZPj(kJfL7F=CZ7ec-2hXy7kr
zRHC<>c4gi&JxK6y&g*n$0=9rfb%v6n{d?BJtL<{{Bih<UXVX@1D=!*~ZYs_bz5Ue8
zmE7k81FUtP@J%zh0zo6iUgC2p#QF-qW30t*{>@t07bk1&UNP!>m=iRMl7o8ysGg*n
zWs<60V~UWqZ5vXW-1Jwi6Tx#6po>tV%*Qe^7Wsv)%SWba*ws*|pDKz`!>8@g-ke5P
zndTj}P~#AmpVr4P$fWQ-Ub}n%{o9{cZ8qMfQ_Ed43v|_l*L~RtK%=~SW8>OtV@h^n
zWq*W&QRTf{tM|+1f{j5am@-aY$q%?bvQwnXX&~>|!)R#k*q8g>_M8A1<uFHUHEL6!
zLc{$JB(A`p#`UQ0#Pw)&In$Le^K4==A2b=0ZiHr?C>DF7_tFGX;3IW*d7&p<B#~`w
z4?VbZ90Xi4dL=y*+Z&&E4B^l$tDy>fS1lo9{x1~CZ&wIaYuc`@Bj^~AyXh}x3}ZJ<
z%$=r5o#|L?Hc1KG0@iN~kc#DmpS~9NYOxan(*ul-q}0q83i<#-DVdH#q+M?HC%7DT
zn{mGeHEIVxGUEcrhiYgWD``F7=hnbQq5a;wtMo@j^BxPi+9Coz!nowvGx8ek;e^y3
zX`<g9U*tpBPXvMR?)^PC6e9Vy(=lxCO<B8M^j|}%5?c{z#2xwHu8DlUk_4!b^PX@x
ziw>Ykqa?bh$!Q-b{YtAY<mJRp<A9f&No7X=rb8r)a<Aq~{LvXe1>gTi2Oph!yJh<>
z{UEd1fW}oWQxLrkQ4)^9#@DtA7DrgLsIqCq+hEF2-%&5`9FYR!-Sg(5!5q<n4U%YM
zTCWc5jblD>bLo59Kh34lWJ&0X*NU~GKDQ~MJzHQE5YnSMc30>i<aMuc8`KdQHUWR5
zO7TkoxU&x>ynE{2ghN{`EyBxw?YqsZGNw+&j$>C*Ylx^#Me?1{8R`GI@vJ{Qo0-WJ
z+>tn3_!8E!;4DZ$N2eHu^C<#Hh&hV`MDr54i%ayOO4f@sYt?{7LRM!oQ^;G}8>kw|
zufXclPFGKBnGc-tt4Da=!^Ea0`y*@OZ_F+?CUvoEmLIG6*4&+Lot;#;^!!`SFXE#0
zL_oM2<b&dlgA>b|5?T4aV^`Nid%7^S|L!A3ga--lSy36oH#V#wJco%{O?g*-wSA<O
z8h9vvJiZKL6V40_6CGKWC-Cw<33G<Mh_96km8#j6M^1gK*Fi|?HZi~gx|^OSz<m^j
zJGEMre{fkxSjm({fkqHcW#%f4QiWgm1{`lTrSHpsz6)lPw&)UP&UUQZ-Y}Or{wE&k
zD&b43ZI#42U)cy_Cz0x%!m_ZBC&0m_0#fgUQPHWk#hUAjvGG}Qkrg|1AFYbhjg0Af
zTQWtVrZMrVk(;e|JCbQz(w>6rOT}!AQMS;?f<9|DI1qF2{|G`(AZ80nAm)$1xc2XS
zN5lRfUBE&_`Ww3ag--v^B9Q;Jh!bxh0d{)o&c7D%_gvZCp6KwHZ<*Lp2c;3(;-u+7
z(Z?<nQsC>_!a||kk{*cJ5gi$j(clH^ZADJXJ}cV;hSlnpjoj=%1-vvt{S7^*=}5-N
zlmn6&j0_~qrhpgkP9d%nVa1uOa#c)M?zNs`qaJ+uUiAfi%BS%Dd}Rtu$C?L8ka)OS
z>^lm#Pxn}tSYej#L*@`CvoNiheKNjVbK#dsT&SUCUM?GjOy|`R0_aupwG?G7^W%V~
zV!K@ckW~U|uBhOK^qo6j>VwGHjAbbCrAeJR(t0@sJ5gPJ-&T`t-_HU7gM=(nEv6?a
zDcS%iHqymrW0&(;F|NpZN6Dg&tZfrCqOFLD>Y=fCom?lWN1vYKKWJ%0`{g=N@7%Ou
zcH@AoMS{F+frM(6`F2PbOAP`RjfZwh6LGL!{+^?iHS}vBvqZ>i(~yn9-B(qdu{@ID
zQV`}Hh7QWh=EmYKT!G8H&&qf8S@*4N3eaPB0n9{bN*f#74lMNJ5fGu!?r_56ZSb)+
zVv@!98yH85sjJ(ZFon;X9Ujdn%D8z98jY>VA7lkGrjDo|>x_pCSW>{{Oi201Q}7FK
zyFl4IosyP))E5@Vnn-N=d0vchT0@KET(${FOpxAgjr%XC8oyW-e^Y6HIMQTC4?9(Z
zj70oey8{q6T=lw3A6Q`$Qlo?eNhAI_ODT0HDF3=zpv9ZA6hx;$dQ0}4RIBNaH5{)U
z>g7*tP)#aA+ch1h{Vv4>KAqiA%p{f`^rb|4c?1lK)<#BHYbzPvn}f?QGKr>;1mXq)
zdo_jdb<jPmRftTwzrA07h4yijj~H@tM>F@YlnyS5F1b^)h~j=IO{<R+?4*<z;<fs=
zPgmfPRuHEL3n8u%d!H_0PX5Te$h}`&Bo&?Iy?Rs2)U7RV8YFT!O+OrF7QyV;pCN18
z+|fDghh^roV2!l0>7gkrZk=iABt7?p?sxg10WJ}pp$04r^osVq?jT0w1vl#bkjt@k
zl)qPJUlc_Pw>9dTKG28x6Uj||q~n=_f4!3vx6qik0^m0RY%;iqUN3K&pQxM(3+Rj+
zx~9$I!sXJzrvbZ27)~SYtqx;hpWeE5kQ`#<-cch;zIcQuLJKXB^Q?!Ea;_14QW*Ck
zH{bu*DVn?l>6=`$SUP@`)2(LZIe713=i(x27?RHmF?vo;e}c<AYe?z^;~jE@mKT3M
z#x1#5IPGX>eTx5zpW)aCipd(Y*a@yfo_)(La}`6S?6}xeDQ1n-aPT5Ft`Gd{TQjz-
ze)r#bXRXKCI5|`Wp=iDtC$DnGr#8O|<gb1Q$o8e4GvkMg4ToHWZn$9lks20AfW3@3
z6?gtht^FwC<K*TWm^{^{*hccy(QV>_vW5oU_16AaOBB1-pnujJGfkAZCe?ST*7F9N
zspFtcIaV7bW{UZI8%bcIf&6<N0#<?p8nJJ26l@<iVF#SD7Z0>r_h%a8UiHcO)of!3
z-;Q;#^$aca+YeZ|srTVXm&E&kFm?E$`uCKj*)?nV@X-tQR@aW%PBhFQI(Vh@do@1+
z*FocT{?NYrc<cc;_Zm2EpZ4wDfJR)PTHtQg(AW-#UYB2->xrj@d*LBMY>J<8g)VG#
zaYNT6G1sSoIJfj8^Y7r1wb@+SFfc1@iT{w!MPqpsh~<R(34_q-r++0#5ln$Hx?2M1
z#mB|@Q)2Hk$~}s=y>BGQd-Yvq;C%WdJ+GboIJ(+2XRXMW`WzAEeY)<k7rmz?c3vMH
z;qG!7%HebrWl_jEYdYMkG3QYVz#PS7!LhKG`*~;+aN&<C8XA%C^fP;Ac&d=F)LhcN
z<QZ{KQwz8`=Sqgz-%+DuV8g&jxr@2R{`hB!k?w7hwL9<O{4-5!4K1v4CiYM@CU@|*
z4?3j@rO^!e<b2nPS$}7LIu)|hGye>>ZMky!(2$_iEPWuOPb0jX!NB9<d_N1y?&Tp!
z;NvD%nNK`IzYAQTVc>d@akQJOSH;)v7(rKi^5lv^%hi(<1Ktf!4-;{^CcYtc`&$in
zy>I+<p3hgL++1JxbLi(DaKmf;%mNSiPmfD$HO+SWBs>;OZnv1C4YI>{E0ojN_u^df
z3axDA*~nUK=Zep1hr<h-%F)6<T;sp>DGCnDdn^Cbv4<it8p@K{kjF*>r>%K$zs3<|
zpSw6O+?d84TWIG~etk@|4c3g+ZoA=PWB~fGouuv(mvWPhgHFfC4qfrdcQfQvw=9?e
z4$;34Dzo7ZQ?Nn-+Fq?0CT14TPQ532bRsP#%`DX7WaABs6~LPj9Tv`pj5EG-Ai*#e
zN3zoWUKSI1N4dBQaz|ki3-<QpL_-c<1FJ^u<za~Y`@84h4sFa%Su;=?Kbz*4ALMRx
zg}<LZtl~_9ZFqEq7x4}9K2=s|&f-mw`>inH3~+x5-%cGruBR`PkRw$16=&z)ZmwL7
z=@QiM8%q<>E~VX~HGhA}P^QfSQD;SD4&mcjv44v)wsmNx@LJVP4PYla(s>Qy{)|1v
zzf}_Pp5BcbbP;Ixeik$fT*WGHwu;Ln?m_3VuBH^YT=UD4N;$`h^X)F&WCMY7l2H|f
zcig4ry&yC#v}{C=C&<-9(V?%OP8#Pjqww`{a~CIs(=77!tWozVH#zSSekCN`_I2j<
z8Doo^CyQKH2PE`<9EE|HVc+1Rr2$Xo1(A8CimIj5BY4+Db>~ps$Mh3rY5~z-IZ-*x
zUz1(S@10SdlnTFUULk$(c2Pe~i;3{A__pk&?_S!TBh0DT4{#H;!kj?HHbL)8S8~x_
zlKBK%keau8SPiibZd2vPcD>dW+5Kd5Vjq!StzQK1tU-^rK{mgC#6jVJxUzUL7VN#v
zoe+swC(~x8sHCh;Jtf4co-9e>5p~{t5BVOsoX8<YQxI*uPkUSuPk&KFUzn-@>5Nwz
z8hE<;3ez8wJv`~BYF}{&IFD<8aQ}oaX~{4-n;AdQSc2=h&T25RYhBCNOCibY*6~A^
z8O>4w>jCJ^vrO;$=dh5HNi5=3gn-8Mo)~OXwydVR*s4O`zDZ#i1xQ;_U^6%W9bx$@
zAs!hbVb5exl%b?Y6H1RJI(Z$sw6kBrx<1h##0?D=8%5SJrkN3%JIXy84;Qj6Y8b4%
zUC@2{YzIwTPZT`}z2&7J^?gU04KvcYgV2L%|F@-K5<!Sj2sMbQC0u|GvExmzSXNIM
zPaLtIU|<NC28@Y@%7TZCM2d=lLRej|NPRMKV=<YUkW)I8j(>NdXNQ6T*>R4I{lcvF
HZ(I8>VpGuS

literal 5741
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
XxA4{AN1$L#5z89*V1=>&r=|T5J_;6X

diff --git a/demo/ssl/server.ks b/demo/ssl/server.ks
index cf0d090aa6e6f922a363c6c635f02302fc8c94c0..a28ade3c94995960ce41a23860fd5d872883b065 100644
GIT binary patch
literal 6953
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

delta 3779
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

diff --git a/demo/ssl/server.ts b/demo/ssl/server.ts
index 9af5fe41fc3c3b8f80d99b85e086dcfcbdeb6648..25f793667f7c739f8be40ce954025b1eb5be4b12 100644
GIT binary patch
delta 1369
zcmdnYvz%vwf|cE?habflSR?dI4J;WLSRWfSvEDamVm`irnTe5!iIZVdV^GDGZ|U6z
zylk9WZ60mkc^Mg5Ss4r(TPH>t=!+T%voVLVaPjcCRwU*Y<fJON=O%d=@)&S|gt>W`
zgVbCM1q}E=JZ2vDiTfoClM@|MA!_yVi_#6`#CZ*k4NQ$J3=NG;42`42d5u6^GbopA
zd$<txOzvk?tzX0V%6NsG|2#b-8>UqgzXl$AUbMg=MmfyoslmJeIaURcn49d|=6{i8
z*lu>(R^z06)s6or)+TZu?Ah!5rQ^;82TrRE54LjL2#<KF-=8MZpVl~&DQ5PcwJ!>1
zA7WN|)8BY}+T(B8i<lb?=BPz5?cx1!;oK{=!#}%Pe!tlenDySYe(&_KdAD4acg|n-
zZpte`?U|n#>Q;SJ`n#EFZo-eg`IFX{ZxzW5S9^DQ>)FU3PnU^`?Ffr;6rZE8;cAS2
zQ{eH?4Q+2Zo-N(DZd$qKt;UWY>y4dj7*`wDC-84v?eaq4Mrl)yaZ{W6v5vXZl+911
zpG&y3OYdz)@BV#OA1@V}O_Ry2KjkwkSZHC)%lkGpAr|UZap5;7EU>TRk4(1xl($G(
z|Hza##_d8z!tcdnBKTtp6;`i5P^J6R+J2hPe{=7yeYNFU3JiyG<+OAkTK;$xdhd5i
zIE&3%NwaGvH+}SC^549bf4cWVV2bH<wX?j!p6o0q*qVHzSAY4c`?-Ey_(|UXZS@<}
z<3%j}`|q!C@V`D`NAt>G3^y!$R9_{0Pd7HH|M%ge>YP)KXH8kdz4VUEzMRvMpY-U=
zn=REgwIyy*wr`ToU21-MM}56%q1-#>u7DU7k)u`~(uN;y?cRPm>|sf4VQ}%spt56~
zJf<B_?w$Sg=Xgq5WL;iX)~TE8wKQ+o7<;Ds9^!3z&BV;ez_>WTz|TMym>^~OSj1RF
za(K$QvO4$A$<^4uxMWlNZjZ{Z6Aa`*(#k9n24W3Z6-@ritW<AsjjQIHLIJBX%Y1ej
zOTNYG4KDL`e@LzkRZBbYKasCxm&l2%AFXB@cg5HoWcezNzk4HpW74auVU998<+FCP
zmRCyo2b!~aomeBxeI@U`$FBWF4SbirKjKQ6$Hl2PlV??|%-f}whdylMUUGWrHk*l@
zdYk%YR&_h4uk3yJO7gvHeN4@gJ8Tw7S6`+t*86u%xFf$i?YMYCq`t!WGY16r_>}%p
zFL(L(H^Gk4J#+Q7XFqZTdXvul_^Wa6!%4fRJu~#@CRm2<wmTd(?d6BHGi_4m_8;CS
zExO>vzck)O1_?!Juhm{P|Jxht^>V_R?J17S+De{Z2~6Hwuux1ncD;?h(3v&$uQwOS
zcymAfvAFr<f!5%Vl@GF0ULIF*>51yB694n#ew5eiBgU^KzQwxe^4Fg8%kO*obFwCv
z@{4aDjdKqxyivKj?994zq6~@}2O?8jz5ACgd$mjCty%58OBcAKyItp-@w7NsZk5&&
zY@fDrjziefU~A`dE1P7yj|h90%`)L#u%Z5gvBlQ%SwabWdF5y5?&@YgV9<3T?c&9k
z5hCJ-TkDn-zG<Dy)hFQ>{XFa7`^oJ`<~?${u>8gD@>%B-zdShEt2<9~`RC>*c?Vvl
zDYNoP=2l$H@wGl5_r+jCtL%lxY!m%?o|SAmD<t@^dt$FkW$+vIWsNhFcQ@xf_|$w;
jbQ7C~hs49iQiiNG`3YQK_OEUJ{3uWPUSXff_s(_z^!H#U

delta 1383
zcmZ3^vzcdtf|aF$MEphu)(AaQ14{-5*7pWYtgj84m@hA2W@2Pw;$(RF{gz{iMW28H
zFB_*;n@8JsUPeY%RtAH{?uk(brhEoGY|No7Ts*9fMd_*ehQbDdAU-z_7nrZ$lA4=u
zC}to65@hD#g$PbgWRx&W0m?Wef;8#n7o{7>iSrs78CVz^8ycCKni@p`xyDFbO0DBU
zSU0(uQMG<^(%p&MlttFh{~*(T=cPc;H?z7Ie-BIiYt<+a`fIm-K{12N9G*qom!(t|
zTr@6xrVuQ#mj9RU^+~Kd3$8TpKIOi=TJ72rMHc2gFSH$A?JT(1_0WhlrEa!eXZUxy
zLt8U$ZeGsll%V)cq{HV1qn+~qx3469G$sg$=Gk|7c;0<#S%2H`*h7~;m!cmo-2Ks8
zr+xkE3*IhYq;j?hoBa@#Nxc3_O?cY58`q4YOy641IDXRN_57RHU(C{&_wF*o$)e_%
z2<ts5DbYJsJg*+u*S5yD?3tadL$Od-&}FS{Z9Vc%@29^rzGfeJO0TQ=-?6kt`yJQP
zJg>U`<tls`a7QG~Mt9Yedf^MbYV7Y9FI2rW_4AKq1>uor44V!af4k=SrFP3J=><h$
z&oAs(G3-iyTP)b!Gfl&7dB*+|=g#}{xp#kFbYb6v@_C_ECq!4}n@#!IbX}A?x9+oY
zW@6Zl>Ny8)w<Y>S3%k|5S?3abHc(bHN__37FvT^D=a_$eeQ7sm$I8#UDyQ77|DQb5
z%;|{0PrHXsoXb+y+?|}D@<ut9>xT1mlRumx-wygOe<CK;>gzjCOlwZ`y}Ih^dbx*_
z0^-*EJMhdi$%*fFy2+}lGf8X(avM9{-nqF?y*>HD>aYAxfAZP(9j-4jwe`H0$nm(j
zS^W4@ea~Bh4Zr&tr94?b1wIljxWWI+aHlUz?OaACW=00a#Q_F>2C~59Da*$q#v-y@
zcBB5sH%|_H`S;XoSz2VK@njcf19_0NGK++PSOZoClRq*m)z3&Ptn?EXs8`ilb?&Z&
z+mHUE%jVAAx0!n$*Sz3W4r?9#zbs#S>}d@9!br&p`NgbqekxHjte=X1{_#AAy}Ry=
z=}*?J3N}ZsHYv>9ulV`Lzp6dw?s?r6){&Dhh$*_(fA3Mi2lg}d1y-IbH^ll^_1qFP
zUVVPb@ioTnb3SJU&pMS^|76J``$Lh>qZ2A-Zn@g^FS4=z-h_+2XXRCnAFqu~cKsSX
z)l$m0yQBKbzp@$E*2%rS_SWZJ_4()}V*OdS510N8{v0^p;}f&r_DLrVqSfqoq#jec
zzk(ye_kQll^^q4oPUO_Cms+a#=UBrQZ^@mqe6v3qaj0E4OE`S&(%((Z#`RO`cLraL
zyjgFzz;<KM{#Ux2t}wk>u2`nGppwIEQJO%g&lS#zn#l(yq*{vmcxx-J;yC{&{k=;7
z(|S>deLRnI;-$aUM%>@D^u7H0lru&<|1Op2-c%H;$Xw~qH|fx-etq*RT|1Q?rdjQp
zXCNP&_+4gN#R3`aS=Uz2nzSwYZc>7?sAv81jU~z}Z}wK-TaorGDOc~Gva5^x`tP^i
zp9xPpuDxcugSSCU)uWoi{C(@pWW+X^UiEjJ%9cDuyRZN2w+XB>C%SH4U*U7+|L2Ko
z*@{v$B=2;rdc8Y(v&=D#7b}+iexqQ|e%++>V`G@Y<Hz2;Pv75KTm6yS?dYZza$XH@
kd7tXI{g9Z>_p7lpZ1(e)i`IKY`F{N>(EE1!E*aKG0N3Mg%m4rY

diff --git a/demo/ssl/ssl.txt b/demo/ssl/ssl.txt
index 95a24ca3f..788ab49fa 100644
--- a/demo/ssl/ssl.txt
+++ b/demo/ssl/ssl.txt
@@ -1,21 +1,32 @@
-# In demo all key and stores passwords are 'changeit'
+# Password for all users and teh CA is 'demo'
+# Password for all key- and truststores is 'changeit'
+
+# Clean
+# rm server.*
 
 # Create CA
 openssl genrsa -des3 -out ca.key 4096
-openssl req -new -x509 -days 365 -key ca.key -out ca.crt
+openssl req -new -x509 -days 3650 -key ca.key -out ca.crt
+
+# Create Keystore and Truststore and add CA to them
+keytool -import -keystore server.ts -file ca.crt -alias ArgeoDemoCA
+keytool -import -keystore server.ks -file ca.crt -alias ArgeoDemoCA
 
 # Tomcat Server
+# (we must use keytool)
 keytool -genkey -alias tomcat -keyalg RSA -keysize 4096 -keystore server.ks
 keytool -certreq -alias tomcat -keystore server.ks -file tomcat.csr
 openssl x509 -req -set_serial 02 -days 3650 -in tomcat.csr -CA ca.crt -CAkey ca.key -out tomcat.crt
-keytool -import -keystore server.ts -file ca.crt -alias ArgeoDemoCA
+keytool -importcert -alias tomcat -keystore server.ks -file tomcat.crt
 
 # Root User
-#keytool -genkey -alias root@demo -keyalg RSA -keysize 4096 -keystore root@demo.ks
-#keytool -certreq -alias root@demo -keystore root@demo.ks -file root@demo.csr
-
 openssl genrsa -des3 -out root@demo.key 4096 
 openssl req -new -key root@demo.key -out root@demo.csr
 openssl x509 -req -set_serial 03 -days 3650 -in root@demo.csr -CA ca.crt -CAkey ca.key -out root@demo.crt
-
 openssl pkcs12 -export -out root@demo.p12 -inkey root@demo.key -in root@demo.crt -certfile ca.crt
+
+# Demo User
+openssl genrsa -des3 -out demo@demo.key 4096 
+openssl req -new -key demo@demo.key -out demo@demo.csr
+openssl x509 -req -set_serial 04 -days 3650 -in demo@demo.csr -CA ca.crt -CAkey ca.key -out demo@demo.crt
+openssl pkcs12 -export -out demo@demo.p12 -inkey demo@demo.key -in demo@demo.crt -certfile ca.crt
diff --git a/demo/ssl/tomcat.crt b/demo/ssl/tomcat.crt
index b05dd8c7c..0ce674b16 100644
--- a/demo/ssl/tomcat.crt
+++ b/demo/ssl/tomcat.crt
@@ -1,32 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFdzCCA18CAQIwDQYJKoZIhvcNAQEFBQAwgYsxCzAJBgNVBAYTAkRFMQ8wDQYD
-VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEOMAwGA1UECgwFQXJnZW8xEzAR
-BgNVBAsMCkFyZ2VvIERlbW8xFjAUBgNVBAMMDUFyZ2VvIERlbW8gQ0ExHTAbBgkq
-hkiG9w0BCQEWDmRlbW9AYXJnZW8ub3JnMB4XDTEyMDgxMzEzMDQzNVoXDTIyMDgx
-MTEzMDQzNVowdzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UE
-BxMGQmVybGluMQ4wDAYDVQQKEwVBcmdlbzETMBEGA1UECxMKQXJnZW8gRGVtbzEh
-MB8GA1UEAxMYQXJnZW8gRGVtbyBUb21jYXQgU2VydmVyMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAoF1IzT1815UMzdlvMRkCUy/ISfwArbmGAvv5H1LP
-fPXF+YF6EpjKj74JwHhMGoB1j1BUvem5TeWxszU/mevmFCWvrmO83lBAlSNRX6iJ
-m3np3s2/rrtZg2WUu95ZGkRQ1elPRU9KY99rK+NlJH9X6Y6Bfoi5//OAyeZ+kIxx
-39sYXazAYYS9h+8D1mtSHoSFgLMy73gu4UIeon+GW6PbB+E6kQVlRjumBqLtj6a9
-t59T+coc4UStqmFCuPiZuMvbijS0ZBJxuNcaYATcCIjB/S0Pktfyjgxn3HzCLVtP
-KRskGHHfoxje5QHbH5sE5lEQPMFxuuj5C/9eCKs5+8ob06gNVn4u2SB27mLpafqY
-nJxAhGIqRymZSNwf0Nq7GcUj6OxPCzGG1RBV2Add9YpL4rWAeL1ftdNjRmvDwFpb
-dsY9fO8Oh+sKKsrypQZ0BAHWs+wWVHbgHWHLCv2uky43VRSM3kqBhNcHyc+PWjga
-+/5M+dqIyi9onoyrZ/dj+KaS5gS5u5dcpjoweb78r67+hJUw02VzZCXZdZZaadyi
-zTQ8SeGzob47TAgQ15r6PGcSYPhqcEnlu6FoT6IYWh55p1QjAGHmZs3GF93qhwM5
-/9i420gEvqZNegdOTVx+Q2s9VHV7QlMbAKXOaP0degikt5mQPrmmtikAFiwx4/Aw
-Gr8CAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAXEIZ1OpNWguFWdVn5ksTsw/tpm5M
-cTKBleyXNORrtAwZOo9+B60lRjdeOXGt77UAE5O/0EzR1DoUWs4btOHbHQEVNszM
-1GzudWuWawqcDpAaUKaXL0XjQ+dG1apDbq3MbEONkq1AjBtn3gUL4+Q+wFL6+G4Y
-sfAZkws2CQr1j0gTphAkbUDMtxJdOxSZybhTNgi5oShN46NljMvO9hhSbLMKAPrf
-hyEuyznSoGI3/9KVjK7dmmGAI/ieYc8mU1UIyEVUZPoECSBUJ/T7sFilbL6cFAsf
-IJIdvoBt/aW0+uVee0bZ1hrvYMbgj+Z6FzU7OX8mIbj0Sx9WD8kyoDgJjJ5AbVnQ
-XSlFh1WY99XurhokWtphs1Bmpk6c6alRV46NoAZey6c7UK7ugoMM9NNc+xD1+aK2
-k2bRFhu6LTeF5gyV3w9DA25CnXu7qZ6QiZ8Twav4GAPZIsKXqBx8+hEPN7QN9g0Z
-TlmZ0O25CpKRuYMjP6UI5DX3CvTI+UvlEZL5N9apOnTGh9FE3gkmy1I2gaVcuaW6
-HMXaRiMiZNPL/lJx8qgP8j1upiEtbmaL7bxYr1cql2s14YJJyfaoI26D8NGVkYSb
-BWSLhcjcL8TEwZ09r1geL7xodxov5h9KrgctMvcW7s/Co5xw9xIy8ktlanzDmaTV
-UjYW8C1Sk0eMSMM=
+MIIFYjCCA0oCAQIwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkRFMQ8wDQYD
+VQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEVMBMGA1UECgwMRXhhbXBsZSBH
+bWJIMQwwCgYDVQQLDANSJkQxEDAOBgNVBAMMB0RlbW8gQ0ExHTAbBgkqhkiG9w0B
+CQEWDmNhQGV4YW1wbGUub3JnMB4XDTEzMDUyODExMjYwM1oXDTIzMDUyNjExMjYw
+M1owaDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVy
+bGluMRUwEwYDVQQKEwxFeGFtcGxlIEdtYkgxDDAKBgNVBAsMA1ImRDESMBAGA1UE
+AxMJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAj0X1
+BD4zndTvh5i+ZI+/PJWNhRQYVh+JMFSc85z/APrqZNbwsOEg2mjyLk+bTUcxSZtA
+JLOBGUp7cwQTLD7VTtW7SEtbrcPdikRFQaTL4MNSZNysCPFTOnaPmkHTqnfrNDq2
+yMoaIDp/73dkefT2hoafy6Of1ZC+Sp8QvVORAsnyauRrSnrQSeQlRLm7i2H8FfXK
+zJm33v7LBoX+xJrpKE0fPvJgTsrUaMH76ytMVvDn+PYrW42lmjnAuWZmPJsCjRX7
+XwPggQ6Sdmzj7Z0XeEX3W2ZAMFP2qhbVVSzS4lOUir7/VwfSHmkfhjR8ElzOw6t+
+wG116OXX+yk0INsP/0pLoo8N7yagyrajYcIO5Il7hxVvG5ToHzwgGEn+rMDr1KrF
+f/4XX55Hx2uw7mzkmpyyUVHCyhkNQUwnEmAXKaRM6TH2k84t3TJD/TapiugOGy+a
+o4cKfqfrRDWg09dk4+l4t+BZdlQ2qs/3Umt1aUGar0CLgRhmQJUvFfYCbTFJH4N8
+TVUE1C1C+anIXlapSZCfe9Nfbj1l8yWZwhhMMKaAjsdcBw1upi+cvPuvNTgu1CUz
+uNuPrYTMVkUxbAvZXE0OClZK8uFhlKD+wPzQOOinH7+xXGpAWoAbs5SckuqD7vIz
+mFA9DcllDRT7eQO5xEdfT1jg/PawS1mY8yp1GysCAwEAATANBgkqhkiG9w0BAQUF
+AAOCAgEAQQJm0wDgnsU4caIYt6LGIvPZtuIUfeCy3ZkM0LJsv3JYj8ppb4ULVknM
+8LNPk3W3BAbnuIZR5E9dkByfu2PF/fNpqJRLpCR5zSN3oQsQjHrf9XAr5VeZ0E/w
+YR/udjTJoXQVm2YhtOhDGJ52TW1TZtNGXrn5kmnkWgqm6WSXIZSQ1viW6a6nklZC
+8Tt0o0l+KiiMapgvC9eNonx3CpM+EzSAASmqUz+uPUG0SIQQfuP0Fs5oYaI/I2F3
+j5WxLBdqjTaatwkrhBV22ZoXigWpTNTHcpc469djr23ie+iHlIO/YkL41DDOI5r9
+EsIKxQBKzO9addeys5gReAiEMhDTYGwflliWhdFMAM1mLB4YJjN1iSJEkWkDGg4G
+N+i/Ydx5fgExAws6tE2nUxTBt/F/6Qe+oWCURLE2YDID+t5z7/JQEFJgnboLsUoe
+epKbITPtzNCnnWRwsqsanlx/RbgtI6Flb6/CWGmzlg1y6XhQDO0D6/4amvjeeqVV
+a3vSVpL06K7/PxDFK8vnJmVcC8SqN5RBwsngMnMpPOjD6TNdXo6R45m7UMjQiFO+
+XLi7SSvngmNsaVOlX3adb77ql6DS4dNLZ0UNi6/fr3ADkdkk6yewNJBgVpFoyNPn
+yZdafIUvaRcrH6QXhRyrDLRhF6j9AJNIqUwDBQ1IhexYz/23r6o=
 -----END CERTIFICATE-----
diff --git a/demo/ssl/tomcat.csr b/demo/ssl/tomcat.csr
index cf5521e5d..df66bea18 100644
--- a/demo/ssl/tomcat.csr
+++ b/demo/ssl/tomcat.csr
@@ -1,24 +1,24 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIEvDCCAqQCAQAwdzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVy
-bGluMQ4wDAYDVQQKEwVBcmdlbzETMBEGA1UECxMKQXJnZW8gRGVtbzEhMB8GA1UEAxMYQXJnZW8g
-RGVtbyBUb21jYXQgU2VydmVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoF1IzT18
-15UMzdlvMRkCUy/ISfwArbmGAvv5H1LPfPXF+YF6EpjKj74JwHhMGoB1j1BUvem5TeWxszU/mevm
-FCWvrmO83lBAlSNRX6iJm3np3s2/rrtZg2WUu95ZGkRQ1elPRU9KY99rK+NlJH9X6Y6Bfoi5//OA
-yeZ+kIxx39sYXazAYYS9h+8D1mtSHoSFgLMy73gu4UIeon+GW6PbB+E6kQVlRjumBqLtj6a9t59T
-+coc4UStqmFCuPiZuMvbijS0ZBJxuNcaYATcCIjB/S0Pktfyjgxn3HzCLVtPKRskGHHfoxje5QHb
-H5sE5lEQPMFxuuj5C/9eCKs5+8ob06gNVn4u2SB27mLpafqYnJxAhGIqRymZSNwf0Nq7GcUj6OxP
-CzGG1RBV2Add9YpL4rWAeL1ftdNjRmvDwFpbdsY9fO8Oh+sKKsrypQZ0BAHWs+wWVHbgHWHLCv2u
-ky43VRSM3kqBhNcHyc+PWjga+/5M+dqIyi9onoyrZ/dj+KaS5gS5u5dcpjoweb78r67+hJUw02Vz
-ZCXZdZZaadyizTQ8SeGzob47TAgQ15r6PGcSYPhqcEnlu6FoT6IYWh55p1QjAGHmZs3GF93qhwM5
-/9i420gEvqZNegdOTVx+Q2s9VHV7QlMbAKXOaP0degikt5mQPrmmtikAFiwx4/AwGr8CAwEAAaAA
-MA0GCSqGSIb3DQEBBQUAA4ICAQAs7DPJFRFw3drBpZ+cRXVQIybwYHYfKUPZEOGTX+mFgIgp8qfb
-k5IiTZW5JCj3sbskDUfWRcolCpyapUpB2eNej4Fs7Ry1PzwkzIgY1rMlSUnc0oi0JFpYT541RmWP
-o1e1j6+nEbVaRDZ/qk+vgLg/uCpuMwwdXYNOnax9mmCtXKjdIpwKG/WwqtB7ydDS0AszaItvwM5L
-IRAxuM0FteHYc9b5JCS762UpdJcaDTmvBOOShKG7mMSpFFoFlRThE7+kIQYDiV0pUas9odCEAond
-69sOLy9vIdpi6UHB0kEHB5DzEMlkOI5VyuAgsRQXlzxQKyYDS/PZwrR0+aFRq42ErMkmtFrC9kxG
-oDgFRhSHaej34ifM788x1c1oSq/dcy+DwuhaCXgdaTwnMKQVPQo6mHis6WL3DF8jf2EWJMlxvdw3
-0BwNRNSDAS1wN3jO+fJ7amWPa+OmdbYJB68dFNoSDDWW6Se0NJfKm4QBR21ipVlcC2Bk75s3HBRN
-KM8zV7UHQEgZnptatVtUKgiM3qSVbRxHP/miV/rVQpXAhE7z7ixAclx145piueIs0Jqxr4BgQFMd
-Vxeb4brcYk/3nrRrLKgVhVcywMb1V4YYXKuHIKR+cbHEk/lJ35UfEtCOeUKXyLoavbhoA7Ujfeqg
-0jp+vpbTHSFA6BG6ZUhL6FY+oA==
+MIIErTCCApUCAQAwaDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVy
+bGluMRUwEwYDVQQKEwxFeGFtcGxlIEdtYkgxDDAKBgNVBAsMA1ImRDESMBAGA1UEAxMJbG9jYWxo
+b3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAj0X1BD4zndTvh5i+ZI+/PJWNhRQY
+Vh+JMFSc85z/APrqZNbwsOEg2mjyLk+bTUcxSZtAJLOBGUp7cwQTLD7VTtW7SEtbrcPdikRFQaTL
+4MNSZNysCPFTOnaPmkHTqnfrNDq2yMoaIDp/73dkefT2hoafy6Of1ZC+Sp8QvVORAsnyauRrSnrQ
+SeQlRLm7i2H8FfXKzJm33v7LBoX+xJrpKE0fPvJgTsrUaMH76ytMVvDn+PYrW42lmjnAuWZmPJsC
+jRX7XwPggQ6Sdmzj7Z0XeEX3W2ZAMFP2qhbVVSzS4lOUir7/VwfSHmkfhjR8ElzOw6t+wG116OXX
++yk0INsP/0pLoo8N7yagyrajYcIO5Il7hxVvG5ToHzwgGEn+rMDr1KrFf/4XX55Hx2uw7mzkmpyy
+UVHCyhkNQUwnEmAXKaRM6TH2k84t3TJD/TapiugOGy+ao4cKfqfrRDWg09dk4+l4t+BZdlQ2qs/3
+Umt1aUGar0CLgRhmQJUvFfYCbTFJH4N8TVUE1C1C+anIXlapSZCfe9Nfbj1l8yWZwhhMMKaAjsdc
+Bw1upi+cvPuvNTgu1CUzuNuPrYTMVkUxbAvZXE0OClZK8uFhlKD+wPzQOOinH7+xXGpAWoAbs5Sc
+kuqD7vIzmFA9DcllDRT7eQO5xEdfT1jg/PawS1mY8yp1GysCAwEAAaAAMA0GCSqGSIb3DQEBBQUA
+A4ICAQCORSPE6s/ogDnCwX4KDkk8srvdkuERiC3Hb6vTP0bVkLRwHdj77xGNwkXI7UasE52ykOze
+khMuk94onH8yyeDg57EXO4267AsqowV6Od94AGKTndx4Zosx2N+JOGGA0ZwCHvmoX1Wwe1KJ6QoI
+uMdpO+i9uo4ZYth76VV+Yn3mtyJAH0sdHeFkgevKLDURtC+m70XF77NKl+L7VuoNKxXaVCab3d/x
+aksTJpwLGt8QECR1Wq5FPNG/EQiFqQCd3WyzgsebGLDHYQgPEKkKKhMU3G/kIofutz/hNvxp8MRK
+EEEnyfZWiSpYxxmEPmelyinOkoOH5tqbkHzcPawSPFWDBR4pWAg9efdl7zdVAxzNkS5PqWtXrWvm
+jfMAPkTJoeQ6YWZZjHxpYrbBZfIgCr9VehGdzvhDVGbe8NeTDzwk/AItr5shIbFZpA0vIHB4+wEA
+QVl7d1ZM/0qEKGLeHG8TvF4TUIBE1C6RVpnP5jMB9pLQ4FEbgHaadGxQfGxh18GfyxlWmQy8RgDW
+BDJRPClofXm57665hD+py7Jw5F4ZgD5IKwU96kDe7mZRLkF66ZinoubZeyXZBX4N0p7lrWzd/mJj
+r3Yf69L/Ptct7Cr3c4z7Y1xqrBb88bKhVRCfJVtlvE9mSvMh6UUY1QlAGQaDmSQEB+eCO+8diaTa
+gEOeNw==
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/server/modules/org.argeo.server.catalina/pom.xml b/server/modules/org.argeo.server.catalina/pom.xml
index 8d4af2597..ac3a08f08 100644
--- a/server/modules/org.argeo.server.catalina/pom.xml
+++ b/server/modules/org.argeo.server.catalina/pom.xml
@@ -32,6 +32,7 @@
 							org.springframework.security.ui;resolution:=optional,
 							org.springframework.security.ui.savedrequest;resolution:=optional,
 							org.springframework.security.userdetails;resolution:=optional,
+							org.springframework.security.providers.preauth;resolution:=optional,
 							org.springframework.web.context.request;resolution:=optional
 						</Import-Package>
 					</instructions>
diff --git a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/catalina/start/CatalinaActivator.java b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/catalina/start/CatalinaActivator.java
index 2656490fd..b990c9906 100644
--- a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/catalina/start/CatalinaActivator.java
+++ b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/catalina/start/CatalinaActivator.java
@@ -6,11 +6,15 @@ import java.net.URL;
 import java.util.Properties;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
 import org.springframework.osgi.web.tomcat.internal.Activator;
 
 /** Starts Catalina (hacked from Spring OSGi 1.0) */
 public class CatalinaActivator extends Activator {
+	private final static Log log = LogFactory.getLog(CatalinaActivator.class);
+
 	private final static String ARGEO_OSGI_DATA_DIR = "argeo.osgi.data.dir";
 	/** System properties used to override Tomcat XML config URL */
 	public final static String ARGEO_SERVER_TOMCAT_CONFIG = "argeo.server.tomcat.config";
@@ -72,6 +76,14 @@ public class CatalinaActivator extends Activator {
 			System.setProperty("catalina.base",
 					System.getProperty(ARGEO_OSGI_DATA_DIR) + "/tomcat");
 
+		// Make sure directories are created
+		File catalinaDir = new File(System.getProperty("catalina.home"));
+		if (!catalinaDir.exists()) {
+			catalinaDir.mkdirs();
+			if (log.isDebugEnabled())
+				log.debug("Created Tomcat directory " + catalinaDir);
+		}
+
 		// Call Spring starter
 		super.start(context);
 	}
diff --git a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/Activator.java b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/Activator.java
index 9481f3158..17ed5e996 100644
--- a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/Activator.java
+++ b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/Activator.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
@@ -155,12 +156,20 @@ public class Activator implements BundleActivator {
 			throws Exception {
 		URL xmlConfiguration = null;
 
-		if (System.getProperty(CatalinaActivator.ARGEO_SERVER_TOMCAT_CONFIG) != null)
-			xmlConfiguration = new URL(
-					System.getProperty(CatalinaActivator.ARGEO_SERVER_TOMCAT_CONFIG));
-		else
+		if (System.getProperty(CatalinaActivator.ARGEO_SERVER_TOMCAT_CONFIG) != null) {
+			String customConfig = System
+					.getProperty(CatalinaActivator.ARGEO_SERVER_TOMCAT_CONFIG);
+			try {
+				xmlConfiguration = new URL(customConfig);
+			} catch (MalformedURLException e) {
+				// within this bundle
+				// typically 'default-server-ssl.xml'
+				xmlConfiguration = bundle.getResource(customConfig);
+			}
+		} else {
 			// fragment
 			xmlConfiguration = bundle.getResource(XML_CONF_LOCATION);
+		}
 
 		if (xmlConfiguration != null) {
 			log.info("Using custom XML configuration " + xmlConfiguration);
diff --git a/demo/tomcat-server-ssl.xml b/server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server-ssl.xml
similarity index 100%
rename from demo/tomcat-server-ssl.xml
rename to server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server-ssl.xml
-- 
2.30.2