[Checkins] SVN: grokproject/trunk/grokproject/template/ Tail of branch merge.

Wed Jan 19 16:34:41 EST 2011

Log message for revision 119738:
  Tail of branch merge.

Changed:
  U   grokproject/trunk/grokproject/template/buildout.cfg_tmpl
  U   grokproject/trunk/grokproject/template/etc/debug.ini.in_tmpl
  U   grokproject/trunk/grokproject/template/etc/deploy.ini.in_tmpl
  U   grokproject/trunk/grokproject/template/etc/zope.conf.in_tmpl
  U   grokproject/trunk/grokproject/template/src/+package+/tests/app.txt_tmpl

-=-
Modified: grokproject/trunk/grokproject/template/buildout.cfg_tmpl
===================================================================

--- grokproject/trunk/grokproject/template/buildout.cfg_tmpl	2011-01-19 21:13:48 UTC (rev 119737)
+++ grokproject/trunk/grokproject/template/buildout.cfg_tmpl	2011-01-19 21:34:40 UTC (rev 119738)
@@ -34,10 +34,12 @@
 always-checkout = true
 auto-checkout = grok
                 grokui.admin
+                zope.fanstatic
                 zope.errorview
 
 [sources]
 grok = svn http://svn.zope.org/repos/main/grok/trunk
+zope.fanstatic = svn http://svn.zope.org/repos/main/zope.fanstatic/trunk
 zope.errorview = svn http://svn.zope.org/repos/main/zope.errorview/trunk
 
 [versions]

Modified: grokproject/trunk/grokproject/template/etc/debug.ini.in_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/etc/debug.ini.in_tmpl	2011-01-19 21:13:48 UTC (rev 119737)
+++ grokproject/trunk/grokproject/template/etc/debug.ini.in_tmpl	2011-01-19 21:34:40 UTC (rev 119738)
@@ -1,5 +1,5 @@
 [DEFAULT]
-zope_conf = %(here)s/zope.conf
+zope_conf = %(here)s/zope.debug.conf
 
 [server:main]
 use = egg:Paste#http
@@ -7,7 +7,7 @@
 port = $${:port}
 
 [pipeline:main]
-pipeline = accesslogging fanstatic evalexception grok
+pipeline = accesslogging evalexception fanstatic grok
 
 [filter:accesslogging]
 use = egg:Paste#translogger

Modified: grokproject/trunk/grokproject/template/etc/deploy.ini.in_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/etc/deploy.ini.in_tmpl	2011-01-19 21:13:48 UTC (rev 119737)
+++ grokproject/trunk/grokproject/template/etc/deploy.ini.in_tmpl	2011-01-19 21:34:40 UTC (rev 119738)
@@ -1,5 +1,5 @@
 [DEFAULT]
-zope_conf = %(here)s/zope.conf
+zope_conf = %(here)s/zope.deploy.conf
 
 [server:main]
 use = egg:Paste#http
@@ -11,8 +11,11 @@
 
 [filter:accesslogging]
 use = egg:Paste#translogger
-setup_console_handler = false
+setup_console_handler = False
 
+[filter:gzip]
+use = egg:Paste#gzip
+
 [filter:fanstatic]
 use = egg:fanstatic#fanstatic
 bottom = true
@@ -21,9 +24,6 @@
 rollup = true
 recompute_hashes = false
 
-[filter:gzip]
-use = egg:Paste#gzip
-
 [app:grok]
 use = egg:grokcore.startup
 

Modified: grokproject/trunk/grokproject/template/etc/zope.conf.in_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/etc/zope.conf.in_tmpl	2011-01-19 21:13:48 UTC (rev 119737)
+++ grokproject/trunk/grokproject/template/etc/zope.conf.in_tmpl	2011-01-19 21:34:40 UTC (rev 119738)
@@ -31,9 +31,7 @@
 # logfiles are setup in the debug.ini and deploy.ini files.
 </eventlog>
 
-# Comment this line to disable developer mode.  This should be done in
-# production
-devmode on
+devmode $${devmode}
 
 # Extra configuration lines can be added to zope_conf's extra option. Put for
 # instance productconf sections in here.

Modified: grokproject/trunk/grokproject/template/src/+package+/tests/app.txt_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/src/+package+/tests/app.txt_tmpl	2011-01-19 21:13:48 UTC (rev 119737)
+++ grokproject/trunk/grokproject/template/src/+package+/tests/app.txt_tmpl	2011-01-19 21:34:40 UTC (rev 119738)
@@ -29,7 +29,7 @@
     >>> print browser.contents
     <html>
     <head>
-    <link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/grokexample/style.css" />
+    <link rel="stylesheet" type="text/css" href="http://localhost/fanstatic/${project_lowercase}/style.css" />
     <base href="http://localhost/app/@@index" />
     </head>
     <body>

