diff --git a/README.rst b/README.rst index c8141f8..3b10ee6 100644 --- a/README.rst +++ b/README.rst @@ -144,6 +144,31 @@ An example: mywebsite +.. _Additional ZCML: + +Additional ZCML +~~~~~~~~~~~~~~~ + +There is a `problem `_ with +extending the ``zcml-additional``. +As a workaround we use the ``buildout:zcml-additional-fragments`` variable, which takes +care that ``zcml-additional`` is wrapped properly. + +Usage example: + +.. code:: ini + + [buildout] + extends = + https://raw.github.com/4teamwork/ftw-buildouts/master/production.cfg + + deployment-number = 05 + + zcml-additional-fragments += + + + + Port range configuration ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -199,6 +224,10 @@ Here is a full example, below is the detail explenation: plone-languages = en de fr + zcml-additional-fragments += + + + These are the most common configuration settings. You can also override any options in the sections of the parts. @@ -219,6 +248,7 @@ Details: - ``supervisor-httpok-options`` - Allows to change or extend the httpok settings per instance. The process name and the http address are added per ZEO client. - ``plone-languages`` - The short names of the languages which are loaded by Zope. +- ``zcml-additional-fragments`` - Define additional zcml to load. See the `Additional ZCML`_ section. Tika server @@ -240,7 +270,6 @@ Example: deployment-number = 05 - .. _coverage: http://pypi.python.org/pypi/coverage .. _Cobertura Jenkins Plugin: https://wiki.jenkins-ci.org/display/JENKINS/Cobertura+Plugin .. _Warnings Plugin: https://wiki.jenkins-ci.org/display/JENKINS/Warnings+Plugin diff --git a/plone-development-tika.cfg b/plone-development-tika.cfg index ccf5dfd..5e2dc99 100644 --- a/plone-development-tika.cfg +++ b/plone-development-tika.cfg @@ -4,9 +4,11 @@ parts += tika-server +zcml-additional-fragments += ${tika:zcml} + + [instance] eggs += ftw.tika -zcml-additional += ${tika:zcml} [tika] diff --git a/plone-development.cfg b/plone-development.cfg index 84c11d1..a62bad3 100644 --- a/plone-development.cfg +++ b/plone-development.cfg @@ -23,6 +23,8 @@ i18n-domain = ${buildout:package-namespace} always-checkout = false +zcml-additional-fragments = + [instance] recipe = plone.recipe.zope2instance @@ -39,6 +41,10 @@ eggs = environment-vars = zope_i18n_compile_mo_files true +zcml-additional = + + ${buildout:zcml-additional-fragments} + [omelette] diff --git a/production.cfg b/production.cfg index c1d45e1..611d8a3 100644 --- a/production.cfg +++ b/production.cfg @@ -36,6 +36,8 @@ supervisor-httpok-options = -t ${buildout:supervisor-httpok-timeout} -m ${buildo plone-languages = en de fr +zcml-additional-fragments = + @@ -68,6 +70,11 @@ http-address = 1${buildout:deployment-number}00 eggs = Plone ${buildout:instance-eggs} +zcml-additional = + + ${buildout:zcml-additional-fragments} + + zope-conf-additional = datetime-format international environment-vars = diff --git a/tika-server.cfg b/tika-server.cfg index 2a839d5..bcfc7f8 100644 --- a/tika-server.cfg +++ b/tika-server.cfg @@ -5,9 +5,7 @@ parts += instance-eggs += ftw.tika - -[instance0] -zcml-additional += ${tika:zcml} +zcml-additional-fragments += ${tika:zcml} [tika]