[Checkins] SVN: grokapps/rdbexample/trunk/ Really use latest Grok 1.0b1 templates
Vincent Fretin
vincent.fretin at gmail.com
Thu Sep 17 17:40:57 EDT 2009
Log message for revision 104265:
Really use latest Grok 1.0b1 templates
Changed:
U grokapps/rdbexample/trunk/buildout.cfg
U grokapps/rdbexample/trunk/etc/debug.ini.in
U grokapps/rdbexample/trunk/etc/deploy.ini.in
U grokapps/rdbexample/trunk/etc/site.zcml.in
U grokapps/rdbexample/trunk/etc/zdaemon.conf.in
U grokapps/rdbexample/trunk/etc/zope.conf.in
A grokapps/rdbexample/trunk/sources.cfg
-=-
Modified: grokapps/rdbexample/trunk/buildout.cfg
===================================================================
--- grokapps/rdbexample/trunk/buildout.cfg 2009-09-17 21:21:32 UTC (rev 104264)
+++ grokapps/rdbexample/trunk/buildout.cfg 2009-09-17 21:40:57 UTC (rev 104265)
@@ -1,41 +1,46 @@
[buildout]
develop = .
-parts = eggbasket app i18n test data log zpasswd
- zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+ eggbasket
+ app
+ i18n
+ test
+ mkdirs
+ zpasswd
+ zope_conf
+ site_zcml
+ zdaemon_conf
+ deploy_ini
+ debug_ini
newest = false
+
extends = http://grok.zope.org/releaseinfo/grok-1.0b2.cfg
# eggs will be installed in the default buildout location
# (see .buildout/default.cfg in your home directory)
# unless you specify an eggs-directory option here.
versions = versions
-extensions += mr.developer
-auto-checkout =
- megrok.rdb
- z3c.saconfig
-[sources]
-megrok.rdb = svn svn+ssh://svn.zope.org/repos/main/megrok.rdb/trunk
-z3c.saconfig = svn svn+ssh://svn.zope.org/repos/main/z3c.saconfig/trunk
-zope.sqlalchemy = svn svn://svn.zope.org/repos/main/zope.sqlalchemy/trunk
-
[versions]
+collective.recipe.template = 1.4
+docutils = 0.5
+elementtree = 1.2.7-20070827-preview
+grokcore.startup = 0.2
+megrok.rdb = 0.9.1
+mr.developer = 1.1
Paste = 1.7.2
PasteDeploy = 1.3.3
PasteScript = 1.7.3
SQLAlchemy = 0.5.6
-mr.developer = 1.1
+transaction = 1.0.0
z3c.evalexception = 2.0
z3c.recipe.dev = 0.5.4
z3c.recipe.i18n = 0.5.0
-z3c.recipe.template = 0.1
+z3c.recipe.mkdir = 0.3.1
+z3c.saconfig = 0.9.1
+zc.buildout = 1.4.1
zc.recipe.egg = 1.2.2
zc.recipe.filestorage = 1.0.1
-docutils = 0.5
-elementtree = 1.2.7-20070827-preview
-grokcore.startup = 0.2
-transaction = 1.0.0
-zc.buildout = 1.4.1
zope.sqlalchemy = 0.4
[app]
@@ -47,12 +52,13 @@
PasteDeploy
interpreter = python-console
-[data]
-recipe = zc.recipe.filestorage
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+ ${zope_conf:filestorage}
+ ${zope_conf:logfiles}
+ ${zope_conf:blobstorage}
-[log]
-recipe = zc.recipe.filestorage
-
[test]
recipe = zc.recipe.testrunner
eggs = rdbexample
@@ -76,31 +82,36 @@
method = main
[zope_conf]
-recipe = z3c.recipe.template
+recipe = collective.recipe.template
input = etc/zope.conf.in
output = ${buildout:parts-directory}/etc/zope.conf
+filestorage = ${buildout:directory}/var/filestorage
+blobstorage = ${buildout:directory}/var/blobstorage
+logfiles = ${buildout:directory}/var/log
+extra =
+# 'extra' is copied verbatim. Use it for product config sections and so.
+
[site_zcml]
-recipe = z3c.recipe.template
+recipe = collective.recipe.template
input = etc/site.zcml.in
output = ${buildout:parts-directory}/etc/site.zcml
[zdaemon_conf]
-recipe = z3c.recipe.template
+recipe = collective.recipe.template
input = etc/zdaemon.conf.in
output = ${buildout:parts-directory}/etc/zdaemon.conf
[deploy_ini]
-recipe = z3c.recipe.template
+recipe = collective.recipe.template
input = etc/deploy.ini.in
output = ${buildout:parts-directory}/etc/deploy.ini
[debug_ini]
-recipe = z3c.recipe.template
+recipe = collective.recipe.template
input = etc/debug.ini.in
output = ${buildout:parts-directory}/etc/debug.ini
-
[eggbasket]
recipe = z3c.recipe.eggbasket
eggs = grok
Modified: grokapps/rdbexample/trunk/etc/debug.ini.in
===================================================================
--- grokapps/rdbexample/trunk/etc/debug.ini.in 2009-09-17 21:21:32 UTC (rev 104264)
+++ grokapps/rdbexample/trunk/etc/debug.ini.in 2009-09-17 21:40:57 UTC (rev 104265)
@@ -26,7 +26,7 @@
[handler_accesslog]
class = FileHandler
-args = (os.path.join(r'${buildout:directory}', 'parts', 'log', 'access.log'),
+args = (os.path.join(r'${zope_conf:logfiles}', 'access.log'),
'a')
level = INFO
formatter = accesslog
Modified: grokapps/rdbexample/trunk/etc/deploy.ini.in
===================================================================
--- grokapps/rdbexample/trunk/etc/deploy.ini.in 2009-09-17 21:21:32 UTC (rev 104264)
+++ grokapps/rdbexample/trunk/etc/deploy.ini.in 2009-09-17 21:40:57 UTC (rev 104265)
@@ -30,7 +30,7 @@
[handler_accesslog]
class = FileHandler
-args = (os.path.join(r'${buildout:directory}', 'parts', 'log', 'access.log'),
+args = (os.path.join(r'${zope_conf:logfiles}', 'access.log'),
'a')
level = INFO
formatter = accesslog
Modified: grokapps/rdbexample/trunk/etc/site.zcml.in
===================================================================
--- grokapps/rdbexample/trunk/etc/site.zcml.in 2009-09-17 21:21:32 UTC (rev 104264)
+++ grokapps/rdbexample/trunk/etc/site.zcml.in 2009-09-17 21:40:57 UTC (rev 104265)
@@ -4,7 +4,7 @@
<include package="rdbexample" />
<configure i18n_domain="rdbexample">
-
+
<unauthenticatedPrincipal id="zope.anybody"
title="Unauthenticated User" />
<unauthenticatedGroup id="zope.Anybody"
Modified: grokapps/rdbexample/trunk/etc/zdaemon.conf.in
===================================================================
--- grokapps/rdbexample/trunk/etc/zdaemon.conf.in 2009-09-17 21:21:32 UTC (rev 104264)
+++ grokapps/rdbexample/trunk/etc/zdaemon.conf.in 2009-09-17 21:40:57 UTC (rev 104265)
@@ -1,8 +1,8 @@
<runner>
program bin/paster serve ${buildout:directory}/parts/etc/deploy.ini
daemon on
- transcript ${buildout:directory}/parts/log/zdaemon.log
- socket-name ${buildout:directory}/parts/log/zdaemonsock
+ transcript ${zope_conf:logfiles}/zdaemon.log
+ socket-name ${zope_conf:logfiles}/zdaemonsock
# Enable this to run the child process as a different user
# user zope
</runner>
Modified: grokapps/rdbexample/trunk/etc/zope.conf.in
===================================================================
--- grokapps/rdbexample/trunk/etc/zope.conf.in 2009-09-17 21:21:32 UTC (rev 104264)
+++ grokapps/rdbexample/trunk/etc/zope.conf.in 2009-09-17 21:40:57 UTC (rev 104265)
@@ -2,11 +2,19 @@
site-definition ${site_zcml:output}
<zodb>
- # Standard Filestorage
- <filestorage>
- path ${data:path}
- </filestorage>
+ # Standard blob storage
+ <blobstorage>
+ blob-dir ${zope_conf:blobstorage}
+ <filestorage>
+ path ${zope_conf:filestorage}/Data.fs
+ </filestorage>
+ </blobstorage>
+# Uncomment this if you want a blob-less standard file storage instead:
+# <filestorage>
+# path ${zope_conf:filestorage}
+# </filestorage>
+
# Uncomment this if you want to connect to a ZEO server instead:
# <zeoclient>
# server localhost:8100
@@ -16,6 +24,7 @@
# # Uncomment to have a persistent disk cache
# #client zeo1
# </zeoclient>
+
</zodb>
<eventlog>
@@ -24,7 +33,7 @@
# filesystem path.
<logfile>
- path ${buildout:directory}/parts/log/z3.log
+ path ${zope_conf:logfiles}/z3.log
formatter zope.exceptions.log.Formatter
</logfile>
@@ -39,4 +48,8 @@
# Comment this line to disable developer mode. This should be done in
# production
-devmode on
\ No newline at end of file
+devmode on
+
+# Extra configuration lines can be added to zope_conf's extra option. Put for
+# instance productconf sections in here.
+${zope_conf:extra}
Added: grokapps/rdbexample/trunk/sources.cfg
===================================================================
--- grokapps/rdbexample/trunk/sources.cfg (rev 0)
+++ grokapps/rdbexample/trunk/sources.cfg 2009-09-17 21:40:57 UTC (rev 104265)
@@ -0,0 +1,12 @@
+[buildout]
+extends = buildout.cfg
+extensions += mr.developer
+auto-checkout +=
+ megrok.rdb
+ z3c.saconfig
+
+[sources]
+megrok.rdb = svn svn+ssh://svn.zope.org/repos/main/megrok.rdb/trunk
+z3c.saconfig = svn svn+ssh://svn.zope.org/repos/main/z3c.saconfig/trunk
+zope.sqlalchemy = svn svn+ssh://svn.zope.org/repos/main/zope.sqlalchemy/trunk
+
More information about the checkins
mailing list