[Zope-Checkins] CVS: Zope/lib/python/Zope - __init__.py:1.30

[Shane Hathaway]

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

Modified Files:
	__init__.py 
Log Message:
Merged shane-activity-monitoring-branch.


=== Zope/lib/python/Zope/__init__.py 1.29 => 1.30 ===
     sys.modules['Zope.custom_zodb']=m
 
+if DB.getActivityMonitor() is None:
+    from ZODB.ActivityMonitor import ActivityMonitor
+    DB.setActivityMonitor(ActivityMonitor())
+
 Globals.DB=DB # Ick, this is temporary until we come up with some registry
 
 # Hook for providing multiple transaction object manager undo support: