Index: /main/waeup.kofa/trunk/buildout-zeo.cfg
===================================================================
--- /main/waeup.kofa/trunk/buildout-zeo.cfg	(revision 11709)
+++ /main/waeup.kofa/trunk/buildout-zeo.cfg	(revision 11710)
@@ -97,11 +97,11 @@
 [zeo1_ini]
 recipe = collective.recipe.template
-input = etc/zeo1.ini.in
-output = ${buildout:parts-directory}/etc/zeo1.ini
+input = etc/themed/zeo1.ini.in
+output = ${buildout:parts-directory}/etc/themed-zeo1.ini
 
 [zeo2_ini]
 recipe = collective.recipe.template
-input = etc/zeo2.ini.in
-output = ${buildout:parts-directory}/etc/zeo2.ini
+input = etc/themed/zeo2.ini.in
+output = ${buildout:parts-directory}/etc/themed-zeo2.ini
 
 [zeo1_conf]
Index: in/waeup.kofa/trunk/etc/debug.ini.in
===================================================================
--- /main/waeup.kofa/trunk/etc/debug.ini.in	(revision 11709)
+++ 	(revision )
@@ -1,94 +1,0 @@
-# debug.ini
-#
-# Debugging configuration for use with paster/WSGI
-#
-
-[loggers]
-keys = root, wsgi
-
-[handlers]
-keys = console, accesslog, asynclog, async_tracelog
-
-[formatters]
-keys = generic, accesslog
-
-[formatter_generic]
-format = %(asctime)s %(levelname)s [%(name)s] %(message)s
-
-[formatter_accesslog]
-format = %(message)s
-
-[handler_asynclog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'async.log'),
-        'a')
-level = INFO
-formatter = generic
-
-[handler_async_tracelog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'async_trace.log'),
-        'a')
-level = INFO
-formatter = generic
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[handler_accesslog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'access.log'),
-        'a')
-level = INFO
-formatter = accesslog
-
-[logger_root]
-level = INFO
-handlers = console
-
-[logger_wsgi]
-level = INFO
-handlers = accesslog
-qualname = wsgi
-propagate = 0
-
-[logger_async]
-level = INFO
-handlers = asynclog
-qualname = zc.async
-propagate = 0
-
-[logger_async_trace]
-level = INFO
-handlers = async_tracelog
-qualname = zc.async.trace
-propagate = 0
-
-[filter:translogger]
-use = egg:Paste#translogger
-setup_console_handler = False
-logger_name = wsgi
-
-[filter-app:main]
-# Change the last part from 'ajax' to 'pdb' for a post-mortem debugger
-# on the console:
-use = egg:z3c.evalexception#ajax
-next = zope
-
-[app:zope]
-use = egg:${kofa_params:devel_pkg}#debug
-filter-with = translogger
-exempt-exceptions = zope.security.interfaces.IUnauthorized
-
-[server:main]
-use = egg:Paste#http
-host = ${kofa_params:host}
-port = ${kofa_params:base_port}
-
-[DEFAULT]
-# set the name of the zope.conf file
-zope_conf = %(here)s/zope.conf
-env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
Index: in/waeup.kofa/trunk/etc/deploy.ini.in
===================================================================
--- /main/waeup.kofa/trunk/etc/deploy.ini.in	(revision 11709)
+++ 	(revision )
@@ -1,94 +1,0 @@
-# deploy.ini
-#
-# Deployment configuration for use with paster/WSGI
-#
-
-[loggers]
-keys = root, wsgi, async, async_trace
-
-[handlers]
-keys = null, console, accesslog, asynclog, async_tracelog
-
-[formatters]
-keys = generic, accesslog
-
-[logger_root]
-level = INFO
-handlers = console
-
-[logger_wsgi]
-level = INFO
-#handlers = accesslog
-handlers = null
-qualname = wsgi
-propagate = 0
-
-[logger_async]
-level = INFO
-handlers = asynclog
-qualname = zc.async
-propagate = 0
-
-[logger_async_trace]
-level = INFO
-handlers = async_tracelog
-qualname = zc.async.trace
-propagate = 0
-
-[handler_null]
-# you can use 'NullHandler' (w/o the path) if under Python 2.7+
-class = waeup.kofa.utils.helpers.NullHandler
-args = ()
-level = NOTSET
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[handler_accesslog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'access.log'),
-        'a')
-level = INFO
-formatter = accesslog
-
-[handler_asynclog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'async.log'),
-        'a')
-level = INFO
-formatter = generic
-
-[handler_async_tracelog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'async_trace.log'),
-        'a')
-level = INFO
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)s [%(name)s] %(message)s
-
-[formatter_accesslog]
-format = %(message)s
-
-[filter:translogger]
-use = egg:Paste#translogger
-setup_console_handler = False
-logger_name = wsgi
-
-[app:main]
-use = egg:${kofa_params:devel_pkg}
-filter-with = translogger
-
-[server:main]
-use = egg:Paste#http
-host = ${kofa_params:host}
-port = ${kofa_params:base_port}
-
-[DEFAULT]
-# set the name of the zope.conf file
-zope_conf = %(here)s/zope.conf
-env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
Index: /main/waeup.kofa/trunk/etc/themed/zeo1.ini.in
===================================================================
--- /main/waeup.kofa/trunk/etc/themed/zeo1.ini.in	(revision 11710)
+++ /main/waeup.kofa/trunk/etc/themed/zeo1.ini.in	(revision 11710)
@@ -0,0 +1,119 @@
+# deploy.ini
+#
+# Deployment configuration for use with paster/WSGI
+#
+
+[loggers]
+keys = root, wsgi, async, async_trace
+
+[handlers]
+keys = null, console, accesslog, asynclog, async_tracelog
+
+[formatters]
+keys = generic, accesslog
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_wsgi]
+level = INFO
+#handlers = accesslog
+handlers = null
+qualname = wsgi
+propagate = 0
+
+[logger_async]
+level = INFO
+handlers = asynclog
+qualname = zc.async
+propagate = 0
+
+[logger_async_trace]
+level = INFO
+handlers = async_tracelog
+qualname = zc.async.trace
+propagate = 0
+
+[handler_null]
+# you can use 'NullHandler' (w/o the path) if under Python 2.7+
+class = waeup.kofa.utils.helpers.NullHandler
+args = ()
+level = NOTSET
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[handler_accesslog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo1.log'),
+        'a')
+level = INFO
+formatter = accesslog
+
+[handler_asynclog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo1_async.log'),
+        'a')
+level = INFO
+formatter = generic
+
+[handler_async_tracelog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo1_async_trace.log'),
+        'a')
+level = INFO
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)s [%(name)s] %(message)s
+
+[formatter_accesslog]
+format = %(message)s
+
+[filter:translogger]
+use = egg:Paste#translogger
+setup_console_handler = False
+logger_name = wsgi
+
+[app:zope]
+use = egg:${kofa_params:devel_pkg}
+filter-with = translogger
+
+[app:static]
+use = egg:Paste#static
+document_root = %(LAYOUT_DIR)s/static/
+
+[pipeline:default]
+pipeline = theme
+           zope
+
+[composite:main]
+use = egg:Paste#urlmap
+/static = static
+/ = default
+
+[filter:theme]
+use = egg:diazo
+rules = %(LAYOUT_DIR)s/rules.xml
+prefix = /
+doctype = <!DOCTYPE html>
+# set to true, if you want rules.xml being rebuild on each request
+debug = false
+
+[server:main]
+use = egg:Paste#http
+host = ${kofa_params:host}
+port = ${kofa_params:zeo1_port}
+threadpool_workers = ${kofa_params:threadpool_workers}
+use_threadpool = True
+
+[DEFAULT]
+# set the name of the zope.conf file
+zope_conf = %(here)s/zope_zeo1.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
+LAYOUT_DIR = ${buildout:directory}/layout
+STATIC_DIR = %(LAYOUT_DIR)s/static
Index: /main/waeup.kofa/trunk/etc/themed/zeo2.ini.in
===================================================================
--- /main/waeup.kofa/trunk/etc/themed/zeo2.ini.in	(revision 11710)
+++ /main/waeup.kofa/trunk/etc/themed/zeo2.ini.in	(revision 11710)
@@ -0,0 +1,119 @@
+# deploy.ini
+#
+# Deployment configuration for use with paster/WSGI
+#
+
+[loggers]
+keys = root, wsgi, async, async_trace
+
+[handlers]
+keys = null, console, accesslog, asynclog, async_tracelog
+
+[formatters]
+keys = generic, accesslog
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_wsgi]
+level = INFO
+#handlers = accesslog
+handlers = null
+qualname = wsgi
+propagate = 0
+
+[logger_async]
+level = INFO
+handlers = asynclog
+qualname = zc.async
+propagate = 0
+
+[logger_async_trace]
+level = INFO
+handlers = async_tracelog
+qualname = zc.async.trace
+propagate = 0
+
+[handler_null]
+# you can use 'NullHandler' (w/o the path) if under Python 2.7+
+class = waeup.kofa.utils.helpers.NullHandler
+args = ()
+level = NOTSET
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[handler_accesslog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo2.log'),
+        'a')
+level = INFO
+formatter = accesslog
+
+[handler_asynclog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo2_async.log'),
+        'a')
+level = INFO
+formatter = generic
+
+[handler_async_tracelog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo2_async_trace.log'),
+        'a')
+level = INFO
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)s [%(name)s] %(message)s
+
+[formatter_accesslog]
+format = %(message)s
+
+[filter:translogger]
+use = egg:Paste#translogger
+setup_console_handler = False
+logger_name = wsgi
+
+[app:zope]
+use = egg:${kofa_params:devel_pkg}
+filter-with = translogger
+
+[app:static]
+use = egg:Paste#static
+document_root = %(LAYOUT_DIR)s/static
+
+[pipeline:default]
+pipeline = theme
+           zope
+
+[composite:main]
+use = egg:Paste#urlmap
+/static = static
+/ = default
+
+[filter:theme]
+use = egg:diazo
+rules = %(LAYOUT_DIR)s/rules.xml
+prefix = /
+doctype = <!DOCTYPE html>
+# set to true, if you want rules.xml being rebuild on each request
+debug = false
+
+[server:main]
+use = egg:Paste#http
+host = ${kofa_params:host}
+port = ${kofa_params:zeo2_port}
+threadpool_workers = ${kofa_params:threadpool_workers}
+use_threadpool = True
+
+[DEFAULT]
+# set the name of the zope.conf file
+zope_conf = %(here)s/zope_zeo2.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid2.txt
+LAYOUT_DIR = ${buildout:directory}/layout
+STATIC_DIR = %(LAYOUT_DIR)s/static
Index: /main/waeup.kofa/trunk/etc/zeo1.conf.in
===================================================================
--- /main/waeup.kofa/trunk/etc/zeo1.conf.in	(revision 11709)
+++ /main/waeup.kofa/trunk/etc/zeo1.conf.in	(revision 11710)
@@ -1,4 +1,4 @@
 <runner>
-  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/zeo1.ini
+  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/themed-zeo1.ini
   daemon on
   transcript ${zope_conf:logfiles}/zdaemon-zeo1.log
Index: in/waeup.kofa/trunk/etc/zeo1.ini.in
===================================================================
--- /main/waeup.kofa/trunk/etc/zeo1.ini.in	(revision 11709)
+++ 	(revision )
@@ -1,119 +1,0 @@
-# deploy.ini
-#
-# Deployment configuration for use with paster/WSGI
-#
-
-[loggers]
-keys = root, wsgi, async, async_trace
-
-[handlers]
-keys = null, console, accesslog, asynclog, async_tracelog
-
-[formatters]
-keys = generic, accesslog
-
-[logger_root]
-level = INFO
-handlers = console
-
-[logger_wsgi]
-level = INFO
-#handlers = accesslog
-handlers = null
-qualname = wsgi
-propagate = 0
-
-[logger_async]
-level = INFO
-handlers = asynclog
-qualname = zc.async
-propagate = 0
-
-[logger_async_trace]
-level = INFO
-handlers = async_tracelog
-qualname = zc.async.trace
-propagate = 0
-
-[handler_null]
-# you can use 'NullHandler' (w/o the path) if under Python 2.7+
-class = waeup.kofa.utils.helpers.NullHandler
-args = ()
-level = NOTSET
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[handler_accesslog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'zeo1.log'),
-        'a')
-level = INFO
-formatter = accesslog
-
-[handler_asynclog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'zeo1_async.log'),
-        'a')
-level = INFO
-formatter = generic
-
-[handler_async_tracelog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'zeo1_async_trace.log'),
-        'a')
-level = INFO
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)s [%(name)s] %(message)s
-
-[formatter_accesslog]
-format = %(message)s
-
-[filter:translogger]
-use = egg:Paste#translogger
-setup_console_handler = False
-logger_name = wsgi
-
-[app:zope]
-use = egg:${kofa_params:devel_pkg}
-filter-with = translogger
-
-[app:static]
-use = egg:Paste#static
-document_root = %(LAYOUT_DIR)s/static/
-
-[pipeline:default]
-pipeline = theme
-           zope
-
-[composite:main]
-use = egg:Paste#urlmap
-/static = static
-/ = default
-
-[filter:theme]
-use = egg:diazo
-rules = %(LAYOUT_DIR)s/rules.xml
-prefix = /
-doctype = <!DOCTYPE html>
-# set to true, if you want rules.xml being rebuild on each request
-debug = false
-
-[server:main]
-use = egg:Paste#http
-host = ${kofa_params:host}
-port = ${kofa_params:zeo1_port}
-threadpool_workers = ${kofa_params:threadpool_workers}
-use_threadpool = True
-
-[DEFAULT]
-# set the name of the zope.conf file
-zope_conf = %(here)s/zope_zeo1.conf
-env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
-LAYOUT_DIR = ${buildout:directory}/layout
-STATIC_DIR = %(LAYOUT_DIR)s/static
Index: /main/waeup.kofa/trunk/etc/zeo2.conf.in
===================================================================
--- /main/waeup.kofa/trunk/etc/zeo2.conf.in	(revision 11709)
+++ /main/waeup.kofa/trunk/etc/zeo2.conf.in	(revision 11710)
@@ -1,4 +1,4 @@
 <runner>
-  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/zeo2.ini
+  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/themed-zeo2.ini
   daemon on
   transcript ${zope_conf:logfiles}/zdaemon-zeo2.log
Index: in/waeup.kofa/trunk/etc/zeo2.ini.in
===================================================================
--- /main/waeup.kofa/trunk/etc/zeo2.ini.in	(revision 11709)
+++ 	(revision )
@@ -1,119 +1,0 @@
-# deploy.ini
-#
-# Deployment configuration for use with paster/WSGI
-#
-
-[loggers]
-keys = root, wsgi, async, async_trace
-
-[handlers]
-keys = null, console, accesslog, asynclog, async_tracelog
-
-[formatters]
-keys = generic, accesslog
-
-[logger_root]
-level = INFO
-handlers = console
-
-[logger_wsgi]
-level = INFO
-#handlers = accesslog
-handlers = null
-qualname = wsgi
-propagate = 0
-
-[logger_async]
-level = INFO
-handlers = asynclog
-qualname = zc.async
-propagate = 0
-
-[logger_async_trace]
-level = INFO
-handlers = async_tracelog
-qualname = zc.async.trace
-propagate = 0
-
-[handler_null]
-# you can use 'NullHandler' (w/o the path) if under Python 2.7+
-class = waeup.kofa.utils.helpers.NullHandler
-args = ()
-level = NOTSET
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[handler_accesslog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'zeo2.log'),
-        'a')
-level = INFO
-formatter = accesslog
-
-[handler_asynclog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'zeo2_async.log'),
-        'a')
-level = INFO
-formatter = generic
-
-[handler_async_tracelog]
-class = FileHandler
-args = (os.path.join(r'${zope_conf:logfiles}', 'zeo2_async_trace.log'),
-        'a')
-level = INFO
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)s [%(name)s] %(message)s
-
-[formatter_accesslog]
-format = %(message)s
-
-[filter:translogger]
-use = egg:Paste#translogger
-setup_console_handler = False
-logger_name = wsgi
-
-[app:zope]
-use = egg:${kofa_params:devel_pkg}
-filter-with = translogger
-
-[app:static]
-use = egg:Paste#static
-document_root = %(LAYOUT_DIR)s/static
-
-[pipeline:default]
-pipeline = theme
-           zope
-
-[composite:main]
-use = egg:Paste#urlmap
-/static = static
-/ = default
-
-[filter:theme]
-use = egg:diazo
-rules = %(LAYOUT_DIR)s/rules.xml
-prefix = /
-doctype = <!DOCTYPE html>
-# set to true, if you want rules.xml being rebuild on each request
-debug = false
-
-[server:main]
-use = egg:Paste#http
-host = ${kofa_params:host}
-port = ${kofa_params:zeo2_port}
-threadpool_workers = ${kofa_params:threadpool_workers}
-use_threadpool = True
-
-[DEFAULT]
-# set the name of the zope.conf file
-zope_conf = %(here)s/zope_zeo2.conf
-env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid2.txt
-LAYOUT_DIR = ${buildout:directory}/layout
-STATIC_DIR = %(LAYOUT_DIR)s/static
