[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup - datatypes.py:1.1.2.2 logger.xml:1.1.2.2 zopeschema.xml:1.1.2.5
Fred L. Drake, Jr.
fred@zope.com
Thu, 9 Jan 2003 15:58:13 -0500
Update of /cvs-repository/Zope/lib/python/Zope/Startup
In directory cvs.zope.org:/tmp/cvs-serv18163
Modified Files:
Tag: chrism-install-branch
datatypes.py logger.xml zopeschema.xml
Log Message:
Avoid underscores in names that get types in config files; admins should not
need to learn about the "shift" key. ;-)
=== Zope/lib/python/Zope/Startup/datatypes.py 1.1.2.1 => 1.1.2.2 ===
--- Zope/lib/python/Zope/Startup/datatypes.py:1.1.2.1 Sat Jan 4 23:01:37 2003
+++ Zope/lib/python/Zope/Startup/datatypes.py Thu Jan 9 15:58:06 2003
@@ -242,14 +242,13 @@
return mounts, DBWrapper(dbfactory, storagefactory)
def filestorage(section):
- file_name = section.file_name
kw = {
'create':section.create,
'read_only':section.read_only,
'stop':section.stop,
'quota':section.quota,
}
- return Factory('ZODB.FileStorage.FileStorage', None, file_name, **kw)
+ return Factory('ZODB.FileStorage.FileStorage', None, section.path, **kw)
def mappingstorage(section):
name = section.name
=== Zope/lib/python/Zope/Startup/logger.xml 1.1.2.1 => 1.1.2.2 ===
--- Zope/lib/python/Zope/Startup/logger.xml:1.1.2.1 Thu Jan 9 15:19:01 2003
+++ Zope/lib/python/Zope/Startup/logger.xml Thu Jan 9 15:58:06 2003
@@ -2,7 +2,7 @@
<abstracttype name="loghandler"/>
- <sectiontype name="file_handler" datatype=".file_handler"
+ <sectiontype name="file-handler" datatype=".file_handler"
implements="loghandler">
<key name="file" required="yes"/>
<key name="format" default="------\n%(asctime)s %(message)s"
@@ -11,7 +11,7 @@
<key name="level" default="info" datatype="logging-level"/>
</sectiontype>
- <sectiontype name="syslog_handler" datatype=".syslog_handler"
+ <sectiontype name="syslog-handler" datatype=".syslog_handler"
implements="loghandler">
<key name="facility" default="user" datatype=".syslog_facility"/>
<key name="socket" datatype="existing-file"/>
=== Zope/lib/python/Zope/Startup/zopeschema.xml 1.1.2.4 => 1.1.2.5 ===
--- Zope/lib/python/Zope/Startup/zopeschema.xml:1.1.2.4 Thu Jan 9 15:19:01 2003
+++ Zope/lib/python/Zope/Startup/zopeschema.xml Thu Jan 9 15:58:06 2003
@@ -7,40 +7,40 @@
<abstracttype name="server"/>
- <sectiontype name="http_server"
+ <sectiontype name="http-server"
implements="server">
<multikey name="port" attribute="ports" datatype="inet-address"/>
- <key name="force_connection_close" datatype="boolean" default="off"/>
+ <key name="force-connection-close" datatype="boolean" default="off"/>
</sectiontype>
- <sectiontype name="ftp_server"
+ <sectiontype name="ftp-server"
implements="server">
<multikey name="port" attribute="ports" datatype="inet-address"/>
</sectiontype>
- <sectiontype name="webdav_source_server"
+ <sectiontype name="webdav-source-server"
implements="server">
<multikey name="port" attribute="ports" datatype="inet-address"/>
- <key name="force_connection_close" datatype="boolean" default="off"/>
+ <key name="force-connection-close" datatype="boolean" default="off"/>
</sectiontype>
- <sectiontype name="pcgi_server"
+ <sectiontype name="pcgi-server"
implements="server">
<key name="file" datatype="existing-file"/>
</sectiontype>
- <sectiontype name="fcgi_server"
+ <sectiontype name="fcgi-server"
implements="server">
<key name="port" datatype="inet-address"/>
<key name="file" datatype="existing-dirpath"/>
</sectiontype>
- <sectiontype name="monitor_server"
+ <sectiontype name="monitor-server"
implements="server">
<multikey name="port" attribute="ports" datatype="inet-address"/>
</sectiontype>
- <sectiontype name="icp_server"
+ <sectiontype name="icp-server"
implements="server">
<multikey name="port" attribute="ports" datatype="inet-address"/>
</sectiontype>
@@ -50,9 +50,9 @@
<sectiontype name="filestorage" datatype=".filestorage"
implements="storage">
- <key name="file_name" required="yes"/>
+ <key name="path" required="yes"/>
<key name="create" datatype="boolean"/>
- <key name="read_only" datatype="boolean"/>
+ <key name="read-only" datatype="boolean"/>
<key name="stop"/>
<key name="quota" datatype="integer"/>
</sectiontype>
@@ -66,30 +66,30 @@
implements="storage">
<key name="addr" datatype="inet-address" required="yes"/>
<key name="storage" default="1"/>
- <key name="cache_size" datatype="integer" default="20000000"/>
+ <key name="cache-size" datatype="integer" default="20000000"/>
<key name="name" default=""/>
<key name="client"/>
<key name="debug" datatype="boolean"/>
<key name="var" datatype="existing-directory"/>
- <key name="min_disconnect_poll" datatype="integer" default="5"/>
- <key name="max_disconnect_poll" datatype="integer" default="300"/>
+ <key name="min-disconnect-poll" datatype="integer" default="5"/>
+ <key name="max-disconnect-poll" datatype="integer" default="300"/>
<key name="wait" datatype="boolean" default="on"/>
- <key name="read_only" datatype="boolean" default="off"/>
- <key name="read_only_fallback" datatype="boolean" default="off"/>
+ <key name="read-only" datatype="boolean" default="off"/>
+ <key name="read-only-fallback" datatype="boolean" default="off"/>
</sectiontype>
<sectiontype name="database" datatype=".database">
<multisection type="storage" name="*" attribute="storages"/>
- <multikey name="mount_point" attribute="mount_points"
+ <multikey name="mount-point" attribute="mount_points"
datatype=".mount_point"/>
- <key name="db_class" default="ZODB.DB"/>
- <key name="cache_size" datatype="integer" default="5000"/>
- <key name="pool_size" datatype="integer" default="7"/>
- <key name="cache_deactivate_after" datatype="integer" default="60"/>
- <key name="version_pool_size" datatype="integer" default="3"/>
- <key name="version_cache_size" datatype="integer" default="100"/>
- <key name="version_cache_deactivate_after" datatype="integer"
+ <key name="db-class" default="ZODB.DB"/>
+ <key name="cache-size" datatype="integer" default="5000"/>
+ <key name="pool-size" datatype="integer" default="7"/>
+ <key name="cache-deactivate-after" datatype="integer" default="60"/>
+ <key name="version-pool-size" datatype="integer" default="3"/>
+ <key name="version-cache-size" datatype="integer" default="100"/>
+ <key name="version-cache-deactivate-after" datatype="integer"
default="10"/>
</sectiontype>
@@ -97,99 +97,99 @@
<!-- schema begins -->
- <key name="instance_home" datatype="existing-directory"
+ <key name="instance-home" datatype="existing-directory"
required="yes" handler="instance_home"/>
- <key name="software_home" datatype="existing-directory"
+ <key name="software-home" datatype="existing-directory"
required="yes" handler="software_home"/>
- <key name="zope_home" datatype="existing-directory"
+ <key name="zope-home" datatype="existing-directory"
handler="zope_home"/>
- <key name="client_home" datatype="existing-directory"
+ <key name="client-home" datatype="existing-directory"
handler="client_home"/>
- <key name="pid_filename" datatype="existing-dirpath"/>
+ <key name="pid-filename" datatype="existing-dirpath"/>
- <key name="lock_filename" datatype="existing-dirpath"/>
+ <key name="lock-filename" datatype="existing-dirpath"/>
- <key name="debug_mode" datatype="boolean" default="on"
+ <key name="debug-mode" datatype="boolean" default="on"
handler="debug_mode"/>
- <key name="effective_user"/>
+ <key name="effective-user"/>
- <key name="enable_product_installation" datatype="boolean" default="on"
+ <key name="enable-product-installation" datatype="boolean" default="on"
handler="enable_product_installation"/>
<key name="locale" datatype="locale" handler="locale"/>
- <key name="zserver_threads" datatype="integer" default="4"/>
+ <key name="zserver-threads" datatype="integer" default="4"/>
- <key name="python_check_interval" datatype="integer" default="500"/>
+ <key name="python-check-interval" datatype="integer" default="500"/>
- <key name="use_daemon_process" datatype="boolean" default="on"
+ <key name="use-daemon-process" datatype="boolean" default="on"
handler="use_daemon_process"/>
- <key name="zserver_read_only_mode" datatype="boolean" default="off"
+ <key name="zserver-read-only-mode" datatype="boolean" default="off"
handler="zserver_read_only_mode"/>
- <key name="structured_text_header_level" datatype="integer" default="3"
+ <key name="structured-text-header-level" datatype="integer" default="3"
handler="structured_text_header_level"/>
- <key name="maximum_security_manager_stack_size" datatype="integer"
+ <key name="maximum-security-manager-stack-size" datatype="integer"
default="100" handler="maximum_security_manager_stack_size"/>
- <key name="publisher_profile_file" handler="publisher_profile_file"/>
+ <key name="publisher-profile-file" handler="publisher_profile_file"/>
- <key name="webdav_source_user_agents"/>
+ <key name="webdav-source-user-agents"/>
- <multikey name="cgi_environment_variable" datatype="key-value"
+ <multikey name="cgi-environment-variable" datatype="key-value"
attribute="cgi_environment_variables"/>
- <key name="dns_ip_address" datatype="ipaddr-or-hostname"/>
+ <key name="dns-ip-address" datatype="ipaddr-or-hostname"/>
- <key name="ip_address" datatype="ipaddr-or-hostname"/>
+ <key name="ip-address" datatype="ipaddr-or-hostname"/>
- <key name="http_realm" default="Zope" handler="http_realm"/>
+ <key name="http-realm" default="Zope" handler="http_realm"/>
- <key name="automatically_quote_dtml_request_data" datatype="boolean"
+ <key name="automatically-quote-dtml-request-data" datatype="boolean"
default="on" handler="automatically_quote_dtml_request_data"/>
- <key name="security_policy_implementation"
+ <key name="security-policy-implementation"
datatype=".security_policy_implementation"
default="C" handler="security_policy_implementation"/>
- <key name="skip_authentication_checking" datatype="boolean"
+ <key name="skip-authentication-checking" datatype="boolean"
default="off" handler="skip_authentication_checking"/>
- <key name="skip_ownership_checking" datatype="boolean"
+ <key name="skip-ownership-checking" datatype="boolean"
default="off" handler="skip_ownership_checking"/>
- <key name="maximum_number_of_session_objects" datatype="integer"
+ <key name="maximum-number-of-session-objects" datatype="integer"
default="1000" handler="maximum_number_of_session_objects"/>
- <key name="session_add_notify_script_path"
+ <key name="session-add-notify-script-path"
handler="session_add_notify_script_path"/>
- <key name="session_delete_notify_script_path"
+ <key name="session-delete-notify-script-path"
handler="session_add_notify_script_path"/>
- <key name="session_timeout_minutes" datatype="integer"
+ <key name="session-timeout-minutes" datatype="integer"
default="20" handler="session_timeout_minutes"/>
- <key name="suppress_all_access_rules" datatype="boolean"
+ <key name="suppress-all-access-rules" datatype="boolean"
default="off" handler="suppress_all_access_rules"/>
- <key name="suppress_all_site_roots" datatype="boolean"
+ <key name="suppress-all-site-roots" datatype="boolean"
default="off" handler="suppress_all_site_roots"/>
- <key name="database_quota_size" datatype="integer"
+ <key name="database-quota-size" datatype="integer"
handler="database_quota_size"/>
- <key name="read_only_database" datatype="boolean"
+ <key name="read-only-database" datatype="boolean"
handler="read_only_database"/>
- <key name="zeo_client_name"
+ <key name="zeo-client-name"
handler="zeo_client_name"/>
<section type="logger" name="event"/>