diff -r b70a26ca271c -r 5ae2bc554c23 etwist/twconfig.py --- a/etwist/twconfig.py Wed Jan 19 10:13:31 2011 +0100 +++ b/etwist/twconfig.py Wed Jan 19 11:22:39 2011 +0100 @@ -23,7 +23,6 @@ * the "all-in-one" configuration to get a web instance running in a twisted web server integrating a repository server in the same process (only available if the repository part of the software is installed - """ __docformat__ = "restructuredtext en" @@ -31,8 +30,10 @@ from logilab.common.configuration import Method +from cubicweb.cwconfig import CONFIGURATIONS from cubicweb.web.webconfig import WebConfiguration, merge_options + class TwistedConfiguration(WebConfiguration): """web instance (in a twisted web server) client of a RQL server""" name = 'twisted' @@ -98,6 +99,9 @@ from socket import gethostname return 'http://%s:%s/' % (self['host'] or gethostname(), self['port'] or 8080) + +CONFIGURATIONS.append(TwistedConfiguration) + try: from cubicweb.server.serverconfig import ServerConfiguration @@ -114,5 +118,8 @@ """tell if pyro is activated for the in memory repository""" return self['pyro-server'] + + CONFIGURATIONS.append(AllInOneConfiguration) + except ImportError: pass