[Zope-Checkins] CVS: Zope/inst/skel/inst/in - zctl.py.in:1.1.2.5 zope.conf.in:1.1.2.8

[Chris McDonough]

Update of /cvs-repository/Zope/inst/skel/inst/in
In directory cvs.zope.org:/tmp/cvs-serv12212/skel/inst/in

Modified Files:
      Tag: chrism-install-branch
	zctl.py.in zope.conf.in 
Log Message:
Changes to support ZConfig schema-devel branch.

This breaks the chrism-install-branch for new checkouts, as 1) I haven't added the Startup package to the branch for fear of adding it to the trunk and 2) I haven't changed the ZConfig package on the branch to use the schema-devel-branch code.  Hopefully, Fred can merge the ZConfig schema-devel-branch changes into the ZConfig head, so we don't need to keep track of that portion of this.  The Startup package needs to be added to Zope via repolinks and I need to think about that a bit. 

This checkin also invalidates older config files.


=== Zope/inst/skel/inst/in/zctl.py.in 1.1.2.4 => 1.1.2.5 ===
--- Zope/inst/skel/inst/in/zctl.py.in:1.1.2.4	Mon Nov 25 02:43:35 2002
+++ Zope/inst/skel/inst/in/zctl.py.in	Thu Jan  2 11:50:56 2003
@@ -20,14 +20,12 @@
 import sys, os
 
 CONFIG_LOCATION = r'<<CONFIG_LOCATION>>'
-INSTANCE_HOME = r'<<INSTANCE_HOME>>'
-ZOPE_HOME     = r'<<BASE_DIR>>'
-SOFTWARE_HOME = os.path.join(ZOPE_HOME, 'lib', 'python')
+SOFTWARE_HOME = r'<<SOFTWARE_HOME>>'
 
 sys.path.insert(0, SOFTWARE_HOME)
-sys.path = filter(None, sys.path)
+sys.path = filter(None, sys.path) # strip empties from sys.path
 
 if __name__ == '__main__':
-    from Controller import ZctlLib
-    ZctlLib.start(CONFIG_LOCATION, ZOPE_HOME, SOFTWARE_HOME, INSTANCE_HOME)
+    from Startup.Controller import ZctlLib
+    ZctlLib.start(CONFIG_LOCATION)
 


=== Zope/inst/skel/inst/in/zope.conf.in 1.1.2.7 => 1.1.2.8 === (593/693 lines abridged)
--- Zope/inst/skel/inst/in/zope.conf.in:1.1.2.7	Mon Nov 25 15:14:41 2002
+++ Zope/inst/skel/inst/in/zope.conf.in	Thu Jan  2 11:50:56 2003
@@ -6,26 +6,10 @@
 # file shows what the default configuration directives are, and show examples
 # for each directive.  To declare a directive, make sure that you add it
 # to a line that does not begin with '#'.
-#
-# Directive: zope_home
-#
-# Description:
-#     The 'top-level' Zope software directory (home of the Zserver
-#     directory, the doc directory, the utilities directory, etc.)
-#
-# Influences: ZOPE_HOME environment variable
-#
-# Default:
-#
-#     The directory in which the 'zope.py' file (or other executable file
-#     used to start Zope) lives.
-#
-# Example:
-#
-#    zope_home /home/chrism/software/Trunk
 
-zope_home <<BASE_DIR>>
+# ZConfig "defines" used for later bash-style textual substitution
 
+%define INSTANCE_HOME <<INSTANCE_HOME>>
 
 # Directive: instance_home
 #
@@ -35,14 +19,13 @@
 #
 # Influences: INSTANCE_HOME environment variable
 #
-# Default: The current working directory when Zope is started.
+# Required (no default)
 #
 # Example:
 #
 #    instance_home /home/chrism/projects/sessions
 
-instance_home <<INSTANCE_HOME>>
-
+instance_home ${instance_home}
 
 # Directive: software_home
 #
@@ -52,7 +35,7 @@
 #

[-=- -=- -=- 593 lines omitted -=- -=- -=-]

+# Influences: zope.py configuration
+#
+# Default:
+#   If a root database (a database which includes a mount_point of '/') 
+#   is not specified, a FileStorage in client_home is used.
 #
 # Example:
 #
-# <zodb_databases>
-#   <database />
-#     <storage>
-#       class        ZODB.FileStorage.FileStorage
-#       args         file_name='${instance_home}/var/Data.fs'
-#     </storage>
-#       class                          ZODB.DB
-#       cache_size                     5000
-#       pool_size                      7
-#       cache_deactivate_after         60
-#       version_pool_size              3
-#       version_cache_size             100
-#       version_cache_deactivate_after 10
-#     </database>
-#   <database /zeostorage>
-#     <storage>
-#       class        ZEO.ClientStorage.ClientStorage
-#       args         addr=('localhost', 8001), storage='1',cache_size=20000000
-#     </storage>
-#       class                          ZODB.DB
-#       cache_size                     5000
-#       pool_size                      7
-#       cache_deactivate_after         60
-#       version_pool_size              3
-#       version_cache_size             100
-#       version_cache_deactivate_after 10
-#   </database>
-# </zodb_databases>
+# <database>
+#    <filestorage>
+#      file_name ${instance_home}/var/Data.fs
+#    </filestorage>
+#    mount_point /
+#    db_class                       ZODB.DB
+#    cache_size                     5000
+#    pool_size                      7
+#    cache_deactivate_after         60
+#    version_pool_size              3
+#    version_cache_size             100
+#    version_cache_deactivate_after 10
+# </database>
+