Move ZServer related console scripts into ZServer.

buildout.cfg

@@ -8,7 +8,8 @@ extends =
     versions.cfg
 parts =
     test
-    scripts
+    zopescripts
+    zserverscripts
     zopepy
     alltests
     ztktests
@@ -30,11 +31,16 @@ initialization =
 eggs = Zope2
 
 
-[scripts]
+[zopescripts]
 recipe = zc.recipe.egg
 eggs = Zope2
 
 
+[zserverscripts]
+recipe = zc.recipe.egg
+eggs = ZServer
+
+
 [zopepy]
 recipe = zc.recipe.egg
 eggs = Zope2

docs/INSTALL-buildout.rst

@@ -144,12 +144,6 @@ used.
 
    instancehome $INSTANCE
 
-A fully-annotated sample can be found in the Zope2 egg::
-
-   $ cat eggs/Zope2--*/Zope2/utilities/skel/etc/example.conf.in
-
-   <rest of the stuff that goes into a zope.conf, e.g. databases and log files.>
-
 .. highlight:: bash
 
 An example session::

setup.py

@@ -113,12 +113,9 @@ def _read_file(filename):
             'httpexceptions=Zope2.Startup.httpexceptions:main',
         ],
         'console_scripts': [
-            'mkzopeinstance=Zope2.utilities.mkzopeinstance:main',
-            'runwsgi=Zope2.Startup.serve:main',
-            'runzope=Zope2.Startup.run:run',
-            'zopectl=Zope2.Startup.zopectl:run',
-            'zpasswd=Zope2.utilities.zpasswd:main',
             'addzope2user=Zope2.utilities.adduser:main',
+            'runwsgi=Zope2.Startup.serve:main',
+            'mkwsgiinstance=Zope2.utilities.mkwsgiinstance:main',
         ],
     },
 )

src/Zope2/Startup/__init__.py

@@ -20,7 +20,7 @@
 
 # BBB Zope 5.0
 deprecated(
-    'Please import from ZServer.Startup.starter',
+    'Please import from ZServer.Zope2.Startup.starter',
     UnixZopeStarter='ZServer.Zope2.Startup.starter:UnixZopeStarter',
     WindowsZopeStarter='ZServer.Zope2.Startup.starter:WindowsZopeStarter',
     ZopeStarter='ZServer.Zope2.Startup.starter:ZopeStarter',

src/Zope2/Startup/run.py

@@ -12,19 +12,13 @@
 #
 ##############################################################################
 
+from zope.deferredimport import deprecated
 
-def run():
-    """ Start a Zope instance """
-    import Zope2.Startup
-    starter = Zope2.Startup.get_starter(wsgi=False)
-    opts = _setconfig()
-    starter.setConfiguration(opts.configroot)
-    try:
-        starter.prepare()
-    except:
-        starter.shutdown()
-        raise
-    starter.run()
+# BBB Zope 5.0
+deprecated(
+    'Please import from ZServer.Zope2.Startup.run',
+    run='ZServer.Zope2.Startup.run:run',
+)
 
 
 def configure(configfile):
@@ -75,7 +69,3 @@ def make_wsgi_app(global_config, zope_conf):
     starter.setConfiguration(opts.configroot)
     starter.prepare()
     return publish_module
-
-
-if __name__ == '__main__':
-    run()

src/Zope2/Startup/tests/test_schema.py

@@ -62,7 +62,7 @@ def load_config_text(self, text):
     def test_load_config_template(self):
         import Zope2.utilities
         base = os.path.dirname(Zope2.utilities.__file__)
-        fn = os.path.join(base, "skel", "etc", "base.conf.in")
+        fn = os.path.join(base, "skel", "etc", "wsgi.conf.in")
         f = open(fn)
         text = f.read()
         f.close()