[Checkins] SVN: grokproject/trunk/ Merge changes from ulif-dynamic_conf_files branch back into trunk.
Uli Fouquet
uli at gnufix.de
Thu Feb 5 07:19:36 EST 2009
Log message for revision 96129:
Merge changes from ulif-dynamic_conf_files branch back into trunk.
Changed:
U grokproject/trunk/CHANGES.txt
U grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl
A grokproject/trunk/grokproject/template_paste/cfg_templates/
D grokproject/trunk/grokproject/template_paste/etc/
A grokproject/trunk/grokproject/template_paste/etc/
U grokproject/trunk/tests_paste.txt
U grokproject/trunk/tests_zopectl.txt
-=-
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt 2009-02-05 11:54:56 UTC (rev 96128)
+++ grokproject/trunk/CHANGES.txt 2009-02-05 12:19:36 UTC (rev 96129)
@@ -4,6 +4,11 @@
1.0a3 (unreleased)
------------------
+* Fix bug https://bugs.launchpad.net/grok/+bug/325299 The config files
+ in paster-based grok projects are now generated by ``zc.buildout``
+ and can be adjusted to local environments. Rerunning
+ ``bin/buildout`` now rebuilds the configuration files in ``etc/``.
+
* Fix bug https://bugs.launchpad.net/grok/+bug/315214 by supporting
faster test runs. See README-shorttests.txt for details.
Modified: grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl 2009-02-05 11:54:56 UTC (rev 96128)
+++ grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl 2009-02-05 12:19:36 UTC (rev 96129)
@@ -1,6 +1,7 @@
[buildout]
develop = .
-parts = eggbasket app i18n test data log
+parts = eggbasket app i18n test data log
+ zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
newest = ${newest}
extends = versions.cfg
# eggs will be installed in the default buildout location
@@ -38,6 +39,32 @@
output = src/${package}/locales
zcml =
+[zope_conf]
+recipe = collective.recipe.template
+input = cfg_templates/zope.conf.in
+output = etc/zope.conf
+
+[site_zcml]
+recipe = collective.recipe.template
+input = cfg_templates/site.zcml.in
+output = etc/site.zcml
+
+[zdaemon_conf]
+recipe = collective.recipe.template
+input = cfg_templates/zdaemon.conf.in
+output = etc/zdaemon.conf
+
+[deploy_ini]
+recipe = collective.recipe.template
+input = cfg_templates/deploy.ini.in
+output = etc/deploy.ini
+
+[debug_ini]
+recipe = collective.recipe.template
+input = cfg_templates/debug.ini.in
+output = etc/debug.ini
+
+
[eggbasket]
recipe = z3c.recipe.eggbasket
eggs = grok
Modified: grokproject/trunk/tests_paste.txt
===================================================================
--- grokproject/trunk/tests_paste.txt 2009-02-05 11:54:56 UTC (rev 96128)
+++ grokproject/trunk/tests_paste.txt 2009-02-05 12:19:36 UTC (rev 96129)
@@ -34,6 +34,7 @@
bin
bootstrap.py
buildout.cfg
+ cfg_templates
develop-eggs
etc
parts
@@ -73,6 +74,13 @@
zdaemon.conf
zope.conf
+In the generated configuration files paths are set to local paths::
+
+ >>> cat(etc_dir, 'zope.conf')
+ # Identify the component configuration used to define the site:
+ site-definition /.../GrokExample/etc/site.zcml
+ ...
+
The eggs dir is filled now::
>>> len(os.listdir(eggsdir)) > 100
@@ -216,7 +224,6 @@
>>> output = read_sh(cmd)
>>> print output
Develop: '...'
- ...
Updating eggbasket.
Updating app.
Updating i18n.
@@ -225,9 +232,13 @@
Updating test.
Updating data.
Updating log.
+ Updating zope_conf.
+ Updating site_zcml.
+ Updating zdaemon_conf.
+ Updating deploy_ini.
+ Updating debug_ini.
<BLANKLINE>
-
Using the generated `bootstrap` script
--------------------------------------
Modified: grokproject/trunk/tests_zopectl.txt
===================================================================
--- grokproject/trunk/tests_zopectl.txt 2009-02-05 11:54:56 UTC (rev 96128)
+++ grokproject/trunk/tests_zopectl.txt 2009-02-05 12:19:36 UTC (rev 96129)
@@ -183,7 +183,6 @@
>>> output = read_sh(cmd)
>>> print output
Develop: '...'
- ...
Updating eggbasket.
Updating app.
Updating data.
More information about the Checkins
mailing list