[Zodb-checkins] CVS: ZODB3/ZODB - component.xml:1.10.4.1 config.py:1.13.2.1

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv12146/ZODB

Modified Files:
      Tag: ZODB3-3_2-branch
	component.xml config.py 
Log Message:
Update ZConfig to make the current BerkeleyConfig object.


=== ZODB3/ZODB/component.xml 1.10 => 1.10.4.1 ===
--- ZODB3/ZODB/component.xml:1.10	Mon Jun  2 01:56:42 2003
+++ ZODB3/ZODB/component.xml	Wed Sep 10 12:33:13 2003
@@ -47,7 +47,7 @@
     -->
   <sectiontype name="fullstorage" datatype=".BDBFullStorage"
                implements="ZODB.storage">
-    <key name="name" required="yes" />
+    <key name="envdir" required="yes" />
     <key name="interval" datatype="time-interval" default="2m" />
     <key name="kbyte" datatype="integer" default="0" />
     <key name="min" datatype="integer" default="0" />
@@ -55,7 +55,7 @@
     <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="gcpack" datatype="integer" default="0" />
     <key name="read-only" datatype="boolean" default="off"/>
   </sectiontype>
 


=== ZODB3/ZODB/config.py 1.13 => 1.13.2.1 ===
--- ZODB3/ZODB/config.py:1.13	Mon Jun 16 10:51:49 2003
+++ ZODB3/ZODB/config.py	Wed Sep 10 12:33:13 2003
@@ -157,7 +157,7 @@
             if name.startswith('_'):
                 continue
             setattr(bconf, name, getattr(self.config, name))
-        return storageclass(self.config.name, config=bconf)
+        return storageclass(self.config.envdir, config=bconf)
 
 class BDBMinimalStorage(BDBStorage):