[Zodb-checkins] CVS: Zope/lib/python/ZConfig/tests/input - inner.conf:1.1.2.1 logger.xml:1.2.2.1 outer.conf:1.1.2.1 zope.xml:1.1.2.5 include.conf:1.2.10.1 library.xml:1.1.2.2 simple.conf:1.3.10.1
Fred L. Drake, Jr.
fred@zope.com
Thu, 9 Jan 2003 14:28:28 -0500
Update of /cvs-repository/Zope/lib/python/ZConfig/tests/input
In directory cvs.zope.org:/tmp/cvs-serv3113/tests/input
Modified Files:
Tag: zconfig-schema-devel-branch
include.conf library.xml simple.conf
Added Files:
Tag: zconfig-schema-devel-branch
inner.conf logger.xml outer.conf zope.xml
Log Message:
Merge from the ZConfig HEAD.
=== Added File Zope/lib/python/ZConfig/tests/input/inner.conf ===
refouter $outervar
%define innervar inner
=== Added File Zope/lib/python/ZConfig/tests/input/logger.xml ===
<schema>
<sectiontype name="loghandler">
<key name="constructor" datatype="constructor" required="yes"/>
<key name="formatter" datatype="constructor"
default="logging.Formatter()"/>
</sectiontype>
<sectiontype name="logger">
<key name="level" datatype="logging-level" default="info"/>
<multisection type="loghandler" attribute="handlers" name="*"/>
</sectiontype>
</schema>
=== Added File Zope/lib/python/ZConfig/tests/input/outer.conf ===
%define outervar outer
%include inner.conf
refinner $innervar
=== Zope/lib/python/ZConfig/tests/input/zope.xml 1.1.2.4 => 1.1.2.5 ===
--- /dev/null Thu Jan 9 14:28:27 2003
+++ Zope/lib/python/ZConfig/tests/input/zope.xml Thu Jan 9 14:27:51 2003
@@ -0,0 +1,190 @@
+<schema prefix="ZConfig.tests.test_zopeschema">
+
+ <!-- type definitions -->
+
+ <import src="logger.xml"/>
+
+ <abstracttype name="server"/>
+
+ <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 name="ftp_server" handler=".ftp_server"
+ implements="server">
+ <key name="port" datatype="port-number"/>
+ </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>
+
+ <sectiontype name="pcgi_server" handler=".pcgi_server"
+ implements="server">
+ <key name="file"/>
+ </sectiontype>
+
+ <sectiontype name="fcgi_server" handler=".fcgi_server"
+ implements="server">
+ <key name="resource"/>
+ </sectiontype>
+
+ <sectiontype name="monitor_server" handler=".monitor_server"
+ implements="server">
+ <key name="port" datatype="port-number"/>
+ </sectiontype>
+
+ <sectiontype name="icp_server" handler=".icp_server"
+ implements="server">
+ <key name="port" datatype="port-number"/>
+ </sectiontype>
+
+
+ <abstracttype name="storage"/>
+
+ <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>
+
+ <sectiontype name="mappingstorage" handler=".mappingstorage"
+ implements="storage">
+ <key name="name" default="Mapping Storage"/>
+ </sectiontype>
+
+ <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>
+
+
+ <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 -->
+
+ <!-- schema begins -->
+
+ <key name="zope_home" datatype="existing-directory"/>
+
+ <key name="instance_home" datatype="existing-directory"/>
+
+ <key name="software_home" datatype="existing-directory"/>
+
+ <key name="client_home" datatype="existing-directory"/>
+
+ <key name="debug_mode" datatype="boolean" default="on"/>
+
+ <key name="effective_user"/>
+
+ <key name="enable_product_installation" datatype="boolean" default="on"/>
+
+ <key name="locale" datatype="locale"/>
+
+ <key name="zserver_threads" datatype="integer" default="4"/>
+
+ <key name="python_check_interval" datatype="integer" default="500"/>
+
+ <key name="use_daemon_process" datatype="boolean" default="on"/>
+
+ <key name="zserver_read_only_mode" datatype="boolean" default="off"/>
+
+ <key name="pid_filename" datatype="existing-dirpath"/>
+
+ <key name="lock_filename" datatype="existing-dirpath"/>
+
+ <section type="logger" name="access"/>
+
+ <section type="logger" name="event"/>
+
+ <section type="logger" name="trace"/>
+
+ <key name="structured_text_header_level" datatype="integer" default="3"/>
+
+ <key name="maximum_security_manager_stack_size" datatype="integer"
+ default="100"/>
+
+ <key name="publisher_profile_file"/>
+
+ <key name="webdav_source_user_agents"/>
+
+ <key name="module"/>
+
+ <multikey name="cgi_environment_variable" datatype="key-value"
+ attribute="cgi_environment_variables"/>
+
+ <key name="dns_ip_address" datatype="ipaddr-or-hostname"/>
+
+ <key name="ip_address" datatype="ipaddr-or-hostname"/>
+
+ <key name="http_realm" default="Zope"/>
+
+ <key name="default_servers" datatype="boolean" default="on"/>
+
+ <multisection type="server" name="*" attribute="servers"/>
+
+ <key name="automatically_quote_dtml_request_data" datatype="boolean"
+ default="on"/>
+
+ <key name="skip_authentication_checking" datatype="boolean"
+ default="off"/>
+
+ <key name="skip_ownership_checking" datatype="boolean"
+ default="off"/>
+
+ <key name="maximum_number_of_session_objects" datatype="integer"
+ 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"/>
+
+ <key name="suppress_all_access_rules" datatype="boolean"
+ default="off"/>
+
+ <key name="suppress_all_site_roots" datatype="boolean"
+ default="off"/>
+
+ <key name="database_quota_size" datatype="integer"/>
+
+ <key name="read_only_database" datatype="boolean"/>
+
+ <key name="zeo_client_name"/>
+
+ <multisection type="database" name="*" attribute="databases"/>
+
+ <!-- schema ends -->
+
+</schema>
=== Zope/lib/python/ZConfig/tests/input/include.conf 1.2 => 1.2.10.1 ===
--- Zope/lib/python/ZConfig/tests/input/include.conf:1.2 Tue Dec 3 12:58:00 2002
+++ Zope/lib/python/ZConfig/tests/input/include.conf Thu Jan 9 14:27:51 2003
@@ -1,3 +1,4 @@
var2 value2
%include simple.conf
var3 value3
+var4 $name
=== Zope/lib/python/ZConfig/tests/input/library.xml 1.1.2.1 => 1.1.2.2 ===
--- Zope/lib/python/ZConfig/tests/input/library.xml:1.1.2.1 Mon Dec 23 10:57:14 2002
+++ Zope/lib/python/ZConfig/tests/input/library.xml Thu Jan 9 14:27:51 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>
=== Zope/lib/python/ZConfig/tests/input/simple.conf 1.3 => 1.3.10.1 ===
--- Zope/lib/python/ZConfig/tests/input/simple.conf:1.3 Wed Dec 4 16:20:44 2002
+++ Zope/lib/python/ZConfig/tests/input/simple.conf Thu Jan 9 14:27:51 2003
@@ -20,7 +20,7 @@
# These test the %define mechanism:
-%define dollars $$
+%define dollars $$$$
%define empty
%define name value
%define twowords two words