[Checkins] SVN: grokproject/branches/d2m-dual-startup/ reversed default server selection

[Michael Haubenwallner]

Log message for revision 91523:
  reversed default server selection

Changed:
  U   grokproject/branches/d2m-dual-startup/CHANGES.txt
  U   grokproject/branches/d2m-dual-startup/grokproject/templates.py

-=-
Modified: grokproject/branches/d2m-dual-startup/CHANGES.txt
===================================================================
--- grokproject/branches/d2m-dual-startup/CHANGES.txt	2008-09-26 14:47:36 UTC (rev 91522)
+++ grokproject/branches/d2m-dual-startup/CHANGES.txt	2008-09-26 15:08:13 UTC (rev 91523)
@@ -1,6 +1,16 @@
 Changes
 =======
 
+branch
+------
+
+* added another template to support paste (template_paste)
+* paste is the default server mode now
+* grokproject --server=zopectl ... creates a grokproject like before
+* with bin/paster serve etc/debug.ini 
+  you need to access the project from http://localhost:8080/@@login.html
+  
+
 0.9 (unreleased)
 ----------------
 

Modified: grokproject/branches/d2m-dual-startup/grokproject/templates.py
===================================================================
--- grokproject/branches/d2m-dual-startup/grokproject/templates.py	2008-09-26 14:47:36 UTC (rev 91522)
+++ grokproject/branches/d2m-dual-startup/grokproject/templates.py	2008-09-26 15:08:13 UTC (rev 91523)
@@ -16,7 +16,7 @@
 
 
 class GrokProject(templates.Template):
-    _template_dir = 'template'
+    _template_dir = 'template_paste'
     summary = "A grok project"
     required_templates = []
 
@@ -36,8 +36,8 @@
                 'Location where zc.buildout will look for and place packages',
                 default='', should_ask=False),
         ask_var('server',
-                'Use twisted.wsgi(default) or paste?',
-                default='default'),
+                "Use 'paste' (default) or 'zopectl'?",
+                default='paste'),
         ]
 
     def check_vars(self, vars, cmd):
@@ -65,9 +65,8 @@
             vars[var_name] = xml.sax.saxutils.quoteattr(vars[var_name])
         vars['app_class_name'] = vars['project'].capitalize()
 
-        if not(str(vars.get('server')).lower() in ['default','twisted.wsgi','twisted','yes','y']):
-            self._template_dir = 'template_paste'
-            print "Your grokproject will use 'paste'"
+        if str(vars.get('server')).lower() == 'zopectl':
+            self._template_dir = 'template'
 
         # Handling the version.cfg file.
         print "Downloading info about versions..."