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

[Chris McDonough]

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

Modified Files:
      Tag: zconfig-schema-devel-branch
	zope-allpopulated.conf zope.xml 
Log Message:
Added following "stock" datatypes and tests:

"ipaddr-or-hostname":  Validates a valid IP address or hostname.
"existing-directory":  Ensures that a directory by the given name exists.
"existing-path":       Ensures that a path by the given name exists.
"existing-file":       Ensure that a file by the given name exists.
"existing-dirpath":    Ensure that the directory implied by path exists.
"constructor":         Parse a "constructor(1,2,3)" value into klass, pos, kw.
"key-value":           Space-separated key-value pairs in values.

Changed Zope schema to make use of these datatypes.



=== Packages/ZConfig/tests/input/zope-allpopulated.conf 1.1.2.4 => 1.1.2.5 ===
--- Packages/ZConfig/tests/input/zope-allpopulated.conf:1.1.2.4	Thu Dec 19 17:11:22 2002
+++ Packages/ZConfig/tests/input/zope-allpopulated.conf	Sat Dec 21 23:18:46 2002
@@ -1,7 +1,7 @@
-zope_home foo
-instance_home bar
-software_home foo/lib/python
-client_home instance_home/var
+zope_home .
+instance_home .
+software_home .
+client_home .
 debug_mode on
 effective_user chrism
 enable_product_installation on


=== Packages/ZConfig/tests/input/zope.xml 1.1.2.2 => 1.1.2.3 ===
--- Packages/ZConfig/tests/input/zope.xml:1.1.2.2	Thu Dec 19 17:11:22 2002
+++ Packages/ZConfig/tests/input/zope.xml	Sat Dec 21 23:18:46 2002
@@ -3,8 +3,8 @@
   <!-- type definitions -->
 
   <sectiontype type="handler" datatype="null">
-    <key name="constructor" datatype=".constructor" required="yes"/>
-    <key name="formatter" datatype=".constructor"
+    <key name="constructor" datatype="constructor" required="yes"/>
+    <key name="formatter" datatype="constructor"
          default="logging.Formatter()"/>
   </sectiontype>
 
@@ -34,7 +34,7 @@
     </sectiontype>
 
     <sectiontype type="fcgi_server" handler=".fcgi_server">
-      <key name="resource" datatype="null"/>
+      <key name="resource" datatype="str"/>
     </sectiontype>
 
     <sectiontype type="monitor_server" handler=".monitor_server">
@@ -84,7 +84,7 @@
 
       <key name="mount_point" datatype="str"/>
 
-      <key name="db_class" datatype="null" default="ZODB.DB"/>
+      <key name="db_class" datatype="str" default="ZODB.DB"/>
 
       <key name="cache_size" datatype="integer" default="5000"/>
 
@@ -105,13 +105,13 @@
 
   <!-- schema begins  -->
 
-  <key name="zope_home" datatype="str"/>
+  <key name="zope_home" datatype="existing-directory"/>
 
-  <key name="instance_home" datatype="str"/>
+  <key name="instance_home" datatype="existing-directory"/>
 
-  <key name="software_home" datatype="str"/>
+  <key name="software_home" datatype="existing-directory"/>
 
-  <key name="client_home" datatype="str"/>
+  <key name="client_home" datatype="existing-directory"/>
 
   <key name="debug_mode" datatype="boolean" default="on"/>
 
@@ -129,9 +129,9 @@
 
   <key name="zserver_read_only_mode" datatype="boolean" default="off"/>
 
-  <key name="pid_filename" datatype="str"/>
+  <key name="pid_filename" datatype="existing-dirpath"/>
 
-  <key name="lock_filename" datatype="str"/>
+  <key name="lock_filename" datatype="existing-dirpath"/>
 
   <section type="logger" name="access"/>
  
@@ -150,12 +150,12 @@
 
   <key name="module" datatype="str"/>
 
-  <multikey name="cgi_environment_variable" datatype="null"
+  <multikey name="cgi_environment_variable" datatype="key-value"
        attribute="cgi_environment_variables"/>
 
-  <key name="dns_ip_address" datatype="str"/>
+  <key name="dns_ip_address" datatype="ipaddr-or-hostname"/>
 
-  <key name="ip_address" datatype="str"/>
+  <key name="ip_address" datatype="ipaddr-or-hostname"/>
 
   <key name="http_realm" datatype="str" default="Zope"/>
 
@@ -196,6 +196,6 @@
 
   <multisection type="database" name="*" attribute="databases"/>
 
-  <!-- schema begins  -->
+  <!-- schema ends  -->
 
 </schema>