[Checkins] SVN: grokproject/trunk/ integrate with grokcore.startup
Michael Haubenwallner
michael at d2m.at
Thu Feb 19 04:24:17 EST 2009
Log message for revision 96726:
integrate with grokcore.startup
Changed:
U grokproject/trunk/CHANGES.txt
U grokproject/trunk/TODO.txt
U grokproject/trunk/grokproject/template_paste/setup.py_tmpl
D grokproject/trunk/grokproject/template_paste/src/+package+/startup.py_tmpl
U grokproject/trunk/grokproject/template_paste/versions.cfg_tmpl
U grokproject/trunk/tests_paste.txt
-=-
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt 2009-02-19 09:15:50 UTC (rev 96725)
+++ grokproject/trunk/CHANGES.txt 2009-02-19 09:24:17 UTC (rev 96726)
@@ -28,7 +28,13 @@
latest released ones. Especially pinned z3c.recipe.eggbasket to
the most recent one, 0.4.1.
+* Integrated with grokcore.startup
+ Removed ``startup.py`` from the paster template
+* Paster: you need to first access http://localhost:8080/@@login.html
+ when running the debug.ini profile
+
+
1.0a2 (2009-01-12)
------------------
Modified: grokproject/trunk/TODO.txt
===================================================================
--- grokproject/trunk/TODO.txt 2009-02-19 09:15:50 UTC (rev 96725)
+++ grokproject/trunk/TODO.txt 2009-02-19 09:24:17 UTC (rev 96726)
@@ -5,5 +5,3 @@
* Make tests run under Windows
-* Paster: should not need to access http://localhost:8080/@@login.html when
- running the debug.ini profile
\ No newline at end of file
Modified: grokproject/trunk/grokproject/template_paste/setup.py_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/setup.py_tmpl 2009-02-19 09:15:50 UTC (rev 96725)
+++ grokproject/trunk/grokproject/template_paste/setup.py_tmpl 2009-02-19 09:24:17 UTC (rev 96726)
@@ -22,13 +22,14 @@
'grok',
'grokui.admin',
'z3c.testsetup',
+ 'grokcore.startup',
# Add extra requirements here
],
entry_points = """
[console_scripts]
- ${package}-debug = ${package}.startup:interactive_debug_prompt
- ${package}-ctl = ${package}.startup:zdaemon_controller
+ ${package}-debug = grokcore.startup.startup:interactive_debug_prompt
+ ${package}-ctl = grokcore.startup.startup:zdaemon_controller
[paste.app_factory]
- main = ${package}.startup:application_factory
+ main = grokcore.startup:application_factory
""",
)
Deleted: grokproject/trunk/grokproject/template_paste/src/+package+/startup.py_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/src/+package+/startup.py_tmpl 2009-02-19 09:15:50 UTC (rev 96725)
+++ grokproject/trunk/grokproject/template_paste/src/+package+/startup.py_tmpl 2009-02-19 09:24:17 UTC (rev 96726)
@@ -1,37 +0,0 @@
-import os.path
-import sys
-import code
-import zdaemon.zdctl
-import zope.app.wsgi
-import zope.app.debug
-
-def application_factory(global_conf):
- zope_conf = os.path.join(global_conf['zope_conf'])
- return zope.app.wsgi.getWSGIApplication(zope_conf)
-
-def interactive_debug_prompt(zope_conf=os.path.join('parts', 'etc',
- 'zope.conf')):
- db = zope.app.wsgi.config(zope_conf)
- debugger = zope.app.debug.Debugger.fromDatabase(db)
- # Invoke an interactive interpreter shell
- banner = ("Welcome to the interactive debug prompt.\n"
- "The 'root' variable contains the ZODB root folder.\n"
- "The 'app' variable contains the Debugger, 'app.publish(path)' "
- "simulates a request.")
- code.interact(banner=banner, local={'debugger': debugger,
- 'app': debugger,
- 'root': debugger.root()})
-
-class ControllerCommands(zdaemon.zdctl.ZDCmd):
-
- def do_debug(self, rest):
- interactive_debug_prompt()
-
- def help_debug(self):
- print "debug -- Initialize the application, providing a debugger"
- print " object at an interactive Python prompt."
-
-def zdaemon_controller(zdaemon_conf=os.path.join('parts', 'etc',
- 'zdaemon.conf')):
- args = ['-C', zdaemon_conf] + sys.argv[1:]
- zdaemon.zdctl.main(args, options=None, cmdclass=ControllerCommands)
Modified: grokproject/trunk/grokproject/template_paste/versions.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/versions.cfg_tmpl 2009-02-19 09:15:50 UTC (rev 96725)
+++ grokproject/trunk/grokproject/template_paste/versions.cfg_tmpl 2009-02-19 09:24:17 UTC (rev 96726)
@@ -18,3 +18,4 @@
zc.buildout = 1.1.1
zc.recipe.egg = 1.1.0
zc.recipe.filestorage = 1.0.1
+grokcore.startup = 0.1
Modified: grokproject/trunk/tests_paste.txt
===================================================================
--- grokproject/trunk/tests_paste.txt 2009-02-19 09:15:50 UTC (rev 96725)
+++ grokproject/trunk/tests_paste.txt 2009-02-19 09:24:17 UTC (rev 96726)
@@ -49,7 +49,6 @@
app_templates
configure.zcml
ftesting.zcml
- startup.py
static
tests.py
More information about the Checkins
mailing list