[Checkins] SVN: grokproject/trunk/ No longer build the zdaemon ctl.

[Jan-Jaap Driessen]

Log message for revision 110893:
  No longer build the zdaemon ctl. 
  
  Projects created will use the #main and #debug entry points now defined in grokcore.startup.
  
  
  

Changed:
  U   grokproject/trunk/CHANGES.txt
  U   grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl
  U   grokproject/trunk/grokproject/template_paste/etc/debug.ini.in_tmpl
  D   grokproject/trunk/grokproject/template_paste/etc/zdaemon.conf.in_tmpl
  U   grokproject/trunk/grokproject/template_paste/setup.py_tmpl
  U   grokproject/trunk/grokproject/template_paste/versions.cfg_tmpl

-=-
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt	2010-04-14 14:09:15 UTC (rev 110892)
+++ grokproject/trunk/CHANGES.txt	2010-04-14 14:11:19 UTC (rev 110893)
@@ -4,6 +4,11 @@
 1.0.4 (unreleased)
 ------------------
 
+* No longer build the zdaemon ctl. 
+
+* Projects created will use the #main and #debug entry points now defined
+  in grokcore.startup.
+
 * The application specific version pins are now in Grok's versions cfg.
 
 * Remove '--zopectl' option. Paster setups are now the only supported

Modified: grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl	2010-04-14 14:09:15 UTC (rev 110892)
+++ grokproject/trunk/grokproject/template_paste/buildout.cfg_tmpl	2010-04-14 14:11:19 UTC (rev 110893)
@@ -9,7 +9,6 @@
     zpasswd
     zope_conf
     site_zcml
-    zdaemon_conf
     deploy_ini
     debug_ini
 # For backward compatibility, telling buildout not to throw away
@@ -24,6 +23,7 @@
 # unless you specify an eggs-directory option here.
 ${eggs_dir}
 versions = versions
+extensions = buildout.dumppickedversions
 
 [app]
 recipe = zc.recipe.egg
@@ -88,11 +88,6 @@
 input = etc/site.zcml.in
 output = $${buildout:parts-directory}/etc/site.zcml
 
-[zdaemon_conf]
-recipe = collective.recipe.template
-input = etc/zdaemon.conf.in
-output = $${buildout:parts-directory}/etc/zdaemon.conf
-
 [deploy_ini]
 recipe = collective.recipe.template
 input = etc/deploy.ini.in

Modified: grokproject/trunk/grokproject/template_paste/etc/debug.ini.in_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/etc/debug.ini.in_tmpl	2010-04-14 14:09:15 UTC (rev 110892)
+++ grokproject/trunk/grokproject/template_paste/etc/debug.ini.in_tmpl	2010-04-14 14:11:19 UTC (rev 110893)
@@ -53,7 +53,7 @@
 next = zope
 
 [app:zope]
-use = egg:${egg}#debug
+use = egg:grokcore.startup#debug
 filter-with = translogger
 exempt-exceptions = zope.security.interfaces.IUnauthorized
 

Deleted: grokproject/trunk/grokproject/template_paste/etc/zdaemon.conf.in_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/etc/zdaemon.conf.in_tmpl	2010-04-14 14:09:15 UTC (rev 110892)
+++ grokproject/trunk/grokproject/template_paste/etc/zdaemon.conf.in_tmpl	2010-04-14 14:11:19 UTC (rev 110893)
@@ -1,8 +0,0 @@
-<runner>
-  program bin/paster serve $${buildout:directory}/parts/etc/deploy.ini
-  daemon on
-  transcript $${zope_conf:logfiles}/zdaemon.log
-  socket-name $${zope_conf:logfiles}/zdaemonsock
-  # Enable this to run the child process as a different user
-  # user zope
-</runner>

Modified: grokproject/trunk/grokproject/template_paste/setup.py_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/setup.py_tmpl	2010-04-14 14:09:15 UTC (rev 110892)
+++ grokproject/trunk/grokproject/template_paste/setup.py_tmpl	2010-04-14 14:11:19 UTC (rev 110893)
@@ -28,9 +28,5 @@
       entry_points = """
       [console_scripts]
       ${package}-debug = grokcore.startup:interactive_debug_prompt
-      ${package}-ctl = grokcore.startup:zdaemon_controller
-      [paste.app_factory]
-      main = grokcore.startup:application_factory
-      debug = grokcore.startup:debug_application_factory
       """,
       )

Modified: grokproject/trunk/grokproject/template_paste/versions.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/versions.cfg_tmpl	2010-04-14 14:09:15 UTC (rev 110892)
+++ grokproject/trunk/grokproject/template_paste/versions.cfg_tmpl	2010-04-14 14:11:19 UTC (rev 110893)
@@ -4,7 +4,3 @@
 # when this project was created.
 
 ${version_info_file_contents}
-
-# Here we pin the recipes and other packages that are not in the
-# downloaded versions.cfg of grok
-${version_info_additions}