Mrege rev 38358 from 3.5 branch.

Re-add the zeoctl module to ZEO, and rewrite runzeo so
it can run as a main program (the scripts created by
mkzeoinstance.py expect to be able to do this).

NEWS.txt

@@ -51,6 +51,9 @@ Development
   not be compiled from a ZODB release, since some of the C header files
   needed appear only in Zope.
 
+- (3.6a3) Re-added the ``zeoctl`` module, for the same reasons
+  ``mkzeoinst`` was re-added (see below).
+
 - (3.6a2) The ``mkzeoinst`` module was re-added to ZEO, because Zope3
   has a script that expects to import it from there.  ZODB's ``mkzeoinst``
   script was rewritten to invoke the ``mkzeoinst`` module.
@@ -63,11 +66,15 @@ Release date: 06-Sep-2005
 Following is combined news from internal releases (to support ongoing
 Zope3 development).  These are the dates of the internal releases:
 
+- 3.5.1b2 07-Sep-2005
 - 3.5.1b1 06-Sep-2005
 
 Build
 -----
 
+- (3.5.1b2) Re-added the ``zeoctl`` module, for the same reasons
+  ``mkzeoinst`` was re-added (see below).
+
 - (3.5.1b1) The ``mkzeoinst`` module was re-added to ZEO, because Zope3
   has a script that expects to import it from there.  ZODB's ``mkzeoinst``
   script was rewritten to invoke the ``mkzeoinst`` module.

src/ZEO/runzeo.py

@@ -351,3 +351,6 @@ def main(args=None):
     options.realize(args)
     s = ZEOServer(options)
     s.main()
+
+if __name__ == "__main__":
+    main()

src/ZEO/zeoctl.py

+#!/usr/bin/env python2.3
+##############################################################################
+#
+# Copyright (c) 2005 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
+#
+##############################################################################
+
+"""Wrapper script for zdctl.py that causes it to use the ZEO schema."""
+
+import os
+
+import ZEO
+import zdaemon.zdctl
+
+# Main program
+def main(args=None):
+    options = zdaemon.zdctl.ZDCtlOptions()
+    options.schemadir = os.path.dirname(ZEO.__file__)
+    options.schemafile = "zeoctl.xml"
+    zdaemon.zdctl.main(args, options)
+
+if __name__ == "__main__":
+    main()

src/scripts/zeoctl.py

 #!/usr/bin/env python2.3
+##############################################################################
+#
+# Copyright (c) 2005 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
+#
+##############################################################################
 
 """Wrapper script for zdctl.py that causes it to use the ZEO schema."""
 
-import os
-
-import ZEO
-import zdaemon.zdctl
-
-
-# Main program
-def main(args=None):
-    options = zdaemon.zdctl.ZDCtlOptions()
-    options.schemadir = os.path.dirname(ZEO.__file__)
-    options.schemafile = "zeoctl.xml"
-    zdaemon.zdctl.main(args, options)
-
-
-if __name__ == "__main__":
-    main()
+from ZEO.zeoctl import main
+main()