[Checkins] SVN: grok/trunk/doc/groktut/ replace buildout.cfg files with a more modern variant, same for tests.py. remove zdaemon.conf.in templates,

Jan-Wijbrand Kolman janwijbrand at gmail.com
Tue Oct 26 09:15:47 EDT 2010


Log message for revision 117896:
  replace buildout.cfg files with a more modern variant, same for tests.py. remove zdaemon.conf.in templates, 

Changed:
  U   grok/trunk/doc/groktut/a_second_model/buildout.cfg
  D   grok/trunk/doc/groktut/a_second_model/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/a_second_view/buildout.cfg
  D   grok/trunk/doc/groktut/a_second_view/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/a_view_for_a_model/buildout.cfg
  D   grok/trunk/doc/groktut/a_view_for_a_model/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/a_view_for_a_model2/buildout.cfg
  D   grok/trunk/doc/groktut/a_view_for_a_model2/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/an_empty_grok_project/buildout.cfg
  D   grok/trunk/doc/groktut/an_empty_grok_project/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/an_empty_grok_project/src/sample/tests.py
  U   grok/trunk/doc/groktut/completely_python_driven_views/buildout.cfg
  D   grok/trunk/doc/groktut/completely_python_driven_views/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/containers/buildout.cfg
  D   grok/trunk/doc/groktut/containers/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/doing_some_calculation_before_viewing_a_page/buildout.cfg
  D   grok/trunk/doc/groktut/doing_some_calculation_before_viewing_a_page/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/explicitly_associating_a_view_with_a_model/buildout.cfg
  D   grok/trunk/doc/groktut/explicitly_associating_a_view_with_a_model/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/generating_html_from_python/buildout.cfg
  D   grok/trunk/doc/groktut/generating_html_from_python/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/making_our_page_dynamic/buildout.cfg
  D   grok/trunk/doc/groktut/making_our_page_dynamic/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/publishing_a_simple_web_page/buildout.cfg
  D   grok/trunk/doc/groktut/publishing_a_simple_web_page/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/publishing_a_simple_web_page/src/sample/tests.py
  U   grok/trunk/doc/groktut/reading_url_parameters/buildout.cfg
  D   grok/trunk/doc/groktut/reading_url_parameters/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/reading_url_parameters2/buildout.cfg
  D   grok/trunk/doc/groktut/reading_url_parameters2/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/redirection/buildout.cfg
  D   grok/trunk/doc/groktut/redirection/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/setting_the_content_type/buildout.cfg
  D   grok/trunk/doc/groktut/setting_the_content_type/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/showing_the_value_in_the_form/buildout.cfg
  D   grok/trunk/doc/groktut/showing_the_value_in_the_form/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/simple_forms/buildout.cfg
  D   grok/trunk/doc/groktut/simple_forms/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/simple_forms2/buildout.cfg
  D   grok/trunk/doc/groktut/simple_forms2/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/static_resources_for_our_web_page/buildout.cfg
  D   grok/trunk/doc/groktut/static_resources_for_our_web_page/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/storing_data/buildout.cfg
  D   grok/trunk/doc/groktut/storing_data/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/template/buildout.cfg
  D   grok/trunk/doc/groktut/template/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/the_rules_of_persistence/buildout.cfg
  D   grok/trunk/doc/groktut/the_rules_of_persistence/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/the_rules_of_persistence2/buildout.cfg
  D   grok/trunk/doc/groktut/the_rules_of_persistence2/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/the_rules_of_persistence3/buildout.cfg
  D   grok/trunk/doc/groktut/the_rules_of_persistence3/etc/zdaemon.conf.in
  U   grok/trunk/doc/groktut/using_view_methods/buildout.cfg
  D   grok/trunk/doc/groktut/using_view_methods/etc/zdaemon.conf.in

-=-
Modified: grok/trunk/doc/groktut/a_second_model/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/a_second_model/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/a_second_model/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/a_second_model/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/a_second_model/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/a_second_model/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/a_second_view/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/a_second_view/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/a_second_view/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/a_second_view/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/a_second_view/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/a_second_view/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/a_view_for_a_model/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/a_view_for_a_model/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/a_view_for_a_model/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/a_view_for_a_model/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/a_view_for_a_model/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/a_view_for_a_model/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/a_view_for_a_model2/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/a_view_for_a_model2/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/a_view_for_a_model2/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/a_view_for_a_model2/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/a_view_for_a_model2/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/a_view_for_a_model2/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/an_empty_grok_project/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/an_empty_grok_project/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/an_empty_grok_project/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,60 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/an_empty_grok_project/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/an_empty_grok_project/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/an_empty_grok_project/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/an_empty_grok_project/src/sample/tests.py
===================================================================
--- grok/trunk/doc/groktut/an_empty_grok_project/src/sample/tests.py	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/an_empty_grok_project/src/sample/tests.py	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,12 +1,10 @@
 import os.path
 import z3c.testsetup
+from zope.app.wsgi.testlayer import BrowserLayer
+
 import sample
-from zope.app.testing.functional import ZCMLLayer
 
+browser_layer = BrowserLayer(groktutexample)
 
-ftesting_zcml = os.path.join(
-    os.path.dirname(sample.__file__), 'ftesting.zcml')
-FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
-                            allow_teardown=True)
-
-test_suite = z3c.testsetup.register_all_tests('sample')
+test_suite = z3c.testsetup.register_all_tests(
+    'sample', globs={'getRootFolder': browser_layer.getRootFolder})

Modified: grok/trunk/doc/groktut/completely_python_driven_views/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/completely_python_driven_views/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/completely_python_driven_views/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/completely_python_driven_views/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/completely_python_driven_views/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/completely_python_driven_views/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/containers/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/containers/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/containers/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/containers/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/containers/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/containers/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/doing_some_calculation_before_viewing_a_page/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/doing_some_calculation_before_viewing_a_page/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/doing_some_calculation_before_viewing_a_page/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/doing_some_calculation_before_viewing_a_page/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/doing_some_calculation_before_viewing_a_page/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/doing_some_calculation_before_viewing_a_page/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/explicitly_associating_a_view_with_a_model/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/explicitly_associating_a_view_with_a_model/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/explicitly_associating_a_view_with_a_model/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/explicitly_associating_a_view_with_a_model/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/explicitly_associating_a_view_with_a_model/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/explicitly_associating_a_view_with_a_model/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/generating_html_from_python/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/generating_html_from_python/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/generating_html_from_python/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/generating_html_from_python/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/generating_html_from_python/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/generating_html_from_python/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/making_our_page_dynamic/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/making_our_page_dynamic/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/making_our_page_dynamic/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/making_our_page_dynamic/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/making_our_page_dynamic/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/making_our_page_dynamic/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/publishing_a_simple_web_page/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/publishing_a_simple_web_page/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/publishing_a_simple_web_page/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/publishing_a_simple_web_page/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/publishing_a_simple_web_page/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/publishing_a_simple_web_page/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/publishing_a_simple_web_page/src/sample/tests.py
===================================================================
--- grok/trunk/doc/groktut/publishing_a_simple_web_page/src/sample/tests.py	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/publishing_a_simple_web_page/src/sample/tests.py	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,12 +1,10 @@
 import os.path
 import z3c.testsetup
+from zope.app.wsgi.testlayer import BrowserLayer
+
 import sample
-from zope.app.testing.functional import ZCMLLayer
 
+browser_layer = BrowserLayer(groktutexample)
 
-ftesting_zcml = os.path.join(
-    os.path.dirname(sample.__file__), 'ftesting.zcml')
-FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
-                            allow_teardown=True)
-
-test_suite = z3c.testsetup.register_all_tests('sample')
+test_suite = z3c.testsetup.register_all_tests(
+    'sample', globs={'getRootFolder': browser_layer.getRootFolder})

Modified: grok/trunk/doc/groktut/reading_url_parameters/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/reading_url_parameters/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/reading_url_parameters/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/reading_url_parameters/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/reading_url_parameters/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/reading_url_parameters/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/reading_url_parameters2/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/reading_url_parameters2/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/reading_url_parameters2/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,60 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/reading_url_parameters2/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/reading_url_parameters2/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/reading_url_parameters2/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/redirection/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/redirection/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/redirection/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/redirection/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/redirection/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/redirection/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/setting_the_content_type/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/setting_the_content_type/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/setting_the_content_type/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/setting_the_content_type/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/setting_the_content_type/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/setting_the_content_type/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/showing_the_value_in_the_form/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/showing_the_value_in_the_form/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/showing_the_value_in_the_form/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/showing_the_value_in_the_form/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/showing_the_value_in_the_form/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/showing_the_value_in_the_form/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/simple_forms/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/simple_forms/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/simple_forms/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/simple_forms/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/simple_forms/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/simple_forms/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/simple_forms2/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/simple_forms2/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/simple_forms2/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,60 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/simple_forms2/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/simple_forms2/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/simple_forms2/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/static_resources_for_our_web_page/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/static_resources_for_our_web_page/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/static_resources_for_our_web_page/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/static_resources_for_our_web_page/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/static_resources_for_our_web_page/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/static_resources_for_our_web_page/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/storing_data/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/storing_data/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/storing_data/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/storing_data/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/storing_data/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/storing_data/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/template/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/template/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/template/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/template/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/template/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/template/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/the_rules_of_persistence/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/the_rules_of_persistence/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/the_rules_of_persistence/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/the_rules_of_persistence/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/the_rules_of_persistence/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/the_rules_of_persistence/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/the_rules_of_persistence2/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/the_rules_of_persistence2/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/the_rules_of_persistence2/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/the_rules_of_persistence2/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/the_rules_of_persistence2/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/the_rules_of_persistence2/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/the_rules_of_persistence3/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/the_rules_of_persistence3/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/the_rules_of_persistence3/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/the_rules_of_persistence3/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/the_rules_of_persistence3/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/the_rules_of_persistence3/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grok/trunk/doc/groktut/using_view_methods/buildout.cfg
===================================================================
--- grok/trunk/doc/groktut/using_view_methods/buildout.cfg	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/using_view_methods/buildout.cfg	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,17 +1,26 @@
 [buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/branches/1.2/grok.cfg
+extends-cache = extends-cache
+find-links =
+include-site-packages = false
 develop = .
-parts = eggbasket app i18n test data log zpasswd
-        zope_conf site_zcml zdaemon_conf deploy_ini debug_ini
+parts =
+    app
+    debug_ini
+    deploy_ini
+    i18n
+    mkdirs
+    site_zcml
+    test
+    zope_conf
+    zpasswd
+    interactive_debugger
 newest = false
-extends = versions.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 = buildout.dumppickedversions
 
 [app]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs = Sample
        z3c.evalexception>=2.0
        Paste
@@ -19,61 +28,69 @@
        PasteDeploy
 interpreter = python-console
 
-[data]
-recipe = zc.recipe.filestorage
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+host = 127.0.0.1
+port = 8080
 
-[log]
-recipe = zc.recipe.filestorage
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+host = 127.0.0.1
+port = 8080
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = Sample
-defaults = ['--tests-pattern', '^f?tests$', '-v']
-
 # this section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
-packages = sample
-eggs = sample
-domain = sample
-output = src/sample/locales
+packages = groktutexample
+eggs = groktutexample
+domain = groktutexample
+output = src/groktutexample/locales
 zcml =
 
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = Sample
-module = zope.app.server.zpasswd
-method = main
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-[zope_conf]
-recipe = z3c.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-
 [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
-input = etc/zdaemon.conf.in
-output = ${buildout:parts-directory}/etc/zdaemon.conf
+[test]
+recipe = zc.recipe.testrunner
+eggs = Sample
+defaults = ['-v']
 
-[deploy_ini]
-recipe = z3c.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
+[zope_conf]
+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.
 
-[debug_ini]
-recipe = z3c.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.scripts
+eggs =
+  Sample
+  zope.password
+entry-points =
+  zpasswd=zope.password.zpasswd:main
 
-
-[eggbasket]
-recipe = z3c.recipe.eggbasket
-eggs = grok
-url = http://grok.zope.org/releaseinfo/grok-eggs-1.0a4.tgz
+[interactive_debugger]
+recipe = z3c.recipe.scripts
+eggs = Sample
+entry-points =
+  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
+arguments = zope_conf="${zope_conf:output}"

Deleted: grok/trunk/doc/groktut/using_view_methods/etc/zdaemon.conf.in
===================================================================
--- grok/trunk/doc/groktut/using_view_methods/etc/zdaemon.conf.in	2010-10-26 12:53:24 UTC (rev 117895)
+++ grok/trunk/doc/groktut/using_view_methods/etc/zdaemon.conf.in	2010-10-26 13:15:46 UTC (rev 117896)
@@ -1,8 +0,0 @@
-<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
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>



More information about the checkins mailing list