Moved ZApplication from ZODB to the App package.

lib/python/App/RefreshFuncs.py

@@ -326,7 +326,7 @@ def autoRefresh(jar):
 
 def setupAutoRefresh(jar):
     # Install hook.
-    from ZODB.ZApplication import connection_open_hooks
+    from App.ZApplication import connection_open_hooks
     connection_open_hooks.append(autoRefresh)
     # Init mod times.
     checkAutoRefresh(jar)

lib/python/App/ZApplication.py

+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE
+#
+##############################################################################
+"""Implement an bobo_application object that is BoboPOS3 aware
+
+This module provides a wrapper that causes a database connection to be created
+and used when bobo publishes a bobo_application object.
+"""
+
+import transaction
+
+connection_open_hooks = []
+
+class ZApplicationWrapper:
+
+    def __init__(self, db, name, klass= None, klass_args= (),
+                 version_cookie_name=None):
+        self._stuff = db, name, version_cookie_name
+        if klass is not None:
+            conn=db.open()
+            root=conn.root()
+            if not root.has_key(name):
+                root[name]=klass()
+                transaction.commit()
+            conn.close()
+            self._klass=klass
+
+
+    # This hack is to overcome a bug in Bobo!
+    def __getattr__(self, name):
+        return getattr(self._klass, name)
+
+    def __bobo_traverse__(self, REQUEST=None, name=None):
+        db, aname, version_support = self._stuff
+        if version_support is not None and REQUEST is not None:
+            version=REQUEST.get(version_support,'')
+        else: version=''
+        conn=db.open(version)
+
+        if connection_open_hooks:
+            for hook in connection_open_hooks:
+                hook(conn)
+
+        # arrange for the connection to be closed when the request goes away
+        cleanup = Cleanup(conn)
+        REQUEST._hold(cleanup)
+
+        conn.setDebugInfo(REQUEST.environ, REQUEST.other)
+
+        v=conn.root()[aname]
+
+        if name is not None:
+            if hasattr(v, '__bobo_traverse__'):
+                return v.__bobo_traverse__(REQUEST, name)
+
+            if hasattr(v,name): return getattr(v,name)
+            return v[name]
+
+        return v
+
+
+    def __call__(self, connection=None):
+        db, aname, version_support = self._stuff
+
+        if connection is None:
+            connection=db.open()
+        elif isinstance(connection, basestring):
+            connection=db.open(connection)
+
+        return connection.root()[aname]
+
+
+class Cleanup:
+    def __init__(self, jar):
+        self._jar = jar
+
+    def __del__(self):
+        self._jar.close()

lib/python/OFS/tests/testAppInitializer.py

@@ -51,7 +51,7 @@ def getSchema():
     return ZConfig.loadSchema(schemafile)
 
 def getApp():
-    from ZODB.ZApplication import ZApplicationWrapper
+    from App.ZApplication import ZApplicationWrapper
     DB = getConfiguration().dbtab.getDatabase('/')
     return ZApplicationWrapper(DB, 'Application', Application, (), 'foo')()
 

lib/python/OFS/tests/testProductInit.py

@@ -62,7 +62,7 @@ def getSchema():
     return ZConfig.loadSchema(schemafile)
 
 def getApp():
-    from ZODB.ZApplication import ZApplicationWrapper
+    from App.ZApplication import ZApplicationWrapper
     DB = getConfiguration().dbtab.getDatabase('/')
     return ZApplicationWrapper(DB, 'Application', Application, (), 'foo')()
 

lib/python/Testing/ZopeTestCase/sandbox.py

@@ -70,8 +70,9 @@ def __bobo_traverse__(self, REQUEST=None, name=None):
     return self.__old_bobo_traverse__(REQUEST, name)
 
 
-from ZODB.ZApplication import ZApplicationWrapper
+from App.ZApplication import ZApplicationWrapper
 if not hasattr(ZApplicationWrapper, '__old_bobo_traverse__'):
-    ZApplicationWrapper.__old_bobo_traverse__ = ZApplicationWrapper.__bobo_traverse__
+    ZApplicationWrapper.__old_bobo_traverse__ = (
+        ZApplicationWrapper.__bobo_traverse__)
     ZApplicationWrapper.__bobo_traverse__ = __bobo_traverse__