[Zope3-checkins] CVS: Packages/ZConfig/tests/input - zope-allpopulated.conf:1.1.2.4 zope.xml:1.1.2.2

Chris McDonough chrism@zope.com
Thu, 19 Dec 2002 17:11:24 -0500


Update of /cvs-repository/Packages/ZConfig/tests/input
In directory cvs.zope.org:/tmp/cvs-serv8839/input

Modified Files:
      Tag: zconfig-schema-devel-branch
	zope-allpopulated.conf zope.xml 
Log Message:
Success in fully populated schema test.


=== Packages/ZConfig/tests/input/zope-allpopulated.conf 1.1.2.3 => 1.1.2.4 ===
--- Packages/ZConfig/tests/input/zope-allpopulated.conf:1.1.2.3	Thu Dec 19 16:11:56 2002
+++ Packages/ZConfig/tests/input/zope-allpopulated.conf	Thu Dec 19 17:11:22 2002
@@ -14,6 +14,7 @@
 lock_filename Z2.lock
 
 <logger event>
+  level 10
   <handler>
     constructor ZConfig.tests.test_zopeschema.StreamHandler()
     formatter ZConfig.tests.test_zopeschema.Formatter()
@@ -25,6 +26,7 @@
 </logger>
 
 <logger trace>
+  level 20
   <handler>
     constructor ZConfig.tests.test_zopeschema.StreamHandler()
     formatter ZConfig.tests.test_zopeschema.Formatter()
@@ -32,6 +34,7 @@
 </logger>
 
 <logger access>
+  level 30
   <handler>
     constructor ZConfig.tests.test_zopeschema.StreamHandler()
     formatter ZConfig.tests.test_zopeschema.Formatter()
@@ -48,10 +51,15 @@
 dns_ip_address 127.0.0.1
 ip_address 127.0.0.1
 http_realm Zope
-force_http_connection_close off
 
 <http_server>
   port 8080
+  force_connection_close off
+</http_server>
+
+<http_server>
+  port 8081
+  force_connection_close on
 </http_server>
 
 <ftp_server>


=== Packages/ZConfig/tests/input/zope.xml 1.1.2.1 => 1.1.2.2 ===
--- Packages/ZConfig/tests/input/zope.xml:1.1.2.1	Thu Dec 19 15:41:39 2002
+++ Packages/ZConfig/tests/input/zope.xml	Thu Dec 19 17:11:22 2002
@@ -17,6 +17,7 @@
 
     <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">
@@ -25,6 +26,7 @@
 
     <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">
@@ -148,7 +150,8 @@
 
   <key name="module" datatype="str"/>
 
-  <multikey name="cgi_environment_variable" datatype="null"/>
+  <multikey name="cgi_environment_variable" datatype="null"
+       attribute="cgi_environment_variables"/>
 
   <key name="dns_ip_address" datatype="str"/>
 
@@ -156,8 +159,6 @@
 
   <key name="http_realm" datatype="str" default="Zope"/>
 
-  <key name="force_http_connection_close" datatype="boolean" default="off"/>
-
   <key name="default_servers" datatype="boolean" default="on"/>
 
   <multisection type="server" name="*" attribute="servers"/>
@@ -187,7 +188,7 @@
   <key name="suppress_all_site_roots" datatype="boolean"
      default="off"/>
 
-  <key name="database_quota_size" datatype="null"/>
+  <key name="database_quota_size" datatype="integer"/>
 
   <key name="read_only_database" datatype="boolean"/>