[Zope3-checkins] SVN: Zope3/trunk/ Moved (duplicate) zopectl support out of server packages

Jim Fulton jim at zope.com
Sat Mar 11 13:21:28 EST 2006


Log message for revision 65915:
  Moved (duplicate) zopectl support out of server packages
  

Changed:
  U   Zope3/trunk/bin/zopectl
  A   Zope3/trunk/src/zope/app/appsetup/controller.py
  D   Zope3/trunk/src/zope/app/server/controller.py
  D   Zope3/trunk/src/zope/app/server/zopeskel/bin/zopectl.in
  D   Zope3/trunk/src/zope/app/twisted/controller.py
  U   Zope3/trunk/zopeskel/bin/zopectl.in

-=-
Modified: Zope3/trunk/bin/zopectl
===================================================================
--- Zope3/trunk/bin/zopectl	2006-03-11 17:52:19 UTC (rev 65914)
+++ Zope3/trunk/bin/zopectl	2006-03-11 18:21:27 UTC (rev 65915)
@@ -15,5 +15,5 @@
 sys.argv[1:1] = ["-C", CONFIG_FILE]
 
 
-from zope.app.twisted.controller import main
+from zope.app.appsetup.controller import main
 main()

Copied: Zope3/trunk/src/zope/app/appsetup/controller.py (from rev 41246, Zope3/trunk/src/zope/app/twisted/controller.py)

Deleted: Zope3/trunk/src/zope/app/server/controller.py
===================================================================
--- Zope3/trunk/src/zope/app/server/controller.py	2006-03-11 17:52:19 UTC (rev 65914)
+++ Zope3/trunk/src/zope/app/server/controller.py	2006-03-11 18:21:27 UTC (rev 65915)
@@ -1,48 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 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.
-#
-##############################################################################
-"""Top-level controller for 'zopectl'.
-"""
-
-import os
-
-import zdaemon.zdctl
-
-
-INSTANCE_HOME = os.path.dirname(
-    os.path.dirname(os.path.dirname(zdaemon.__file__)))
-
-
-class ZopectlCmd(zdaemon.zdctl.ZDCmd):
-
-    def do_debug(self, rest):
-        cmdline = os.path.join(INSTANCE_HOME, 'bin', 'debugzope')
-        os.system(cmdline)
-
-    def help_debug(self):
-        print "debug -- Initialize the Zope application, providing a"
-        print "         debugger object at an interactive Python prompt."
-
-    def do_run(self, arg):
-        cmdline = "%s %s" % (
-            os.path.join(INSTANCE_HOME, 'bin', 'scriptzope'), arg)
-        os.system(cmdline)
-
-    def help_run(self):
-        print "run <script> [args] -- run a Python script with the Zope "
-        print "                       environment set up.  The script has "
-        print "                       'root' exposed as the root container."
-
-
-def main(args=None, options=None, cmdclass=ZopectlCmd):
-    zdaemon.zdctl.main(args, options, cmdclass)

Deleted: Zope3/trunk/src/zope/app/server/zopeskel/bin/zopectl.in
===================================================================
--- Zope3/trunk/src/zope/app/server/zopeskel/bin/zopectl.in	2006-03-11 17:52:19 UTC (rev 65914)
+++ Zope3/trunk/src/zope/app/server/zopeskel/bin/zopectl.in	2006-03-11 18:21:27 UTC (rev 65915)
@@ -1,43 +0,0 @@
-#!<<PYTHON>>
-##############################################################################
-#
-# Copyright (c) 2004 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.
-#
-##############################################################################
-"""Script to run the Zope Application Server in the foreground.
-
-$Id$
-"""
-import os
-import sys
-
-
-SOFTWARE_HOME = r"<<SOFTWARE_HOME>>"
-INSTANCE_HOME = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-CONFIG_FILE = os.path.join(INSTANCE_HOME, "etc", "zdaemon.conf")
-
-
-def run():
-    # This removes the script directory from sys.path, which we do
-    # since there are no modules here.
-    #
-    basepath = filter(None, sys.path)
-
-    sys.path[:] = [os.path.join(INSTANCE_HOME, "lib", "python"),
-                   SOFTWARE_HOME] + basepath
-
-    import zope.app.server.controller
-    zope.app.server.controller.INSTANCE_HOME = INSTANCE_HOME
-    zope.app.server.controller.main(["-C", CONFIG_FILE] + sys.argv[1:])
-
-
-if __name__ == '__main__':
-    run()

Deleted: Zope3/trunk/src/zope/app/twisted/controller.py
===================================================================
--- Zope3/trunk/src/zope/app/twisted/controller.py	2006-03-11 17:52:19 UTC (rev 65914)
+++ Zope3/trunk/src/zope/app/twisted/controller.py	2006-03-11 18:21:27 UTC (rev 65915)
@@ -1,48 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 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.
-#
-##############################################################################
-"""Top-level controller for 'zopectl'.
-"""
-
-import os
-
-import zdaemon.zdctl
-
-
-INSTANCE_HOME = os.path.dirname(
-    os.path.dirname(os.path.dirname(zdaemon.__file__)))
-
-
-class ZopectlCmd(zdaemon.zdctl.ZDCmd):
-
-    def do_debug(self, rest):
-        cmdline = os.path.join(INSTANCE_HOME, 'bin', 'debugzope')
-        os.system(cmdline)
-
-    def help_debug(self):
-        print "debug -- Initialize the Zope application, providing a"
-        print "         debugger object at an interactive Python prompt."
-
-    def do_run(self, arg):
-        cmdline = "%s %s" % (
-            os.path.join(INSTANCE_HOME, 'bin', 'scriptzope'), arg)
-        os.system(cmdline)
-
-    def help_run(self):
-        print "run <script> [args] -- run a Python script with the Zope "
-        print "                       environment set up.  The script has "
-        print "                       'root' exposed as the root container."
-
-
-def main(args=None, options=None, cmdclass=ZopectlCmd):
-    zdaemon.zdctl.main(args, options, cmdclass)

Modified: Zope3/trunk/zopeskel/bin/zopectl.in
===================================================================
--- Zope3/trunk/zopeskel/bin/zopectl.in	2006-03-11 17:52:19 UTC (rev 65914)
+++ Zope3/trunk/zopeskel/bin/zopectl.in	2006-03-11 18:21:27 UTC (rev 65915)
@@ -34,9 +34,9 @@
     sys.path[:] = [os.path.join(INSTANCE_HOME, "lib", "python"),
                    SOFTWARE_HOME] + basepath
 
-    import zope.app.twisted.controller
-    zope.app.twisted.controller.INSTANCE_HOME = INSTANCE_HOME
-    zope.app.twisted.controller.main(["-C", CONFIG_FILE] + sys.argv[1:])
+    import zope.app.appsetup.controller
+    zope.app.appsetup.controller.INSTANCE_HOME = INSTANCE_HOME
+    zope.app.appsetup.controller.main(["-C", CONFIG_FILE] + sys.argv[1:])
 
 
 if __name__ == '__main__':



More information about the Zope3-Checkins mailing list