[Zope-Checkins] CVS: Packages/ZConfig/tests/input - library.xml:1.3 logger.xml:1.2 zope.xml:1.3
Fred L. Drake, Jr.
fred@zope.com
Thu, 9 Jan 2003 00:43:05 -0500
Update of /cvs-repository/Packages/ZConfig/tests/input
In directory cvs.zope.org:/tmp/cvs-serv29797/tests/input
Modified Files:
library.xml logger.xml zope.xml
Log Message:
Change some naming based on a discussion with Chris and Shane; the primary
intent being to make this easier to explain.
- <sectiongroup type="foo"/> becomes <abstracttype name="foo"/>
- <sectiontype type="foo"/> becomes <sectiontype name="foo"/>
- <sectiontype ... group="foo"/> becomes <sectiontype ... implements="foo"/>
- several internal names get changed to use names consistent with the
new terminology
=== Packages/ZConfig/tests/input/library.xml 1.2 => 1.3 ===
--- Packages/ZConfig/tests/input/library.xml:1.2 Fri Jan 3 16:05:59 2003
+++ Packages/ZConfig/tests/input/library.xml Thu Jan 9 00:42:33 2003
@@ -2,6 +2,6 @@
<description>
Sample library of reusable data types.
</description>
- <sectiontype type="type-a"/>
- <sectiontype type="type-b"/>
+ <sectiontype name="type-a"/>
+ <sectiontype name="type-b"/>
</schema>
=== Packages/ZConfig/tests/input/logger.xml 1.1 => 1.2 ===
--- Packages/ZConfig/tests/input/logger.xml:1.1 Fri Jan 3 17:38:31 2003
+++ Packages/ZConfig/tests/input/logger.xml Thu Jan 9 00:42:33 2003
@@ -1,11 +1,11 @@
<schema>
- <sectiontype type="loghandler" datatype="null">
+ <sectiontype name="loghandler">
<key name="constructor" datatype="constructor" required="yes"/>
<key name="formatter" datatype="constructor"
default="logging.Formatter()"/>
</sectiontype>
- <sectiontype type="logger">
+ <sectiontype name="logger">
<key name="level" datatype="logging-level" default="info"/>
<multisection type="loghandler" attribute="handlers" name="*"/>
</sectiontype>
=== Packages/ZConfig/tests/input/zope.xml 1.2 => 1.3 ===
--- Packages/ZConfig/tests/input/zope.xml:1.2 Fri Jan 3 17:38:31 2003
+++ Packages/ZConfig/tests/input/zope.xml Thu Jan 9 00:42:33 2003
@@ -4,92 +4,90 @@
<import src="logger.xml"/>
- <sectiongroup type="server">
+ <abstracttype name="server"/>
- <sectiontype type="http_server" handler=".http_server">
- <key name="port" datatype="port-number"/>
- <key name="force_connection_close" datatype="boolean" default="off"/>
- </sectiontype>
-
- <sectiontype type="ftp_server" handler=".ftp_server">
- <key name="port" datatype="port-number"/>
- </sectiontype>
-
- <sectiontype type="webdav_source_server" handler=".webdav_source_server">
- <key name="port" datatype="port-number"/>
- <key name="force_connection_close" datatype="boolean" default="off"/>
- </sectiontype>
-
- <sectiontype type="pcgi_server" handler=".pcgi_server">
- <key name="file"/>
- </sectiontype>
-
- <sectiontype type="fcgi_server" handler=".fcgi_server">
- <key name="resource"/>
- </sectiontype>
-
- <sectiontype type="monitor_server" handler=".monitor_server">
- <key name="port" datatype="port-number"/>
- </sectiontype>
-
- <sectiontype type="icp_server" handler=".icp_server">
- <key name="port" datatype="port-number"/>
- </sectiontype>
-
- </sectiongroup>
-
- <sectiongroup type="storage">
-
- <sectiontype type="filestorage" handler=".filestorage">
- <key name="file_name" required="yes"/>
- <key name="create" datatype="boolean"/>
- <key name="read_only" datatype="boolean"/>
- <key name="stop"/>
- <key name="quota" datatype="integer"/>
- </sectiontype>
+ <sectiontype name="http_server" handler=".http_server"
+ implements="server">
+ <key name="port" datatype="port-number"/>
+ <key name="force_connection_close" datatype="boolean" default="off"/>
+ </sectiontype>
- <sectiontype type="mappingstorage" handler=".mappingstorage">
- <key name="name" default="Mapping Storage"/>
- </sectiontype>
+ <sectiontype name="ftp_server" handler=".ftp_server"
+ implements="server">
+ <key name="port" datatype="port-number"/>
+ </sectiontype>
- <sectiontype type="clientstorage" handler=".clientstorage">
- <key name="addr" required="yes"/>
- <key name="storage" default="1"/>
- <key name="cache_size" datatype="integer" default="20000000"/>
- <key name="name" default=""/>
- <key name="client"/>
- <key name="debug" datatype="boolean"/>
- <key name="var"/>
- <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"/>
- </sectiontype>
+ <sectiontype name="webdav_source_server" handler=".webdav_source_server"
+ implements="server">
+ <key name="port" datatype="port-number"/>
+ <key name="force_connection_close" datatype="boolean" default="off"/>
+ </sectiontype>
- </sectiongroup>
+ <sectiontype name="pcgi_server" handler=".pcgi_server"
+ implements="server">
+ <key name="file"/>
+ </sectiontype>
- <sectiontype type="database" datatype="null">
+ <sectiontype name="fcgi_server" handler=".fcgi_server"
+ implements="server">
+ <key name="resource"/>
+ </sectiontype>
- <multisection type="storage" name="*" attribute="storages"/>
+ <sectiontype name="monitor_server" handler=".monitor_server"
+ implements="server">
+ <key name="port" datatype="port-number"/>
+ </sectiontype>
- <key name="mount_point"/>
+ <sectiontype name="icp_server" handler=".icp_server"
+ implements="server">
+ <key name="port" datatype="port-number"/>
+ </sectiontype>
- <key name="db_class" default="ZODB.DB"/>
- <key name="cache_size" datatype="integer" default="5000"/>
+ <abstracttype name="storage"/>
- <key name="pool_size" datatype="integer" default="7"/>
+ <sectiontype name="filestorage" handler=".filestorage"
+ implements="storage">
+ <key name="file_name" required="yes"/>
+ <key name="create" datatype="boolean"/>
+ <key name="read_only" datatype="boolean"/>
+ <key name="stop"/>
+ <key name="quota" datatype="integer"/>
+ </sectiontype>
- <key name="cache_deactivate_after" datatype="integer" default="60"/>
+ <sectiontype name="mappingstorage" handler=".mappingstorage"
+ implements="storage">
+ <key name="name" default="Mapping Storage"/>
+ </sectiontype>
- <key name="version_pool_size" datatype="integer" default="3"/>
+ <sectiontype name="clientstorage" handler=".clientstorage"
+ implements="storage">
+ <key name="addr" required="yes"/>
+ <key name="storage" default="1"/>
+ <key name="cache_size" datatype="integer" default="20000000"/>
+ <key name="name" default=""/>
+ <key name="client"/>
+ <key name="debug" datatype="boolean"/>
+ <key name="var"/>
+ <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"/>
+ </sectiontype>
- <key name="version_cache_size" datatype="integer" default="100"/>
- <key name="version_cache_deactivate_after" datatype="integer"
+ <sectiontype name="database">
+ <multisection type="storage" name="*" attribute="storages"/>
+ <key name="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"
default="10"/>
-
</sectiontype>
<!-- end of type definitions -->
@@ -142,7 +140,7 @@
<key name="module"/>
<multikey name="cgi_environment_variable" datatype="key-value"
- attribute="cgi_environment_variables"/>
+ attribute="cgi_environment_variables"/>
<key name="dns_ip_address" datatype="ipaddr-or-hostname"/>
@@ -155,29 +153,29 @@
<multisection type="server" name="*" attribute="servers"/>
<key name="automatically_quote_dtml_request_data" datatype="boolean"
- default="on"/>
+ default="on"/>
<key name="skip_authentication_checking" datatype="boolean"
- default="off"/>
+ default="off"/>
<key name="skip_ownership_checking" datatype="boolean"
- default="off"/>
+ default="off"/>
<key name="maximum_number_of_session_objects" datatype="integer"
- default="1000"/>
+ default="1000"/>
<key name="session_add_notify_script_path"/>
<key name="session_delete_notify_script_path"/>
<key name="session_timeout_minutes" datatype="integer"
- default="20"/>
+ default="20"/>
<key name="suppress_all_access_rules" datatype="boolean"
- default="off"/>
+ default="off"/>
<key name="suppress_all_site_roots" datatype="boolean"
- default="off"/>
+ default="off"/>
<key name="database_quota_size" datatype="integer"/>