[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup - zopeschema.xml:1.2.2.1

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope/lib/python/Zope/Startup
In directory cvs.zope.org:/tmp/cvs-serv18288

Modified Files:
      Tag: new-install-branch
	zopeschema.xml 
Log Message:
Update to use types from the ZODB 3.2 schema component.


=== Zope/lib/python/Zope/Startup/zopeschema.xml 1.2 => 1.2.2.1 ===
--- Zope/lib/python/Zope/Startup/zopeschema.xml:1.2	Wed Jan 29 15:25:15 2003
+++ Zope/lib/python/Zope/Startup/zopeschema.xml	Thu Jan 30 14:37:55 2003
@@ -3,6 +3,7 @@
   <!-- type definitions -->
 
   <import package="zLOG"/>
+  <import package="ZODB"/>
 
 
   <abstracttype name="server"/>
@@ -57,54 +58,6 @@
                   required="yes"/>
   </sectiontype>
 
-  <!-- the types that follow will be replaced by an import from the
-       ZODB package -->
-  <abstracttype name="storage"/>
-
-  <sectiontype name="filestorage" datatype=".filestorage"
-               implements="storage">
-    <key name="path" required="yes"/>
-    <key name="create" datatype="boolean"/>
-    <key name="read-only" datatype="boolean"/>
-    <key name="stop"/>
-    <key name="quota" datatype="byte-size"/>
-  </sectiontype>
-
-  <sectiontype name="mappingstorage" datatype=".mappingstorage"
-               implements="storage">
-    <key name="name" default="Mapping Storage"/>
-  </sectiontype>
-
-  <sectiontype name="clientstorage" datatype=".clientstorage"
-               implements="storage">
-    <key name="addr" datatype="inet-address" required="yes"/>
-    <key name="storage" default="1"/>
-    <key name="cache-size" datatype="byte-size" default="20MB"/>
-    <key name="name" default=""/>
-    <key name="client"/>
-    <key name="debug" datatype="boolean"/>
-    <key name="var" datatype="existing-directory"/>
-    <key name="min-disconnect-poll" datatype="time-interval" default="5S"/>
-    <key name="max-disconnect-poll" datatype="time-interval" default="300S"/>
-    <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="zodb" datatype=".database">
-    <multisection type="storage" name="*" attribute="storages"/>
-    <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="time-interval" default="60S"/>
-    <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="time-interval"
-         default="10S"/>
-  </sectiontype>
 
   <!-- end of type definitions -->
 
@@ -225,7 +178,7 @@
 
   <multisection type="server" name="*" attribute="servers"/>
 
-  <multisection type="zodb" name="*" attribute="databases"/>
+  <multisection type="database" name="*" attribute="databases"/>
 
   <!-- schema ends  -->