[Zope-CVS] CVS: Products/AdaptableStorage - Zope2FS.py:1.10

Shane Hathaway shane@zope.com
Mon, 9 Dec 2002 17:11:37 -0500


Update of /cvs-repository/Products/AdaptableStorage
In directory cvs.zope.org:/tmp/cvs-serv31255

Modified Files:
	Zope2FS.py 
Log Message:
Successfully created a CMF site on the filesystem (yehaw!)
This involved some minor fixes:

- cPickle doesn't like anything but strings as persistent IDs.  Fixed by
  encoding (aspect_name, name) as a string.

- The "isPrincipiaFolderish" test isn't thorough enough; we really need to
  know whether the objectItems() method exists.  Switched to testing for
  the ObjectManager base class.  (In Zope 3 this will be an interface check.)

- Added a workaround for the tricky skins tool.

- New unit test for remainder pickling.

- Better integration with DBTab.


=== Products/AdaptableStorage/Zope2FS.py 1.9 => 1.10 ===
--- Products/AdaptableStorage/Zope2FS.py:1.9	Mon Dec  9 15:27:08 2002
+++ Products/AdaptableStorage/Zope2FS.py	Mon Dec  9 17:11:07 2002
@@ -114,6 +114,7 @@
     classifier.registerDefaultStorage('(folderish object)', 'anyfolder', 1)
     classifier.registerDefaultStorage('(fileish object)', 'anyfile', 0)
     classifier.registerKey('Application', 'OFS.Application.Application', '/')
+    classifier.register('CMF Skins Tool', 'anyfile')  # XXX workaround
     keychain_gen = PathKeychainGenerator()
     rm = ObjectMapper(
         None, root_serializer, root_gateway, classifier, keychain_gen)
@@ -130,7 +131,7 @@
 from zodb.public import ASConnection, ASStorage, ASDB, StaticResource
 
 
-class FSStorage (ASStorage):
+class Zope2FSStorage (ASStorage):
 
     def __init__(self, basepath, volatile=0, **kw):
         dm, fs_conn = createMapper(basepath, int(volatile))
@@ -138,7 +139,8 @@
         ASStorage.__init__(self, res, [fs_conn], **kw)
 
 
-class FSDatabase (ASDB):
+class Zope2FSDatabase (ASDB):
 
     def __init__(self, storage, **kw):
         ASDB.__init__(self, storage, storage._mapper_resource, **kw)
+