[Zope-Checkins] SVN: Zope/trunk/ LP #143089: Removed the top-level zeo-client-name option from zope.conf, as it had no effect since ZODB 3.2.

[Hanno Schlichting]

Log message for revision 110466:
  LP #143089: Removed the top-level zeo-client-name option from zope.conf, as it had no effect since ZODB 3.2.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/Zope2/Startup/handlers.py
  U   Zope/trunk/src/Zope2/Startup/zopeschema.xml
  U   Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2010-04-03 18:08:57 UTC (rev 110465)
+++ Zope/trunk/doc/CHANGES.rst	2010-04-03 18:16:04 UTC (rev 110466)
@@ -144,6 +144,9 @@
 Bugs Fixed
 ++++++++++
 
+- LP #143089: Removed the top-level zeo-client-name option from zope.conf, as
+  it had no effect since ZODB 3.2.
+
 - LP #143410: Removed unnecessary color definition in ZMI CSS.
 
 - LP #143391: Protect against missing acl_users.hasUsers on quick start page.

Modified: Zope/trunk/src/Zope2/Startup/handlers.py
===================================================================
--- Zope/trunk/src/Zope2/Startup/handlers.py	2010-04-03 18:08:57 UTC (rev 110465)
+++ Zope/trunk/src/Zope2/Startup/handlers.py	2010-04-03 18:16:04 UTC (rev 110466)
@@ -80,10 +80,6 @@
                     DeprecationWarning, stacklevel=2)
     return value
 
-def zeo_client_name(value):
-    value and _setenv('ZEO_CLIENT', value)
-    return value
-
 def structured_text_header_level(value):
     value is not None and _setenv('STX_DEFAULT_LEVEL', value)
     return value

Modified: Zope/trunk/src/Zope2/Startup/zopeschema.xml
===================================================================
--- Zope/trunk/src/Zope2/Startup/zopeschema.xml	2010-04-03 18:08:57 UTC (rev 110465)
+++ Zope/trunk/src/Zope2/Startup/zopeschema.xml	2010-04-03 18:16:04 UTC (rev 110466)
@@ -794,16 +794,6 @@
      <metadefault>off</metadefault>
   </key>
 
-  <key name="zeo-client-name" handler="zeo_client_name">
-    <description>
-     Provide a string value to uniquely identify the local cache files
-     created if this Zope is a ZEO client. Setting this directive implies
-     setting 'enable-product-installation' to 'off' if
-     'enable-product-installation' is left unset.
-     </description>
-     <metadefault>unset</metadefault>
-  </key>
-
   <section type="eventlog" name="*" attribute="eventlog">
     <description>
       Describes what level of log output is desired and where it

Modified: Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in
===================================================================
--- Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in	2010-04-03 18:08:57 UTC (rev 110465)
+++ Zope/trunk/src/Zope2/utilities/skel/etc/zope.conf.in	2010-04-03 18:16:04 UTC (rev 110466)
@@ -736,24 +736,6 @@
 #    database-quota-size 1000000
 
 
-# Directive: zeo-client-name
-#
-# Description:
-#     If you want a persistent ZEO client cache which retains cache
-#     contents across ClientStorage restarts, you need to define a
-#     zeo-client-name.  If you use ZEO and you don't set a
-#     zeo-client-name, the client cache is stored in temporary files
-#     which are removed when the ClientStorage shuts down.  The value
-#     of zeo-client-name is used to uniquely identify the local cache
-#     files created if this Zope is a ZEO client.
-#
-# Default: unset
-#
-# Example:
-#
-#    zeo-client-name zeo1
-
-
 # Directives: logger
 #
 # Description: