[Zope-Checkins] SVN: Zope/branches/2.9/ Merge r80451 from trunk

[Wichert Akkerman]

Log message for revision 80453:
  Merge r80451 from trunk

Changed:
  U   Zope/branches/2.9/doc/CHANGES.txt
  U   Zope/branches/2.9/lib/python/Zope2/Startup/zopeschema.xml

-=-
Modified: Zope/branches/2.9/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.9/doc/CHANGES.txt	2007-10-01 20:05:49 UTC (rev 80452)
+++ Zope/branches/2.9/doc/CHANGES.txt	2007-10-01 20:12:35 UTC (rev 80453)
@@ -8,6 +8,9 @@
 
    Bugs fixed
 
+      - Launchpad #147201: treat container-class in zope.conf as a string,
+        making it possible to use types from extra products directories.
+
       - Collector #2287: form ':record' objects did not implement enough
         of the mapping protocol.
 

Modified: Zope/branches/2.9/lib/python/Zope2/Startup/zopeschema.xml
===================================================================
--- Zope/branches/2.9/lib/python/Zope2/Startup/zopeschema.xml	2007-10-01 20:05:49 UTC (rev 80452)
+++ Zope/branches/2.9/lib/python/Zope2/Startup/zopeschema.xml	2007-10-01 20:12:35 UTC (rev 80453)
@@ -236,7 +236,7 @@
       </description>
     </key>
 
-    <key name="container-class" datatype=".python_dotted_path">
+    <key name="container-class" datatype="string">
       <description>
        Change the contiainer class a (mounted) database uses on a
        per-database basis to support a different container than a plain