Introduce buildout:zcml-additional-fragments buildout variable

README.rst

@@ -144,6 +144,31 @@ An example:
         mywebsite
 
 
+.. _Additional ZCML:
+
+Additional ZCML
+~~~~~~~~~~~~~~~
+
+There is a `problem <https://github.com/plone/plone.recipe.zope2instance/pull/13>`_ 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 +=
+        <include package="my.package" file="meta.zcml" />
+        <myPackageSecurity token="123123" />
+
+
 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 +=
+        <include package="my.package" file="meta.zcml" />
+        <myPackageSecurity token="123123" />
+
 
 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

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]

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 =
+    <configure xmlns="http://namespaces.zope.org/zope">
+        ${buildout:zcml-additional-fragments}
+    </configure>
 
 
 [omelette]

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 =
+    <configure xmlns="http://namespaces.zope.org/zope">
+        ${buildout:zcml-additional-fragments}
+    </configure>
+
 
 zope-conf-additional = datetime-format international
 environment-vars =

tika-server.cfg

@@ -5,9 +5,7 @@ parts +=
 
 instance-eggs += ftw.tika
 
-
-[instance0]
-zcml-additional += ${tika:zcml}
+zcml-additional-fragments += ${tika:zcml}
 
 
 [tika]