[Zope-CVS] CVS: Products/Ape - component.xml:1.4 datatypes.py:1.2
Shane Hathaway
shane at zope.com
Thu Feb 19 12:06:53 EST 2004
Update of /cvs-repository/Products/Ape
In directory cvs.zope.org:/tmp/cvs-serv7370
Modified Files:
component.xml datatypes.py
Log Message:
Updated the Ape ZConfig schema.
Ape now functions as the root database for Zope 2.7 with no new patches.
=== Products/Ape/component.xml 1.3 => 1.4 ===
--- Products/Ape/component.xml:1.3 Tue Oct 14 10:35:55 2003
+++ Products/Ape/component.xml Thu Feb 19 12:06:53 2004
@@ -49,9 +49,9 @@
The base filesystem path for the storage.
</description>
</key>
- <key name="metadata-prefix" default=".">
+ <key name="annotation-prefix" default=".">
<description>
- The prefix to use for all metadata files.
+ The prefix to use for annotation files.
</description>
</key>
<key name="hidden-filenames" default="_">
@@ -59,7 +59,7 @@
A regular expression that determines which filenames should be
hidden from the object system. The default is '_', meaning
that filenames starting with an underscore do not appear in
- the object system. This filter is in addition to the metadata
+ the object system. This filter is in addition to the annotation
filename filtering.
</description>
</key>
=== Products/Ape/datatypes.py 1.1 => 1.2 ===
--- Products/Ape/datatypes.py:1.1 Sat Aug 2 13:18:56 2003
+++ Products/Ape/datatypes.py Thu Feb 19 12:06:53 2004
@@ -18,7 +18,7 @@
from ZODB.config import BaseConfig
from Zope.Startup.datatypes import ZopeDatabase
-from apelib.zope2.mapper import createMapper
+from apelib.zope2.mapper import loadConf
from apelib.zodb3 import storage, db, resource
@@ -29,9 +29,10 @@
conns = {}
for c in config.connections:
conns[c.name] = c.open()
- mapper = createMapper(config.mapper_variation, search_products=1)
- r = resource.StaticResource(mapper)
- return storage.ApeStorage(r, conns, name=self.name)
+ conf = loadConf(config.mapper_variation, search_products=1)
+ r = resource.StaticResource(conf)
+ return storage.ApeStorage(
+ conf_resource=r, connections=conns, name=self.name)
class Database(ZopeDatabase):
@@ -39,8 +40,8 @@
def createDB(self):
config = self.config
if config.mapper_variation:
- mapper = createMapper(config.mapper_variation, search_products=1)
- r = resource.StaticResource(mapper)
+ conf = loadConf(config.mapper_variation, search_products=1)
+ r = resource.StaticResource(conf)
else:
r = None
s = config.storage.open()
@@ -49,7 +50,7 @@
'version_pool_size', 'version_cache_size'):
if hasattr(config, name):
kw[name] = getattr(config, name)
- d = db.ApeDB(s, r, **kw)
+ d = db.ApeDB(storage=s, conf_resource=r, **kw)
return d
More information about the Zope-CVS
mailing list