[Checkins] SVN: zope.app.principalannotation/trunk/ Make boostrap subscriber called on IDatabaseOpenedWithRootEvent instead of IDatabaseOpenedEvent. Use zope.site instead of zope.app.component.

[Dan Korostelev]

Log message for revision 97527:
  Make boostrap subscriber called on IDatabaseOpenedWithRootEvent instead of IDatabaseOpenedEvent. Use zope.site instead of zope.app.component.
  
  TODO: this package should be renamed to plain zope.principalannotation, but we need to get zope.appsetup first.
  

Changed:
  U   zope.app.principalannotation/trunk/CHANGES.txt
  U   zope.app.principalannotation/trunk/setup.py
  U   zope.app.principalannotation/trunk/src/zope/app/principalannotation/__init__.py
  U   zope.app.principalannotation/trunk/src/zope/app/principalannotation/bootstrap.py
  U   zope.app.principalannotation/trunk/src/zope/app/principalannotation/bootstrap.zcml

-=-
Modified: zope.app.principalannotation/trunk/CHANGES.txt
===================================================================
--- zope.app.principalannotation/trunk/CHANGES.txt	2009-03-05 12:03:32 UTC (rev 97526)
+++ zope.app.principalannotation/trunk/CHANGES.txt	2009-03-05 12:21:09 UTC (rev 97527)
@@ -5,8 +5,12 @@
 3.5.1 (unreleased)
 ------------------
 
-- ...
+- Make boostrap subscriber called on IDatabaseOpenedWithRootEvent
+  instead of IDatabaseOpenedEvent, because this can cause bug if
+  subscriber will be called before root object is created.
 
+- Use zope.site instead of zope.app.component.
+
 3.5.0 (2009-02-01)
 ------------------
 

Modified: zope.app.principalannotation/trunk/setup.py
===================================================================
--- zope.app.principalannotation/trunk/setup.py	2009-03-05 12:03:32 UTC (rev 97526)
+++ zope.app.principalannotation/trunk/setup.py	2009-03-05 12:21:09 UTC (rev 97527)
@@ -51,11 +51,12 @@
       install_requires=['setuptools',
                         'zope.annotation',
                         'zope.app.appsetup',
-                        'zope.app.component',
+                        'zope.component',
                         'zope.container',
                         'zope.interface',
                         'zope.location',
                         'zope.security',
+                        'zope.site',
                         'ZODB3',
                         ],
       include_package_data = True,

Modified: zope.app.principalannotation/trunk/src/zope/app/principalannotation/__init__.py
===================================================================
--- zope.app.principalannotation/trunk/src/zope/app/principalannotation/__init__.py	2009-03-05 12:03:32 UTC (rev 97526)
+++ zope.app.principalannotation/trunk/src/zope/app/principalannotation/__init__.py	2009-03-05 12:21:09 UTC (rev 97527)
@@ -24,12 +24,12 @@
 from BTrees.OOBTree import OOBTree
 import zope.security.interfaces
 from zope import interface, component
+from zope.annotation.interfaces import IAnnotations
+from zope.container.contained import Contained
 from zope.location import Location
-from zope.annotation.interfaces import IAnnotations
+from zope.site.next import queryNextUtility
 
-from zope.container.contained import Contained
 from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
-from zope.app.component import queryNextUtility
 
 class PrincipalAnnotationUtility(Persistent, Contained):
     """Stores `IAnnotations` for `IPrinicipals`.

Modified: zope.app.principalannotation/trunk/src/zope/app/principalannotation/bootstrap.py
===================================================================
--- zope.app.principalannotation/trunk/src/zope/app/principalannotation/bootstrap.py	2009-03-05 12:03:32 UTC (rev 97526)
+++ zope.app.principalannotation/trunk/src/zope/app/principalannotation/bootstrap.py	2009-03-05 12:21:09 UTC (rev 97527)
@@ -13,7 +13,7 @@
 ##############################################################################
 """Bootstrap code for principal annotation utility.
 
-$Id: bootstrap.py 28023 2004-10-12 18:11:29Z anguenot $
+$Id$
 """
 
 import transaction
@@ -24,7 +24,7 @@
 from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
 
 def bootStrapSubscriber(event):
-    """Subscriber to the IDataBaseOpenedEvent
+    """Subscriber to the IDatabaseOpenedWithRootEvent
 
     Create utility at that time if not yet present
     """

Modified: zope.app.principalannotation/trunk/src/zope/app/principalannotation/bootstrap.zcml
===================================================================
--- zope.app.principalannotation/trunk/src/zope/app/principalannotation/bootstrap.zcml	2009-03-05 12:03:32 UTC (rev 97526)
+++ zope.app.principalannotation/trunk/src/zope/app/principalannotation/bootstrap.zcml	2009-03-05 12:21:09 UTC (rev 97527)
@@ -4,7 +4,7 @@
     >
 
   <subscriber
-      for="zope.app.appsetup.IDatabaseOpenedEvent"
+      for="zope.app.appsetup.interfaces.IDatabaseOpenedWithRootEvent"
       handler=".bootstrap.bootStrapSubscriber"
       />