[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup - datatypes.py:1.6.2.3 zopeschema.xml:1.7.2.4

[Shane Hathaway]

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

Modified Files:
      Tag: Zope-2_7-branch
	datatypes.py zopeschema.xml 
Log Message:
Merged database configuration tweaks from head.


=== Zope/lib/python/Zope/Startup/datatypes.py 1.6.2.2 => 1.6.2.3 ===
--- Zope/lib/python/Zope/Startup/datatypes.py:1.6.2.2	Mon Jul 21 12:37:47 2003
+++ Zope/lib/python/Zope/Startup/datatypes.py	Sat Aug  2 13:02:21 2003
@@ -158,10 +158,15 @@
 
     container_class = 'OFS.Folder.Folder'
 
+    def createDB(self):
+        return ZODBDatabase.open(self)
+
     def open(self):
-        DB = ZODBDatabase.open(self)
-        # set the connection class
-        DB.klass = self.config.connection_class
+        DB = self.createDB()
+        if self.config.connection_class:
+            # set the connection class
+            DB.klass = self.config.connection_class
+            print DB, DB.klass
         if self.config.class_factory is not None:
             DB.setClassFactory(self.config.class_factory)
         from ZODB.ActivityMonitor import ActivityMonitor


=== Zope/lib/python/Zope/Startup/zopeschema.xml 1.7.2.3 => 1.7.2.4 ===
--- Zope/lib/python/Zope/Startup/zopeschema.xml:1.7.2.3	Thu Jul 24 16:29:22 2003
+++ Zope/lib/python/Zope/Startup/zopeschema.xml	Sat Aug  2 13:02:21 2003
@@ -153,8 +153,7 @@
       </description>
     </multikey>
 
-    <key name="connection-class" datatype=".importable_name"
-              default="ZODB.Connection.Connection">
+    <key name="connection-class" datatype=".importable_name">
       <description>
        Change the connection class a database uses on a per-database basis to
        support different connection policies.  Use a Python dotted-path
@@ -162,7 +161,8 @@
       </description>
     </key>
 
-   <key name="class-factory" datatype=".importable_name">
+   <key name="class-factory" datatype=".importable_name"
+        default="DBTab.ClassFactories.autoClassFactory">
       <description>
        Change the class factory function a database uses on a
        per-database basis to support different class factory policy.
@@ -611,7 +611,7 @@
     </description>
   </key>
 
-  <multisection type="zodb_db" name="+" attribute="databases">
+  <multisection type="ZODB.Database" name="+" attribute="databases">
     <description>
        Zope ZODB databases must have a name, and they are required to be
        referenced via the "zodb_db" database type because it is