[Zope3-checkins] SVN: Zope3/branches/srichter-twisted-integration2/z3 Jim told my that our prime objective is not to comfortably switch between

[Stephan Richter]

Log message for revision 38432:
  Jim told my that our prime objective is not to comfortably switch between 
  ZServer and Twisted, but instead be able to back out quickly if necessary. 
  Also the current setup will allow existing instances to simply keep 
  running ZServer. Only newly created instances will use twisted. I am still 
  contemplating adding a setup flag to mkzopeinstance to allow you to select 
  the server.
  
  

Changed:
  D   Zope3/branches/srichter-twisted-integration2/z3-twisted.py
  U   Zope3/branches/srichter-twisted-integration2/z3.py

-=-
Deleted: Zope3/branches/srichter-twisted-integration2/z3-twisted.py
===================================================================
--- Zope3/branches/srichter-twisted-integration2/z3-twisted.py	2005-09-09 14:45:23 UTC (rev 38431)
+++ Zope3/branches/srichter-twisted-integration2/z3-twisted.py	2005-09-09 14:49:44 UTC (rev 38432)
@@ -1,63 +0,0 @@
-#! /usr/bin/env python2.3
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Start script for Zope3: loads configuration and starts the server.
-
-$Id: z3.py 30640 2005-06-04 10:32:45Z frerich $
-"""
-import os
-import sys
-
-basepath = filter(None, sys.path)
-
-def run(argv=list(sys.argv)):
-
-    if sys.version_info < ( 2,3,5 ):
-        print """\
-        ERROR: Your python version is not supported by Zope3.
-        Zope3 needs Python 2.3.5 or greater. You are running:""" + sys.version
-        sys.exit(1)
-
-    # Refuse to run without principals.zcml
-    if not os.path.exists('principals.zcml'):
-        print """\
-        ERROR: You need to create principals.zcml
-
-        The file principals.zcml contains your "bootstrap" user
-        database. You aren't going to get very far without it.  Start
-        by copying sample_principals.zcml and then modify the
-        example principal and role settings.
-        """
-        sys.exit(1)
-
-    # setting python paths
-    program = argv[0]
-    if "--build" in argv:
-        argv.remove("--build")
-        from distutils.util import get_platform
-        PLAT_SPEC = "%s-%s" % (get_platform(), sys.version[0:3])
-        src = os.path.join("build", "lib.%s" % PLAT_SPEC)
-    else:
-        src = 'src'
-
-    here = os.path.dirname(os.path.abspath(program))
-    srcdir = os.path.abspath(src)
-    sys.path = [srcdir, here] + basepath
-
-    from zope.app.twisted.main import main
-    main(argv[1:])
-
-
-if __name__ == '__main__':
-    run()

Modified: Zope3/branches/srichter-twisted-integration2/z3.py
===================================================================
--- Zope3/branches/srichter-twisted-integration2/z3.py	2005-09-09 14:45:23 UTC (rev 38431)
+++ Zope3/branches/srichter-twisted-integration2/z3.py	2005-09-09 14:49:44 UTC (rev 38432)
@@ -55,7 +55,7 @@
     srcdir = os.path.abspath(src)
     sys.path = [srcdir, here] + basepath
 
-    from zope.app.server.main import main
+    from zope.app.twisted.main import main
     main(argv[1:])