[Zope-Checkins] CVS: Zope/lib/python/ZODB - config.py:1.1.4.7 config.xml:1.1.4.8
Fred L. Drake, Jr.
fred@zope.com
Thu, 9 Jan 2003 15:04:53 -0500
Update of /cvs-repository/Zope/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv9702/ZODB
Modified Files:
Tag: zconfig-schema-devel-branch
config.py config.xml
Log Message:
Update to use the latest version of the ZConfig schema language
and datatypes.
=== Zope/lib/python/ZODB/config.py 1.1.4.6 => 1.1.4.7 ===
--- Zope/lib/python/ZODB/config.py:1.1.4.6 Fri Jan 3 14:21:49 2003
+++ Zope/lib/python/ZODB/config.py Thu Jan 9 15:04:19 2003
@@ -79,7 +79,7 @@
from ZEO.ClientStorage import ClientStorage
# config.server is a multikey of socket-address values
# where the value is a socket family, address tuple.
- L = [addr for family, addr in self.config.server]
+ L = [addr.address for addr in self.config.server]
return ClientStorage(
L,
storage=self.config.storage,
=== Zope/lib/python/ZODB/config.xml 1.1.4.7 => 1.1.4.8 ===
--- Zope/lib/python/ZODB/config.xml:1.1.4.7 Fri Jan 3 14:21:49 2003
+++ Zope/lib/python/ZODB/config.xml Thu Jan 9 15:04:19 2003
@@ -1,69 +1,74 @@
-<schema type="database">
+<schema type="database" prefix="ZODB.config">
- <sectiongroup type="storage">
+ <abstracttype name="storage"/>
- <sectiontype type="filestorage" datatype="ZODB.config.FileStorage">
- <key name="path" required="yes"/>
- <key name="create" datatype="boolean" default="true"/>
- <key name="read_only" datatype="boolean" default="false"/>
- <key name="stop"/>
- <key name="quota" datatype="integer"/>
- </sectiontype>
-
- <sectiontype type="mappingstorage" datatype="ZODB.config.MappingStorage">
- <key name="name" default="Mapping Storage"/>
- </sectiontype>
-
- <sectiontype type="fullstorage" datatype="ZODB.config.BDBStorage">
- <key name="name" required="yes" />
- <key name="interval" datatype="time-interval" default="2m" />
- <key name="kbyte" datatype="integer" default="0" />
- <key name="min" datatype="integer" default="0" />
- <key name="logdir" />
- <key name="cachesize" datatype="byte-size" default="128MB" />
- <key name="frequency" datatype="time-interval" default="0" />
- <key name="packtime" datatype="time-interval" default="4h" />
- <key name="classicpack" datatype="integer" default="0" />
- <key name="read_only" datatype="boolean" default="off"/>
- </sectiontype>
-
- <!-- XXX Fred promises to make it so minimal storage is just an
- extension of fullstorage -->
- <sectiontype type="minimalstorage" datatype="ZODB.config.BDBStorage">
- <key name="name" required="yes" />
- <key name="interval" datatype="time-interval" default="2m" />
- <key name="kbyte" datatype="integer" default="0" />
- <key name="min" datatype="integer" default="0" />
- <key name="logdir" />
- <key name="cachesize" datatype="byte-size" default="128MB" />
- <key name="frequency" datatype="time-interval" default="0" />
- <key name="packtime" datatype="time-interval" default="4h" />
- <key name="classicpack" datatype="integer" default="0" />
- <key name="read_only" datatype="boolean" default="off"/>
- </sectiontype>
-
- <sectiontype type="zeoclient" datatype="ZODB.config.ZEOClient">
- <multikey name="server" datatype="socket-address" required="yes"/>
- <key name="storage" default="1"/>
- <key name="cache_size" datatype="integer" default="20000000"/>
- <key name="name" default=""/>
- <key name="client"/>
- <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 type="demostorage">
- <!--datatype="ZODB.config.DemoStorage"-->
- <key name="name" default="Demo Storage"/>
- <section type="storage" name="*" attribute="base"/>
- <key name="quota" datatype="integer"/>
- </sectiontype>
+ <sectiontype name="filestorage" datatype=".FileStorage"
+ implements="storage">
+ <key name="path" required="yes"/>
+ <key name="create" datatype="boolean" default="true"/>
+ <key name="read_only" datatype="boolean" default="false"/>
+ <key name="stop"/>
+ <key name="quota" datatype="integer"/>
+ </sectiontype>
+
+ <sectiontype name="mappingstorage" datatype="ZODB.config.MappingStorage"
+ implements="storage">
+ <key name="name" default="Mapping Storage"/>
+ </sectiontype>
+
+ <sectiontype name="fullstorage" datatype=".BDBStorage"
+ implements="storage">
+ <key name="name" required="yes" />
+ <key name="interval" datatype="time-interval" default="2m" />
+ <key name="kbyte" datatype="integer" default="0" />
+ <key name="min" datatype="integer" default="0" />
+ <key name="logdir" />
+ <key name="cachesize" datatype="byte-size" default="128MB" />
+ <key name="frequency" datatype="time-interval" default="0" />
+ <key name="packtime" datatype="time-interval" default="4h" />
+ <key name="classicpack" datatype="integer" default="0" />
+ <key name="read_only" datatype="boolean" default="off"/>
+ </sectiontype>
+
+ <!-- XXX Fred promises to make it so minimal storage is just an
+ extension of fullstorage -->
+ <sectiontype name="minimalstorage" datatype=".BDBStorage"
+ implements="storage">
+ <key name="name" required="yes" />
+ <key name="interval" datatype="time-interval" default="2m" />
+ <key name="kbyte" datatype="integer" default="0" />
+ <key name="min" datatype="integer" default="0" />
+ <key name="logdir" />
+ <key name="cachesize" datatype="byte-size" default="128MB" />
+ <key name="frequency" datatype="time-interval" default="0" />
+ <key name="packtime" datatype="time-interval" default="4h" />
+ <key name="classicpack" datatype="integer" default="0" />
+ <key name="read_only" datatype="boolean" default="off"/>
+ </sectiontype>
+
+ <sectiontype name="zeoclient" datatype=".ZEOClient"
+ implements="storage">
+ <multikey name="server" datatype="socket-address" required="yes"/>
+ <key name="storage" default="1"/>
+ <key name="cache_size" datatype="integer" default="20000000"/>
+ <key name="name" default=""/>
+ <key name="client"/>
+ <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="demostorage"
+ implements="storage">
+ <!--datatype="ZODB.config.DemoStorage"-->
+ <key name="name" default="Demo Storage"/>
+ <section type="storage" name="*" attribute="base"/>
+ <key name="quota" datatype="integer"/>
+ </sectiontype>
- </sectiongroup>
<!-- the rest is the actual configuration for the database -->
<section type="storage" name="*" attribute="storage"/>