--- a/cwctl.py	Thu May 15 23:07:43 2014 +0200
+++ b/cwctl.py	Thu May 15 23:18:17 2014 +0200
@@ -1053,6 +1053,12 @@
     pass
 else:
     WSGI_CHOICES['werkzeug'] = wz
+try:
+    from cubicweb.wsgi import tnd
+except ImportError:
+    pass
+else:
+    WSGI_CHOICES['tornado'] = tnd
 
 
 def wsgichoices():

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wsgi/tnd.py	Thu May 15 23:18:17 2014 +0200
@@ -0,0 +1,47 @@
+# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of CubicWeb.
+#
+# CubicWeb is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option)
+# any later version.
+#
+# CubicWeb is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
+"""tornado wsgi server for CubicWeb web instances"""
+
+__docformat__ = "restructuredtext en"
+
+
+from cubicweb.wsgi.handler import CubicWebWSGIApplication
+from cubicweb import ConfigurationError
+from tornado import wsgi, httpserver, ioloop
+
+from logging import getLogger
+LOGGER = getLogger('cubicweb')
+
+
+def run(config):
+    config.check_writeable_uid_directory(config.appdatahome)
+
+    port = config['port'] or 8080
+    interface = config['interface']
+
+    app = CubicWebWSGIApplication(config)
+    container = wsgi.WSGIContainer(app)
+    http_server = httpserver.HTTPServer(container)
+    http_server.listen(port, interface)
+    repo = app.appli.repo
+    try:
+        repo.start_looping_tasks()
+        LOGGER.info('starting http server on %s', config['base-url'])
+        ioloop.IOLoop.instance().start()
+    finally:
+        repo.shutdown()