[Checkins] SVN: grokproject/trunk/grokproject/template_paste/ decouple paster ini and zope conf files

[Michael Haubenwallner]

Log message for revision 93839:
  decouple paster ini and zope conf files

Changed:
  U   grokproject/trunk/grokproject/template_paste/etc/debug.ini_tmpl
  U   grokproject/trunk/grokproject/template_paste/etc/deploy.ini_tmpl
  U   grokproject/trunk/grokproject/template_paste/src/+package+/startup.py_tmpl

-=-
Modified: grokproject/trunk/grokproject/template_paste/etc/debug.ini_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/etc/debug.ini_tmpl	2008-12-10 10:05:58 UTC (rev 93838)
+++ grokproject/trunk/grokproject/template_paste/etc/debug.ini_tmpl	2008-12-10 10:09:27 UTC (rev 93839)
@@ -1,17 +1,17 @@
-[filter-app:main]
-# Change the last part from 'ajax' to 'pdb' for a post-mortem debugger
-# on the console:
-use = egg:z3c.evalexception#ajax
-next = zope
-
-[app:zope]
-use = egg:${egg}
-
-[server:main]
-use = egg:Paste#http
-host = 127.0.0.1
-port = 8080
-
-[DEFAULT]
-# set the directory of zope conf files (if not the same as the ini file)
-zope_conf = %(here)s
\ No newline at end of file
+[filter-app:main]
+# Change the last part from 'ajax' to 'pdb' for a post-mortem debugger
+# on the console:
+use = egg:z3c.evalexception#ajax
+next = zope
+
+[app:zope]
+use = egg:${egg}
+
+[server:main]
+use = egg:Paste#http
+host = 127.0.0.1
+port = 8080
+
+[DEFAULT]
+# set the name of the zope.conf file
+zope_conf = %(here)s/zope.conf

Modified: grokproject/trunk/grokproject/template_paste/etc/deploy.ini_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/etc/deploy.ini_tmpl	2008-12-10 10:05:58 UTC (rev 93838)
+++ grokproject/trunk/grokproject/template_paste/etc/deploy.ini_tmpl	2008-12-10 10:09:27 UTC (rev 93839)
@@ -1,11 +1,11 @@
-[app:main]
-use = egg:${egg}
-
-[server:main]
-use = egg:Paste#http
-host = 127.0.0.1
-port = 8080
-
-[DEFAULT]
-# set the directory of zope conf files (if not the same as the ini file)
-zope_conf = %(here)s
\ No newline at end of file
+[app:main]
+use = egg:${egg}
+
+[server:main]
+use = egg:Paste#http
+host = 127.0.0.1
+port = 8080
+
+[DEFAULT]
+# set the name of the zope.conf file
+zope_conf = %(here)s/zope.conf

Modified: grokproject/trunk/grokproject/template_paste/src/+package+/startup.py_tmpl
===================================================================
--- grokproject/trunk/grokproject/template_paste/src/+package+/startup.py_tmpl	2008-12-10 10:05:58 UTC (rev 93838)
+++ grokproject/trunk/grokproject/template_paste/src/+package+/startup.py_tmpl	2008-12-10 10:09:27 UTC (rev 93839)
@@ -5,8 +5,8 @@
 import zope.app.wsgi
 import zope.app.debug
 
-def application_factory(global_conf, conf='zope.conf'):
-    zope_conf = os.path.join(global_conf['zope_conf'], conf)
+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='${package_directory}/etc/zope.conf'):