[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/app/ Fix up zope.app after moving zope.app.annotation to zope.annotation.

Philipp von Weitershausen philikon at philikon.de
Thu Apr 6 14:53:43 EDT 2006


Log message for revision 66602:
  Fix up zope.app after moving zope.app.annotation to zope.annotation.
  

Changed:
  U   Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/README.txt
  U   Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/introspector.py
  U   Zope3/branches/jim-adapter/src/zope/app/authentication/groupfolder.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/broken/broken.py
  U   Zope3/branches/jim-adapter/src/zope/app/broken/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/cache/annotationcacheable.py
  U   Zope3/branches/jim-adapter/src/zope/app/cache/browser/cacheable.py
  U   Zope3/branches/jim-adapter/src/zope/app/cache/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/cache/tests/test_annotationcacheable.py
  U   Zope3/branches/jim-adapter/src/zope/app/cache/tests/test_caching.py
  U   Zope3/branches/jim-adapter/src/zope/app/catalog/catalog.py
  U   Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/component/contentdirective.py
  U   Zope3/branches/jim-adapter/src/zope/app/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/container/browser/ftests/test_contents.py
  U   Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py
  U   Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py
  U   Zope3/branches/jim-adapter/src/zope/app/copypastemove/tests/test_clipboard.py
  U   Zope3/branches/jim-adapter/src/zope/app/dav/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/dav/ftests/dav.py
  U   Zope3/branches/jim-adapter/src/zope/app/dav/opaquenamespaces.py
  U   Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py
  U   Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py
  U   Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_proppatch.py
  U   Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py
  U   Zope3/branches/jim-adapter/src/zope/app/demo/hellopackage/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/demo/jobboard/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/demo/widget/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/dependable/__init__.py
  U   Zope3/branches/jim-adapter/src/zope/app/dependable/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/dependable/tests.py
  U   Zope3/branches/jim-adapter/src/zope/app/dtmlpage/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/dtmlpage/dtmlpage.py
  U   Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py
  U   Zope3/branches/jim-adapter/src/zope/app/dublincore/browser/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/dublincore/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/dublincore/interfaces.py
  U   Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/partial.txt
  U   Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_partialannotatable.py
  U   Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_zdcannotatableadapter.py
  U   Zope3/branches/jim-adapter/src/zope/app/event/objectevent.py
  U   Zope3/branches/jim-adapter/src/zope/app/event/tests/test_objectevent.py
  U   Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/folder/interfaces.py
  U   Zope3/branches/jim-adapter/src/zope/app/form/browser/widgets.txt
  U   Zope3/branches/jim-adapter/src/zope/app/fssync/syncer.py
  U   Zope3/branches/jim-adapter/src/zope/app/homefolder/tests.py
  U   Zope3/branches/jim-adapter/src/zope/app/i18n/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/i18n/tests/test_translationdomain.py
  U   Zope3/branches/jim-adapter/src/zope/app/i18nfile/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/intid/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/principalannotation/__init__.py
  U   Zope3/branches/jim-adapter/src/zope/app/principalannotation/tests.py
  U   Zope3/branches/jim-adapter/src/zope/app/publisher/browser/tests/test_browserlanguages.py
  U   Zope3/branches/jim-adapter/src/zope/app/pythonpage/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/schemacontent/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/schemacontent/tests/test_content.py
  U   Zope3/branches/jim-adapter/src/zope/app/securitypolicy/browser/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/securitypolicy/browser/granting.txt
  U   Zope3/branches/jim-adapter/src/zope/app/securitypolicy/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/securitypolicy/grantinfo.py
  U   Zope3/branches/jim-adapter/src/zope/app/securitypolicy/securitymap.py
  U   Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
  U   Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py
  U   Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py
  U   Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_zopepolicy.py
  U   Zope3/branches/jim-adapter/src/zope/app/securitypolicy/zopepolicy.txt
  U   Zope3/branches/jim-adapter/src/zope/app/session/http.py
  U   Zope3/branches/jim-adapter/src/zope/app/session/session.py
  U   Zope3/branches/jim-adapter/src/zope/app/sqlscript/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/sqlscript/tests/test_sqlscript.py
  U   Zope3/branches/jim-adapter/src/zope/app/testing/setup.py
  U   Zope3/branches/jim-adapter/src/zope/app/versioncontrol/README.txt
  U   Zope3/branches/jim-adapter/src/zope/app/versioncontrol/interfaces.py
  U   Zope3/branches/jim-adapter/src/zope/app/versioncontrol/repository.py
  U   Zope3/branches/jim-adapter/src/zope/app/versioncontrol/tests.py
  U   Zope3/branches/jim-adapter/src/zope/app/wfmc/tests.py
  U   Zope3/branches/jim-adapter/src/zope/app/workflow/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/workflow/instance.py
  U   Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/browser/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_contentworkflow.py
  U   Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_instance.py
  U   Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_xmlimportexport.py
  U   Zope3/branches/jim-adapter/src/zope/app/workflow/tests/test_instance.py
  U   Zope3/branches/jim-adapter/src/zope/app/workflow/tests/workflowsetup.py
  U   Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml

-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/README.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/README.txt	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/README.txt	2006-04-06 18:53:27 UTC (rev 66602)
@@ -408,7 +408,7 @@
 This namespace is used to traverse into the annotations of an object.
 
   >>> import zope.interface
-  >>> from zope.app.annotation.interfaces import IAttributeAnnotatable
+  >>> from zope.annotation.interfaces import IAttributeAnnotatable
 
   >>> class Sample(object):
   ...    zope.interface.implements(IAttributeAnnotatable)

Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/introspector.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/introspector.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/introspector.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -22,12 +22,13 @@
 
 import zope.interface
 import zope.security.proxy
+from zope import annotation
 from zope.interface import directlyProvidedBy, directlyProvides
 from zope.traversing.interfaces import IPhysicallyLocatable, IContainmentRoot
 from zope.location import location
 from zope.publisher.browser import BrowserView
 
-from zope.app import zapi, apidoc, annotation
+from zope.app import zapi, apidoc
 
 def getTypeLink(type):
     if type is types.NoneType:

Modified: Zope3/branches/jim-adapter/src/zope/app/authentication/groupfolder.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/authentication/groupfolder.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/authentication/groupfolder.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -13,7 +13,7 @@
           set_schema=".groupfolder.IGroupInformation"
           />
       <implements
-          interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+          interface="zope.annotation.interfaces.IAttributeAnnotatable"
           />
   </class>
 

Modified: Zope3/branches/jim-adapter/src/zope/app/broken/broken.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/broken/broken.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/broken/broken.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -22,9 +22,8 @@
 import zope.location.interfaces
 import zope.security.checker
 
+from zope.annotation.interfaces import IAnnotations
 
-from zope.app.annotation.interfaces import IAnnotations
-
 class IBroken(zope.interface.Interface):
     """Marker interface for broken objects
     """

Modified: Zope3/branches/jim-adapter/src/zope/app/broken/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/broken/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/broken/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -1,7 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
   <class class=".broken.Broken">
-    <allow interface="zope.app.annotation.interfaces.IAnnotations" />
+    <allow interface="zope.annotation.interfaces.IAnnotations" />
     <allow attributes="__module__" />
   </class>
 

Modified: Zope3/branches/jim-adapter/src/zope/app/cache/annotationcacheable.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/cache/annotationcacheable.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/cache/annotationcacheable.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,11 +17,11 @@
 """
 __docformat__ = 'restructuredtext'
 
+import zope.component
 from zope.interface import implements
 from zope.proxy import removeAllProxies
+from zope.annotation.interfaces import IAnnotations
 
-from zope.app import zapi
-from zope.app.annotation.interfaces import IAnnotations
 from zope.app.cache.interfaces import ICacheable, ICache
 
 annotation_key = 'zope.app.cache.CacheManager'
@@ -42,7 +42,7 @@
         # Remove object from old cache
         old_cache_id = self.getCacheId()
         if old_cache_id and old_cache_id != id:
-            cache = zapi.getUtility(ICache, old_cache_id)
+            cache = zope.component.getUtility(ICache, old_cache_id)
             cache.invalidate(self._context)
         annotations = IAnnotations(removeAllProxies(self._context))
         annotations[annotation_key] = id

Modified: Zope3/branches/jim-adapter/src/zope/app/cache/browser/cacheable.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/cache/browser/cacheable.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/cache/browser/cacheable.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -19,11 +19,11 @@
 
 from zope.component import getMultiAdapter
 from zope.publisher.browser import BrowserView
+from zope.annotation.interfaces import IAnnotatable
 
 from zope.app.cache.caching import getCacheForObject, getLocationForCache
 from zope.app.form.utility import setUpEditWidgets
 from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.annotation.interfaces import IAnnotatable
 from zope.app.cache.interfaces import ICacheable
 from zope.app.form.interfaces import WidgetInputError
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile

Modified: Zope3/branches/jim-adapter/src/zope/app/cache/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/cache/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/cache/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -3,7 +3,7 @@
     i18n_domain="zope">
 
   <adapter 
-      for="zope.app.annotation.interfaces.IAnnotatable"
+      for="zope.annotation.interfaces.IAnnotatable"
       provides="zope.app.cache.interfaces.ICacheable"
       factory="zope.app.cache.annotationcacheable.AnnotationCacheable"
       />

Modified: Zope3/branches/jim-adapter/src/zope/app/cache/tests/test_annotationcacheable.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/cache/tests/test_annotationcacheable.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/cache/tests/test_annotationcacheable.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,10 +17,10 @@
 """
 import unittest
 from zope.interface import implements
+from zope.annotation.interfaces import IAnnotations, IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
 
 from zope.app.testing import ztapi, placelesssetup
-from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
-from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.cache.annotationcacheable import AnnotationCacheable
 from zope.app.cache.interfaces import ICache
 

Modified: Zope3/branches/jim-adapter/src/zope/app/cache/tests/test_caching.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/cache/tests/test_caching.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/cache/tests/test_caching.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,10 +17,10 @@
 """
 import unittest
 from zope.interface import implements
+from zope.annotation.interfaces import IAnnotatable, IAnnotations
+from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
 
-from zope.app.annotation.interfaces import IAnnotatable, IAnnotations
-from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.cache.interfaces import ICacheable, ICache
 from zope.app.cache.caching import getCacheForObject
 from zope.app.cache.annotationcacheable import AnnotationCacheable

Modified: Zope3/branches/jim-adapter/src/zope/app/catalog/catalog.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/catalog/catalog.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/catalog/catalog.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -15,13 +15,13 @@
 
 $Id$
 """
+import zope.index.interfaces
 from zope.interface import implements
-from zope.app.container.btree import BTreeContainer
-import zope.index.interfaces
+from zope.annotation.interfaces import IAttributeAnnotatable
 
 from zope.app import zapi
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.container.interfaces import IContainer
+from zope.app.container.btree import BTreeContainer
 from zope.app.catalog.interfaces import ICatalog
 from zope.app.intid.interfaces import IIntIds
 from BTrees.IFBTree import weightedIntersection

Modified: Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/component/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -10,7 +10,7 @@
         id="zope.app.component.RegistrationManager"
         title="Registration Manager" />
     <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+        interface="zope.annotation.interfaces.IAttributeAnnotatable"
         />
     <require
         permission="zope.ManageSite"
@@ -55,7 +55,7 @@
 
   <class class=".site.LocalSiteManager">
     <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+        interface="zope.annotation.interfaces.IAttributeAnnotatable" />
     <require
         permission="zope.ManageSite"
         interface="zope.app.container.interfaces.IReadContainer" />
@@ -76,7 +76,7 @@
   <class class=".site.SiteManagementFolder">
     <factory />
     <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+        interface="zope.annotation.interfaces.IAttributeAnnotatable"
         />
     <require
         permission="zope.ManageSite"

Modified: Zope3/branches/jim-adapter/src/zope/app/component/contentdirective.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/contentdirective.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/component/contentdirective.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -26,8 +26,8 @@
 from zope.schema.interfaces import IField
 from zope.configuration.exceptions import ConfigurationError
 from zope.location.interfaces import ILocation
+from zope.annotation.interfaces import IAttributeAnnotatable
 
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.component.interface import provideInterface
 from zope.app.component.interfaces import ILocalUtility
 from zope.app.security.protectclass import protectLikeUnto, protectName

Modified: Zope3/branches/jim-adapter/src/zope/app/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -18,7 +18,7 @@
   <include package="zope.app.interface" />
   <include package="zope.app.security" />
   <include package="zope.app.event" />
-  <include package="zope.app.annotation" />
+  <include package="zope.annotation" />
   <include package="zope.app.dependable" />
   <include package="zope.app.content" />
 

Modified: Zope3/branches/jim-adapter/src/zope/app/container/browser/ftests/test_contents.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/browser/ftests/test_contents.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/container/browser/ftests/test_contents.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -21,9 +21,9 @@
 from persistent import Persistent
 import transaction
 from zope.interface import implements, Interface
+from zope.annotation.interfaces import IAttributeAnnotatable
 
 from zope.app import copypastemove
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.container.interfaces import IReadContainer, IContained
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.testing import ztapi

Modified: Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -20,8 +20,8 @@
 from zope.interface import Interface, implements
 from zope.security import checker
 from zope.traversing.api import traverse
+from zope.annotation.interfaces import IAnnotations
 
-from zope.app.annotation.interfaces import IAnnotations
 from zope.app.component.testing import PlacefulSetup
 from zope.app.container.contained import contained
 from zope.app.copypastemove import ContainerItemRenamer

Modified: Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -24,9 +24,9 @@
 from zope.event import notify
 from zope.location.pickling import locationCopy
 from zope.location.interfaces import ISublocations
+from zope.annotation.interfaces import IAnnotations
+from zope.annotation.interfaces import IAnnotations
 
-from zope.app.annotation.interfaces import IAnnotations
-from zope.app.annotation.interfaces import IAnnotations
 from zope.app.container.sample import SampleContainer
 from zope.app.event.objectevent import ObjectCopiedEvent
 from zope.app.container.interfaces import IContainer, IOrderedContainer

Modified: Zope3/branches/jim-adapter/src/zope/app/copypastemove/tests/test_clipboard.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/copypastemove/tests/test_clipboard.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/copypastemove/tests/test_clipboard.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -15,10 +15,10 @@
 
 $Id$
 """
-import unittest 
+import unittest
+import zope.component
+from zope.annotation.interfaces import IAnnotations
 
-from zope.app import zapi
-from zope.app.annotation.interfaces import IAnnotations
 from zope.app.component.testing import PlacefulSetup
 from zope.app.principalannotation import PrincipalAnnotationUtility
 from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
@@ -27,7 +27,6 @@
 from zope.app.copypastemove.interfaces import IPrincipalClipboard
 from zope.app.copypastemove import PrincipalClipboard
 
-
 class PrincipalStub(object):
 
     def __init__(self, id):
@@ -47,7 +46,7 @@
     def testAddItems(self):
         user = PrincipalStub('srichter')
 
-        annotationutil = zapi.getUtility(IPrincipalAnnotationUtility)
+        annotationutil = zope.component.getUtility(IPrincipalAnnotationUtility)
         annotations = annotationutil.getAnnotations(user)
         clipboard = IPrincipalClipboard(annotations)
         clipboard.addItems('move', ['bla', 'bla/foo', 'bla/bar'])
@@ -63,7 +62,7 @@
     def testSetContents(self):
         user = PrincipalStub('srichter')
 
-        annotationutil = zapi.getUtility(IPrincipalAnnotationUtility)
+        annotationutil = zope.component.getUtility(IPrincipalAnnotationUtility)
         annotations = annotationutil.getAnnotations(user)
         clipboard = IPrincipalClipboard(annotations)
 
@@ -79,7 +78,7 @@
     def testClearContents(self):
         user = PrincipalStub('srichter')
 
-        annotationutil = zapi.getUtility(IPrincipalAnnotationUtility)
+        annotationutil = zope.component.getUtility(IPrincipalAnnotationUtility)
         annotations = annotationutil.getAnnotations(user)
         clipboard = IPrincipalClipboard(annotations)
         clipboard.clearContents()

Modified: Zope3/branches/jim-adapter/src/zope/app/dav/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -121,7 +121,7 @@
   <adapter
       factory=".opaquenamespaces.DAVOpaqueNamespacesAdapter"
       provides=".opaquenamespaces.IDAVOpaqueNamespaces"
-      for="zope.app.annotation.interfaces.IAnnotatable"
+      for="zope.annotation.interfaces.IAnnotatable"
       trusted="true"
       />
       

Modified: Zope3/branches/jim-adapter/src/zope/app/dav/ftests/dav.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/ftests/dav.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/ftests/dav.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -15,13 +15,13 @@
 
 $Id$
 """
+import transaction
 from persistent import Persistent
-import transaction
 from zope.interface import implements
+from zope.annotation.interfaces import IAttributeAnnotatable
+
 from zope.app.testing.functional import HTTPTestCase
-
 from zope.app.folder import Folder
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 
 class Page(Persistent):
     implements(IAttributeAnnotatable)    

Modified: Zope3/branches/jim-adapter/src/zope/app/dav/opaquenamespaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/opaquenamespaces.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/opaquenamespaces.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -26,7 +26,7 @@
 from zope.interface import implements
 from zope.interface.common.mapping import IMapping
 from zope.location import Location
-from zope.app.annotation.interfaces import IAnnotations, IAnnotatable
+from zope.annotation.interfaces import IAnnotations, IAnnotatable
 
 from BTrees.OOBTree import OOBTree
 

Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -24,15 +24,14 @@
 from zope.interface import Interface, implements
 from zope.size.interfaces import ISized
 from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.annotation.interfaces import IAnnotatable, IAttributeAnnotatable
+from zope.annotation.interfaces import IAnnotations
+from zope.annotation.attribute import AttributeAnnotations
 
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import setUp, tearDown
 from zope.app.filerepresentation.interfaces import IReadDirectory
 from zope.app.i18n import ZopeMessageFactory as _
-
-from zope.app.annotation.interfaces import IAnnotatable, IAttributeAnnotatable
-from zope.app.annotation.interfaces import IAnnotations
-from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.dublincore.interfaces import IWriteZopeDublinCore
 from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
 

Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_propfind.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -30,16 +30,15 @@
 from zope.traversing.api import traverse
 from zope.traversing.browser import AbsoluteURL
 from zope.publisher.browser import TestRequest
+from zope.annotation.interfaces import IAnnotatable, IAnnotations
+from zope.annotation.attribute import AttributeAnnotations
 
 from zope.app import zapi
 from zope.app.testing import ztapi
-
 from zope.app.container.interfaces import IReadContainer
 from zope.app.component.testing import PlacefulSetup
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
-from zope.app.annotation.interfaces import IAnnotatable, IAnnotations
-from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.file.interfaces import IFile
 
 from zope.app.dav import propfind

Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_proppatch.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_proppatch.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_proppatch.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -32,6 +32,8 @@
 from zope.pagetemplate.tests.util import normalize_xml
 from zope.traversing.api import traverse
 from zope.traversing.browser import AbsoluteURL
+from zope.annotation.interfaces import IAnnotatable, IAnnotations
+from zope.annotation.attribute import AttributeAnnotations
 
 from zope.app import zapi
 from zope.app.testing import ztapi
@@ -40,8 +42,6 @@
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
 from zope.app.dublincore.zopedublincore import ScalarProperty
-from zope.app.annotation.interfaces import IAnnotatable, IAnnotations
-from zope.app.annotation.attribute import AttributeAnnotations
 
 import zope.app.dav.tests
 from zope.app.dav.tests.unitfixtures import File, Folder, FooZPT

Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -20,11 +20,11 @@
 import zope.location
 from persistent import Persistent
 from zope.interface import implements
+from zope.annotation.interfaces import IAnnotatable
 
 from zope.app.filerepresentation.interfaces import IWriteFile
 from zope.app.filerepresentation.interfaces import IReadDirectory
 from zope.app.container.interfaces import IReadContainer
-from zope.app.annotation.interfaces import IAnnotatable
 from zope.app.file.interfaces import IFile
 
 class Folder(zope.location.Location, Persistent):

Modified: Zope3/branches/jim-adapter/src/zope/app/demo/hellopackage/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/demo/hellopackage/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/demo/hellopackage/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -31,7 +31,7 @@
 -->
 <class class=".hellomodule.HelloClass">
   <implements 
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+      interface="zope.annotation.interfaces.IAttributeAnnotatable"
       />
 
   <!--

Modified: Zope3/branches/jim-adapter/src/zope/app/demo/jobboard/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/demo/jobboard/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/demo/jobboard/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -6,7 +6,7 @@
     >
 
 <class class="zope.app.demo.jobboard.job.JobList">
-  <implements interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+  <implements interface="zope.annotation.interfaces.IAttributeAnnotatable"
   />
   <factory
       id="zope.app.demo.jobboard.job.JobList"

Modified: Zope3/branches/jim-adapter/src/zope/app/demo/widget/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/demo/widget/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/demo/widget/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -7,7 +7,7 @@
   <class class="zope.app.demo.widget.app.DemoWidgetContainer">
 
     <implements 
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+        interface="zope.annotation.interfaces.IAttributeAnnotatable" />
 
     <require permission="zope.View" 
         interface="zope.app.container.interfaces.IReadContainer" />

Modified: Zope3/branches/jim-adapter/src/zope/app/dependable/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dependable/__init__.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dependable/__init__.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -19,9 +19,9 @@
 
 from zope.interface import implements
 from zope.traversing.api import getParent, canonicalPath, getPath
+from zope.annotation.interfaces import IAnnotations
 
 from zope.app.dependable.interfaces import IDependable
-from zope.app.annotation.interfaces import IAnnotations
 
 class PathSetAnnotation(object):
     """Abstract base class for annotations that are sets of paths.

Modified: Zope3/branches/jim-adapter/src/zope/app/dependable/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dependable/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dependable/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -5,6 +5,6 @@
   <adapter
       factory="zope.app.dependable.Dependable"
       provides="zope.app.dependable.interfaces.IDependable"
-      for="zope.app.annotation.interfaces.IAnnotatable" />
+      for="zope.annotation.interfaces.IAnnotatable" />
 
 </configure>
\ No newline at end of file

Modified: Zope3/branches/jim-adapter/src/zope/app/dependable/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dependable/tests.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dependable/tests.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -16,7 +16,7 @@
 $Id$
 """
 from unittest import TestCase, TestSuite, main, makeSuite
-from zope.app.annotation.attribute import AttributeAnnotations
+from zope.annotation.attribute import AttributeAnnotations
 from zope.app.testing.placelesssetup import PlacelessSetup
 
 class C(object):

Modified: Zope3/branches/jim-adapter/src/zope/app/dtmlpage/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dtmlpage/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dtmlpage/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -33,7 +33,7 @@
         />
 
     <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+       interface="zope.annotation.interfaces.IAttributeAnnotatable"
        />
   </class>
 

Modified: Zope3/branches/jim-adapter/src/zope/app/dtmlpage/dtmlpage.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dtmlpage/dtmlpage.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dtmlpage/dtmlpage.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -21,12 +21,12 @@
 
 from zope.documenttemplate.untrusted import UntrustedHTML
 from zope.interface import implements
+from zope.annotation.interfaces import IAnnotatable
 
-from zope.app.annotation.interfaces import IAnnotatable
 from zope.app.filerepresentation.interfaces import IFileFactory
 from zope.app.container.contained import Contained
+from zope.app.publication.interfaces import IFileContent
 
-from zope.app.publication.interfaces import IFileContent
 from interfaces import IDTMLPage, IRenderDTMLPage
 
 class DTMLPage(Persistent, Contained):

Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -20,7 +20,7 @@
 from persistent.dict import PersistentDict
 
 from zope.location import Location
-from zope.app.annotation.interfaces import IAnnotations, IAnnotatable
+from zope.annotation.interfaces import IAnnotations, IAnnotatable
 from zope.app.dublincore.zopedublincore import ZopeDublinCore
 from zope.app.dublincore.zopedublincore import DateProperty, ScalarProperty
 

Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/browser/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/browser/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/browser/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -3,7 +3,7 @@
    xmlns="http://namespaces.zope.org/browser">
 
   <pages
-      for="zope.app.annotation.interfaces.IAnnotatable"
+      for="zope.annotation.interfaces.IAnnotatable"
       permission="zope.app.dublincore.change"
       class=".metadataedit.MetaDataEdit">
 

Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -15,7 +15,7 @@
   <adapter
       factory=".annotatableadapter.ZDCAnnotatableAdapter"
       provides="zope.app.dublincore.interfaces.IWriteZopeDublinCore"
-      for="zope.app.annotation.interfaces.IAnnotatable"
+      for="zope.annotation.interfaces.IAnnotatable"
       trusted="true"
       />
 

Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/interfaces.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/interfaces.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,7 +17,7 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.app.annotation.interfaces import IAnnotatable
+from zope.annotation.interfaces import IAnnotatable
 from zope.interface import Interface
 from zope.schema import Text, TextLine, Datetime, List
 

Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/partial.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/partial.txt	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/partial.txt	2006-04-06 18:53:27 UTC (rev 66602)
@@ -18,13 +18,12 @@
 Dublin Core `title` field::
 
   >>> import zope.interface
+  >>> import zope.annotation.interfaces
 
-  >>> import zope.app.annotation.interfaces
-
   >>> class Content(object):
   ...
   ...     zope.interface.implements(
-  ...         zope.app.annotation.interfaces.IAttributeAnnotatable)
+  ...         zope.annotation.interfaces.IAttributeAnnotatable)
   ...
   ...     title = u""
   ...     description = u""
@@ -96,7 +95,7 @@
   >>> class Content(object):
   ...
   ...     zope.interface.implements(
-  ...         zope.app.annotation.interfaces.IAttributeAnnotatable)
+  ...         zope.annotation.interfaces.IAttributeAnnotatable)
   ...
   ...     abstract = u""
 

Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_partialannotatable.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_partialannotatable.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_partialannotatable.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -4,24 +4,14 @@
 __docformat__ = "reStructuredText"
 
 import zope.testing.doctest
+import zope.component.testing
+from zope.component.testing import tearDown
+from zope.annotation.attribute import AttributeAnnotations
 
-import zope.app.annotation.attribute
-import zope.app.annotation.interfaces
-import zope.app.testing.placelesssetup
-import zope.app.testing.ztapi
-
-
 def setUp(test):
-    zope.app.testing.placelesssetup.setUp(test)
-    zope.app.testing.ztapi.provideAdapter(
-        zope.app.annotation.interfaces.IAttributeAnnotatable,
-        zope.app.annotation.interfaces.IAnnotations,
-        zope.app.annotation.attribute.AttributeAnnotations)
+    zope.component.testing.setUp(test)
+    zope.component.provideAdapter(AttributeAnnotations)
 
-def tearDown(test):
-    zope.app.testing.placelesssetup.tearDown(test)
-
-
 def test_suite():
     return zope.testing.doctest.DocFileSuite(
         "partial.txt", setUp=setUp, tearDown=tearDown)

Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_zdcannotatableadapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_zdcannotatableadapter.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_zdcannotatableadapter.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,15 +17,13 @@
 """
 import unittest
 
-from zope.app.annotation.interfaces import IAnnotations
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.annotation.interfaces import IAnnotations
+from zope.component.testing import PlacelessSetup
 from zope.interface import implements
 
 class TestAnnotations(dict):
-
     implements(IAnnotations)
 
-
 class DublinCoreAdapterTest(PlacelessSetup, unittest.TestCase):
 
     def testZDCAnnotatableAdapter(self):
@@ -45,9 +43,6 @@
         dc = ZDCAnnotatableAdapter(annotations)
         self.assertEqual(dc.title, u'Test title')
 
-
-
-
 def test_suite():
     return unittest.makeSuite(DublinCoreAdapterTest)
 

Modified: Zope3/branches/jim-adapter/src/zope/app/event/objectevent.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/event/objectevent.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/event/objectevent.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -52,7 +52,7 @@
  
     >>> from zope.app.dublincore.interfaces import IZopeDublinCore
     >>> from zope.interface import directlyProvides
-    >>> from zope.app.annotation.interfaces import IAttributeAnnotatable
+    >>> from zope.annotation.interfaces import IAttributeAnnotatable
     >>> directlyProvides(file, IAttributeAnnotatable) 
     
     >>> IZopeDublinCore(file).title = u"New title"

Modified: Zope3/branches/jim-adapter/src/zope/app/event/tests/test_objectevent.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/event/tests/test_objectevent.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/event/tests/test_objectevent.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -18,10 +18,10 @@
 import unittest
 from zope.testing import doctest
 from zope.component.interfaces import IObjectEvent
+from zope.annotation.interfaces import IAnnotations, IAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
 
-from zope.app.annotation.interfaces import IAnnotations, IAnnotatable
-from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
 from zope.app.event.objectevent import ObjectModifiedEvent

Modified: Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/file/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -42,7 +42,7 @@
         />
 
     <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+       interface="zope.annotation.interfaces.IAttributeAnnotatable"
        />
   </class>
 
@@ -64,7 +64,7 @@
         />
 
     <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+        interface="zope.annotation.interfaces.IAttributeAnnotatable"
         />
   </class>
 

Modified: Zope3/branches/jim-adapter/src/zope/app/folder/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/folder/interfaces.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/folder/interfaces.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -18,9 +18,9 @@
 __docformat__ = 'restructuredtext'
 
 from zope.traversing.interfaces import IContainmentRoot
+from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.app.container.interfaces import IContainer
 from zope.app.component.interfaces import IPossibleSite
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 
 class IFolder(IContainer, IPossibleSite, IAttributeAnnotatable):
     """The standard Zope Folder object interface."""

Modified: Zope3/branches/jim-adapter/src/zope/app/form/browser/widgets.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/form/browser/widgets.txt	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/form/browser/widgets.txt	2006-04-06 18:53:27 UTC (rev 66602)
@@ -129,7 +129,7 @@
              permission="zope.ManageContent" />
 
     <implements 
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+        interface="zope.annotation.interfaces.IAttributeAnnotatable"
         />
 
     <require

Modified: Zope3/branches/jim-adapter/src/zope/app/fssync/syncer.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/fssync/syncer.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/fssync/syncer.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -18,10 +18,9 @@
 __docformat__ = 'restructuredtext'
 
 from zope.app import zapi
-from zope.fssync.server.syncer import Syncer
 from zope.traversing.api import getPath
-
-from zope.app.annotation.interfaces import IAnnotations
+from zope.annotation.interfaces import IAnnotations
+from zope.fssync.server.syncer import Syncer
 from zope.app.fssync.interfaces import IGlobalFSSyncUtility
 
 def getObjectId(obj):

Modified: Zope3/branches/jim-adapter/src/zope/app/homefolder/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/homefolder/tests.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/homefolder/tests.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -22,10 +22,10 @@
 from zope.security.interfaces import IPrincipal
 from zope.traversing.interfaces import IPathAdapter 
 from zope.testing import doctest
+from zope.annotation.interfaces import IAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
 
 from zope.app.testing import placelesssetup, setup, ztapi
-from zope.app.annotation.interfaces import IAnnotatable
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.file import File
 from zope.app.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.app.securitypolicy.principalrole import AnnotationPrincipalRoleManager

Modified: Zope3/branches/jim-adapter/src/zope/app/i18n/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/i18n/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/i18n/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -13,7 +13,7 @@
       />
 
   <class class="zope.publisher.http.HTTPRequest">
-      <implements interface="zope.app.annotation.IAttributeAnnotatable" />
+      <implements interface="zope.annotation.IAttributeAnnotatable" />
   </class>
 
   <!-- Setup charset negotiation -->
@@ -56,7 +56,7 @@
   <class class=".messagecatalog.MessageCatalog">
     <factory id="zope.app.MessageCatalog" />
     <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+        interface="zope.annotation.interfaces.IAttributeAnnotatable" />
 
     <require permission="zope.View"
         interface="zope.i18n.interfaces.IMessageCatalog" />

Modified: Zope3/branches/jim-adapter/src/zope/app/i18n/tests/test_translationdomain.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/i18n/tests/test_translationdomain.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/i18n/tests/test_translationdomain.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -27,9 +27,9 @@
 from zope.interface import implements, classImplements
 from zope.interface.verify import verifyObject
 from zope.testing.doctestunit import DocTestSuite
+from zope.annotation.interfaces import IAttributeAnnotatable
 
 from zope.app import zapi
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.i18n.interfaces import ISyncTranslationDomain
 from zope.app.i18n.messagecatalog import MessageCatalog
 from zope.app.i18n.translationdomain import TranslationDomain

Modified: Zope3/branches/jim-adapter/src/zope/app/i18nfile/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/i18nfile/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/i18nfile/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -41,7 +41,7 @@
         attributes="setDefaultLanguage removeLanguage setData"
         />
     <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+       interface="zope.annotation.interfaces.IAttributeAnnotatable"
        />
   </class>
 
@@ -69,7 +69,7 @@
         attributes="setDefaultLanguage removeLanguage setData"
         />
     <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+       interface="zope.annotation.interfaces.IAttributeAnnotatable"
        />
   </class>
 

Modified: Zope3/branches/jim-adapter/src/zope/app/intid/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/intid/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/intid/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -6,7 +6,7 @@
         />
 
     <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+        interface="zope.annotation.interfaces.IAttributeAnnotatable"
         />
 
     <require

Modified: Zope3/branches/jim-adapter/src/zope/app/principalannotation/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/principalannotation/__init__.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/principalannotation/__init__.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -25,8 +25,8 @@
 import zope.security.interfaces
 from zope import interface, component
 from zope.location import Location
+from zope.annotation.interfaces import IAnnotations
 
-from zope.app.annotation.interfaces import IAnnotations
 from zope.app.container.contained import Contained
 from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
 from zope.app.component import queryNextUtility

Modified: Zope3/branches/jim-adapter/src/zope/app/principalannotation/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/principalannotation/tests.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/principalannotation/tests.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -20,16 +20,15 @@
 
 import zope.component
 from zope.interface import implements
-from zope.app import zapi
-from zope.app.annotation.interfaces import IAnnotations
+from zope.annotation.interfaces import IAnnotations
+from zope.security.interfaces import IPrincipal
+
 from zope.app.principalannotation import PrincipalAnnotationUtility
-from zope.app.security.interfaces import IPrincipal
 from zope.app.component.testing import PlacefulSetup
-from zope.app.testing import ztapi, setup
+from zope.app.testing import setup
 from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
 
 class Principal(object):
-
     implements(IPrincipal)
 
     def __init__(self, id):

Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/browser/tests/test_browserlanguages.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/browser/tests/test_browserlanguages.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/browser/tests/test_browserlanguages.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,16 +17,15 @@
 """
 import unittest
 
+import zope.component
 from zope.interface import directlyProvides
 from zope.publisher.browser import BrowserLanguages
 from zope.publisher.tests.test_browserlanguages import TestRequest
 from zope.publisher.tests.test_browserlanguages import BrowserLanguagesTest
+from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
 
-from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.annotation import IAttributeAnnotatable, IAnnotations
-from zope.app.annotation.attribute import AttributeAnnotations
-
 from zope.app.publisher.browser import CacheableBrowserLanguages
 from zope.app.publisher.browser import ModifiableBrowserLanguages
 from zope.app.publisher.browser import NotCompatibleAdapterError
@@ -36,8 +35,7 @@
 
     def setUp(self):
         super(CacheableBrowserLanguagesTests, self).setUp()
-        ztapi.provideAdapter(IAttributeAnnotatable, IAnnotations,
-            AttributeAnnotations)
+        zope.component.provideAdapter(AttributeAnnotations)
 
     def factory(self, request):
         directlyProvides(request, IAttributeAnnotatable)

Modified: Zope3/branches/jim-adapter/src/zope/app/pythonpage/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/pythonpage/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/pythonpage/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -23,7 +23,7 @@
         set_attributes="source contentType"
         />
     <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" 
+        interface="zope.annotation.interfaces.IAttributeAnnotatable" 
         />
   </class>
 

Modified: Zope3/branches/jim-adapter/src/zope/app/schemacontent/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/schemacontent/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/schemacontent/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -31,7 +31,7 @@
 
   <class class=".content.ContentComponentInstance">
     <implements
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+      interface="zope.annotation.interfaces.IAttributeAnnotatable" />
   </class>
 
   <include package=".browser" />

Modified: Zope3/branches/jim-adapter/src/zope/app/schemacontent/tests/test_content.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/schemacontent/tests/test_content.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/schemacontent/tests/test_content.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -20,9 +20,9 @@
 from zope.component.interfaces import ComponentLookupError
 from zope.interface import Interface, classImplements
 from zope.schema import Int, TextLine, Text
+from zope.annotation.interfaces import IAttributeAnnotatable
 
 from zope.app import zapi
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.component.interfaces import ILocalUtility
 from zope.app.container.interfaces import IAdding
 from zope.app.schemacontent.content import \

Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/browser/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/browser/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/browser/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -91,7 +91,7 @@
 <!-- Granting Roles and Permissions to Principals -->
 
   <page
-      for="zope.app.annotation.interfaces.IAnnotatable"
+      for="zope.annotation.interfaces.IAnnotatable"
       name="grant.html"
       permission="zope.Security"
       template="granting.pt" 

Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/browser/granting.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/browser/granting.txt	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/browser/granting.txt	2006-04-06 18:53:27 UTC (rev 66602)
@@ -52,7 +52,7 @@
 
   - Security-related Adapters
 
-    >>> from zope.app.annotation.interfaces import IAnnotatable
+    >>> from zope.annotation.interfaces import IAnnotatable
     >>> from zope.app.securitypolicy.interfaces import IPrincipalRoleManager
     >>> from zope.app.securitypolicy.principalrole import \
     ...     AnnotationPrincipalRoleManager
@@ -109,7 +109,7 @@
 
   - Content Object
 
-    >>> from zope.app.annotation.interfaces import IAttributeAnnotatable
+    >>> from zope.annotation.interfaces import IAttributeAnnotatable
     >>> class Content:
     ...     implements(IAttributeAnnotatable)
     ...     __annotations__ = {}

Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -5,7 +5,7 @@
 
   <adapter factory=".rolepermission.AnnotationRolePermissionManager"
            provides=".interfaces.IRolePermissionManager"
-           for="zope.app.annotation.interfaces.IAnnotatable"
+           for="zope.annotation.interfaces.IAnnotatable"
            trusted="true"
            />
 
@@ -20,7 +20,7 @@
 
   <adapter factory=".principalrole.AnnotationPrincipalRoleManager"
            provides=".interfaces.IPrincipalRoleManager"
-           for="zope.app.annotation.interfaces.IAnnotatable"
+           for="zope.annotation.interfaces.IAnnotatable"
            trusted="true"
            />
 
@@ -35,7 +35,7 @@
 
   <adapter factory=".principalpermission.AnnotationPrincipalPermissionManager"
            provides=".interfaces.IPrincipalPermissionManager"
-           for="zope.app.annotation.interfaces.IAnnotatable"
+           for="zope.annotation.interfaces.IAnnotatable"
            trusted="true"
            />
 
@@ -50,7 +50,7 @@
 
   <adapter factory=".grantinfo.AnnotationGrantInfo"
            provides=".interfaces.IGrantInfo"
-           for="zope.app.annotation.interfaces.IAnnotatable"
+           for="zope.annotation.interfaces.IAnnotatable"
            />
 
   <!-- protect Roles and Permissions -->

Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/grantinfo.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/grantinfo.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/grantinfo.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -15,12 +15,10 @@
 
 $Id$
 """
+from zope.annotation.interfaces import IAnnotations
 from zope.app.security.settings import Unset
-
 from zope.app.securitypolicy.interfaces import IGrantInfo
 
-from zope.app.annotation.interfaces import IAnnotations
-
 from zope.app.securitypolicy.principalpermission \
      import AnnotationPrincipalPermissionManager
 prinperkey = AnnotationPrincipalPermissionManager.key
@@ -36,8 +34,6 @@
 rolepermkey = AnnotationRolePermissionManager.key
 del AnnotationRolePermissionManager
 
-
-
 class AnnotationGrantInfo(object):
 
     prinper = prinrole = permrole = {}

Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/securitymap.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/securitymap.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/securitymap.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -16,7 +16,7 @@
 $Id$
 """
 from persistent import Persistent
-from zope.app.annotation import IAnnotations
+from zope.annotation import IAnnotations
 from zope.security.management import queryInteraction
 
 class SecurityMap(object):

Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -18,10 +18,10 @@
 import unittest
 
 from zope.interface import implements
+from zope.annotation.attribute import AttributeAnnotations
+from zope.annotation.interfaces import IAttributeAnnotatable, IAnnotations
 
 from zope.app.testing import ztapi
-from zope.app.annotation.attribute import AttributeAnnotations
-from zope.app.annotation.interfaces import IAttributeAnnotatable, IAnnotations
 from zope.app.security.principalregistry import principalRegistry
 from zope.app.security.settings import Allow, Deny, Unset
 from zope.app.testing.placelesssetup import PlacelessSetup

Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -16,11 +16,11 @@
 $Id$
 """
 import unittest
+import zope.component
 from zope.interface import implements
+from zope.annotation.interfaces import IAttributeAnnotatable
 
-from zope.app import zapi
 from zope.app.testing import ztapi
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.security.principalregistry import principalRegistry
 from zope.app.security.settings import Allow, Deny
 from zope.app.component.testing import PlacefulSetup
@@ -34,7 +34,7 @@
 
 def defineRole(id, title=None, description=None):
     role = Role(id, title, description)
-    ztapi.provideUtility(IRole, role, name=role.id)
+    zope.component.provideUtility(role, IRole, name=role.id)
     return role
 
 class Test(PlacefulSetup, unittest.TestCase):

Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,9 +17,9 @@
 """
 import unittest
 from zope.interface import implements
+from zope.annotation.interfaces import IAttributeAnnotatable
 
 from zope.app.testing import ztapi
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.security.interfaces import IPermission
 from zope.app.security.permission import Permission
 from zope.app.security.settings import Allow, Deny

Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_zopepolicy.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_zopepolicy.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/tests/test_zopepolicy.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -18,12 +18,14 @@
 
 import unittest
 from zope.testing.doctestunit import DocFileSuite
+from zope.annotation.interfaces import IAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAnnotations
+from zope.annotation.attribute import AttributeAnnotations
+from zope.security.management import endInteraction
+
 from zope.app import zapi
 from zope.app.testing import placelesssetup, ztapi
-from zope.app.annotation.interfaces import IAnnotatable
-from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.annotation.interfaces import IAnnotations
-from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.securitypolicy.interfaces import IGrantInfo
 from zope.app.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.app.securitypolicy.interfaces import IPrincipalPermissionManager
@@ -36,7 +38,6 @@
      import AnnotationRolePermissionManager
 from zope.app.securitypolicy.grantinfo \
      import AnnotationGrantInfo
-from zope.security.management import endInteraction
 
 def setUp(test):
     placelesssetup.setUp()

Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/zopepolicy.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/zopepolicy.txt	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/zopepolicy.txt	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,7 +17,7 @@
 grants and denials, objects must be annotatable:
 
   >>> import zope.interface
-  >>> from zope.app.annotation.interfaces import IAttributeAnnotatable
+  >>> from zope.annotation.interfaces import IAttributeAnnotatable
   >>> class Ob:
   ...     zope.interface.implements(IAttributeAnnotatable)
 

Modified: Zope3/branches/jim-adapter/src/zope/app/session/http.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/session/http.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/session/http.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -15,23 +15,24 @@
 
 $Id$
 """
-from cStringIO import StringIO
-from persistent import Persistent
-from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.i18n import ZopeMessageFactory as _
-from zope.app import zapi
-from zope.app.session.interfaces import IClientIdManager
-from zope import schema
-from zope.interface import implements
-from zope.app.http.httpdate import build_http_date
-from zope.publisher.interfaces.http import IHTTPApplicationRequest
 import hmac
 import random
 import re
 import sha
 import string
 import time
+from cStringIO import StringIO
 
+from persistent import Persistent
+from zope import schema
+from zope.interface import implements
+from zope.publisher.interfaces.http import IHTTPApplicationRequest
+from zope.annotation.interfaces import IAttributeAnnotatable
+
+from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.session.interfaces import IClientIdManager
+from zope.app.http.httpdate import build_http_date
+
 __docformat__ = 'restructuredtext'
 
 cookieSafeTrans = string.maketrans("+/", "-.")

Modified: Zope3/branches/jim-adapter/src/zope/app/session/session.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/session/session.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/session/session.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -20,13 +20,16 @@
 from UserDict import IterableUserDict
 from heapq import heapify, heappop
 
+import ZODB
+import ZODB.MappingStorage
 from persistent import Persistent
+from BTrees.OOBTree import OOBTree
+
 from zope import schema
 from zope.interface import implements
-from zope.component import ComponentLookupError
-from zope.app.zapi import getUtility
-from BTrees.OOBTree import OOBTree
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.component import getUtility
+from zope.component.interfaces import ComponentLookupError
+from zope.annotation.interfaces import IAttributeAnnotatable
 
 from interfaces import \
         IClientIdManager, IClientId, ISession, ISessionDataContainer, \
@@ -34,9 +37,6 @@
 
 from http import ICookieClientIdManager
 
-import ZODB
-import ZODB.MappingStorage
-
 __docformat__ = 'restructuredtext'
 
 cookieSafeTrans = string.maketrans("+/", "-.")

Modified: Zope3/branches/jim-adapter/src/zope/app/sqlscript/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/sqlscript/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/sqlscript/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -30,7 +30,7 @@
         set_schema=".interfaces.ISQLScript"
         />
     <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+        interface="zope.annotation.interfaces.IAttributeAnnotatable"
         />
   </class>
 

Modified: Zope3/branches/jim-adapter/src/zope/app/sqlscript/tests/test_sqlscript.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/sqlscript/tests/test_sqlscript.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/sqlscript/tests/test_sqlscript.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,14 +17,14 @@
 import unittest
 from zope.interface import implements, classImplements
 from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.annotation.interfaces import IAnnotatable, IAnnotations
+from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
 
 from zope.app.testing import ztapi
 from zope.app.rdb.interfaces import IZopeDatabaseAdapter
 from zope.app.rdb.interfaces import IZopeConnection, IZopeCursor
 from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.annotation.interfaces import IAnnotatable, IAnnotations
-from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.cache.interfaces import ICacheable, ICache
 from zope.app.cache.annotationcacheable import AnnotationCacheable
 from zope.app.cache.caching import getCacheForObject

Modified: Zope3/branches/jim-adapter/src/zope/app/testing/setup.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/testing/setup.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/testing/setup.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -30,15 +30,13 @@
 
 #------------------------------------------------------------------------
 # Annotations
-from zope.app.annotation.attribute import AttributeAnnotations
-from zope.app.annotation.interfaces import IAnnotations
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.attribute import AttributeAnnotations
 def setUpAnnotations():
-    ztapi.provideAdapter(IAttributeAnnotatable, IAnnotations,
-                         AttributeAnnotations)
+    zope.component.provideAdapter(AttributeAnnotations)
 
 #------------------------------------------------------------------------
 # Dependencies
+from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.app.dependable import Dependable
 from zope.app.dependable.interfaces import IDependable
 def setUpDependable():

Modified: Zope3/branches/jim-adapter/src/zope/app/versioncontrol/README.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/versioncontrol/README.txt	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/versioncontrol/README.txt	2006-04-06 18:53:27 UTC (rev 66602)
@@ -24,8 +24,8 @@
     >>> import persistent
     >>> from zope import component, interface
     >>> import zope.traversing.interfaces
-    >>> import zope.app.annotation.attribute
-    >>> import zope.app.annotation.interfaces
+    >>> import zope.annotation.attribute
+    >>> import zope.annotation.interfaces
     >>> from zope.app.versioncontrol import interfaces
 
     >>> marker = object()
@@ -34,7 +34,7 @@
     ...     interface.implements(
     ...         interfaces.IVersionable,
     ...         interfaces.INonVersionedData,
-    ...         zope.app.annotation.interfaces.IAttributeAnnotatable,
+    ...         zope.annotation.interfaces.IAttributeAnnotatable,
     ...         zope.traversing.interfaces.IPhysicallyLocatable,
     ...         )
     ...
@@ -70,7 +70,7 @@
     ...         return "<%s object>" % self.__class__.__name__
 
     >>> component.provideAdapter(
-    ...     zope.app.annotation.attribute.AttributeAnnotations)
+    ...     zope.annotation.attribute.AttributeAnnotations)
     ... # doctest: +NORMALIZE_WHITESPACE
     Registered event:
     AdapterRegistration(<BaseGlobalComponents base>, 

Modified: Zope3/branches/jim-adapter/src/zope/app/versioncontrol/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/versioncontrol/interfaces.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/versioncontrol/interfaces.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -19,13 +19,12 @@
 import zope.interface
 import zope.schema
 import zope.component.interfaces
+import zope.annotation.interfaces
 
 from zope.schema.vocabulary import SimpleVocabulary
 from zope.i18nmessageid import MessageFactory
 _ = MessageFactory('zope.app.versioncontrol')
 
-import zope.app.annotation.interfaces
-
 class VersionControlError(Exception):
     pass
 
@@ -299,7 +298,7 @@
 
 
 class IVersionable(persistent.interfaces.IPersistent,
-                   zope.app.annotation.interfaces.IAnnotatable):
+                   zope.annotation.interfaces.IAnnotatable):
     """Version control is allowed for objects that provide this."""
 
 class IVersioned(IVersionable):

Modified: Zope3/branches/jim-adapter/src/zope/app/versioncontrol/repository.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/versioncontrol/repository.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/versioncontrol/repository.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -26,11 +26,10 @@
 import zope.event
 import zope.interface
 import zope.datetime
+from zope.annotation.interfaces import IAnnotations
 
 from zope.app import zapi
-from zope.app.annotation.interfaces import IAnnotations
-
-from zope.app.versioncontrol import event
+from zope.app.versioncontrol import nonversioned, utility, event
 from zope.app.versioncontrol.history import VersionHistory
 from zope.app.versioncontrol.interfaces import VersionControlError
 from zope.app.versioncontrol.interfaces import IVersionable, IVersioned
@@ -39,13 +38,9 @@
 from zope.app.versioncontrol.interfaces import CHECKED_IN, CHECKED_OUT
 from zope.app.versioncontrol.interfaces import ACTION_CHECKIN, ACTION_CHECKOUT
 from zope.app.versioncontrol.interfaces import ACTION_UNCHECKOUT, ACTION_UPDATE
-from zope.app.versioncontrol import nonversioned
-from zope.app.versioncontrol import utility
 
-
 VERSION_INFO_KEY = "%s.%s" % (utility.__name__, utility.VersionInfo.__name__)
 
-
 class Repository(persistent.Persistent):
     """The repository implementation manages the actual data of versions
     and version histories. It does not handle user interface issues."""

Modified: Zope3/branches/jim-adapter/src/zope/app/versioncontrol/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/versioncontrol/tests.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/versioncontrol/tests.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -23,12 +23,12 @@
 import zope.event
 import zope.location
 import zope.traversing.interfaces
+import zope.annotation.interfaces
+import zope.annotation.attribute
 from zope import component, interface
 from zope.component.testing import PlacelessSetup
 from zope.testing import doctest, module
 
-import zope.app.annotation.interfaces
-import zope.app.annotation.attribute
 import zope.app.versioncontrol.version
 from zope.app.versioncontrol import interfaces, nonversioned
 
@@ -57,7 +57,7 @@
 
 class L(persistent.Persistent, zope.location.Location):
     interface.implements(interfaces.IVersionable,
-                         zope.app.annotation.interfaces.IAttributeAnnotatable,
+                         zope.annotation.interfaces.IAttributeAnnotatable,
                          zope.traversing.interfaces.IPhysicallyLocatable,
                          )
     def getPath(self):
@@ -147,7 +147,7 @@
     >>> import transaction
     >>> db = util.DB()
     >>> component.provideAdapter(
-    ...     zope.app.annotation.attribute.AttributeAnnotations)
+    ...     zope.annotation.attribute.AttributeAnnotations)
     >>> component.provideAdapter(
     ...     nonversioned.StandardNonVersionedDataAdapter,
     ...     [None])

Modified: Zope3/branches/jim-adapter/src/zope/app/wfmc/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/wfmc/tests.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/wfmc/tests.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -22,8 +22,6 @@
 from zope.configuration import xmlconfig
 from zope.testing import module, doctest
 
-import zope.app.annotation.interfaces
-import zope.app.annotation.attribute
 import zope.app.wfmc
 from zope.app.testing import placelesssetup
 from zope.app.testing import ztapi

Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -59,7 +59,7 @@
         class="zope.app.workflow.definition.ProcessDefinitionElementContainer">
 
     <implements
-       interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+       interface="zope.annotation.interfaces.IAttributeAnnotatable"
        />
 
     <require
@@ -76,7 +76,7 @@
   <adapter
       factory="zope.app.workflow.instance.ProcessInstanceContainerAdapter"
       provides="zope.app.workflow.interfaces.IProcessInstanceContainer"
-      for="zope.app.annotation.interfaces.IAnnotatable"
+      for="zope.annotation.interfaces.IAnnotatable"
       permission="zope.workflow.UseProcessInstances"
       trusted="true"
       />

Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/instance.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/instance.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/instance.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,18 +17,17 @@
 """
 from types import StringTypes
 from persistent.dict import PersistentDict
+
+import zope.component
 from zope.proxy import removeAllProxies
+from zope.annotation.interfaces import IAnnotatable, IAnnotations
+from zope.interface import implements
 
-from zope.app import zapi
-from zope.app.annotation.interfaces import IAnnotatable, IAnnotations
 from zope.app.container.interfaces import IContained
+from zope.app.container.contained import Contained, setitem, uncontained
 from zope.app.workflow.interfaces import IProcessInstance, IProcessDefinition
 from zope.app.workflow.interfaces import IProcessInstanceContainer
 
-from zope.interface import implements
-
-from zope.app.container.contained import Contained, setitem, uncontained
-
 class ProcessInstance(Contained):
     """Process Instance implementation.
 
@@ -52,7 +51,7 @@
 def createProcessInstance(context, name):
     """Helper function to create a process instance from a process definition
     name."""
-    sm = zapi.getSiteManager(context)
+    sm = zope.component.getSiteManager(context)
     pd = sm.queryUtility(IProcessDefinition, name)
     return pd.createProcessInstance(name)
 

Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/browser/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/browser/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/browser/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -159,7 +159,7 @@
   <zope:adapter
       factory=".filteradapter.FilterAdapter"
       provides=".interfaces.IContentFilterAdapter"
-      for="zope.app.annotation.interfaces.IAttributeAnnotatable"
+      for="zope.annotation.interfaces.IAttributeAnnotatable"
       permission="zope.View" /> <!-- TODO: is this permission right? -->
 
   <!--include file="testobject.zcml"/-->

Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -11,7 +11,7 @@
       interface="zope.app.utility.interfaces.ILocalUtility"
       />
   <implements
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+      interface="zope.annotation.interfaces.IAttributeAnnotatable"
       />
   <require
       permission="zope.workflow.ManageProcessDefinitions"
@@ -36,7 +36,7 @@
       interface=".interfaces.IStatefulStatesContainer"
       />
   <implements
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+      interface="zope.annotation.interfaces.IAttributeAnnotatable"
       />
 </class>
 
@@ -52,7 +52,7 @@
       set_schema=".interfaces.IState"
       />
   <implements
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+      interface="zope.annotation.interfaces.IAttributeAnnotatable"
       />
 </class>
 
@@ -72,7 +72,7 @@
       interface=".interfaces.IStatefulTransitionsContainer"
       />
   <implements
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+      interface="zope.annotation.interfaces.IAttributeAnnotatable"
       />
 </class>
 
@@ -88,7 +88,7 @@
       set_schema=".interfaces.ITransition"
       />
   <implements
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+      interface="zope.annotation.interfaces.IAttributeAnnotatable"
       />
 </class>
 
@@ -104,7 +104,7 @@
       interface="zope.app.utility.interfaces.ILocalUtility"
       />
   <implements
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+      interface="zope.annotation.interfaces.IAttributeAnnotatable"
       />
 
   <require

Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_contentworkflow.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_contentworkflow.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_contentworkflow.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -19,12 +19,12 @@
 
 from zope.interface import Interface, implements
 from zope.interface.verify import verifyClass
+from zope.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAnnotatable, IAttributeAnnotatable
 
 from zope.app import zapi
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.container.contained import Contained
 from zope.app.event.objectevent import ObjectCreatedEvent
-from zope.app.annotation.interfaces import IAnnotatable, IAttributeAnnotatable
 from zope.app.event.interfaces import IObjectCreatedEvent
 from zope.app.component.site import UtilityRegistration
 from zope.app.component.interfaces import ILocalUtility

Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_instance.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_instance.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_instance.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,19 +17,18 @@
 """
 import unittest
 
+from zope import component
 from zope.interface import Interface, implements
 from zope.interface.verify import verifyClass
 from zope.schema import Text, Int
+from zope.security.checker import CheckerPublic
+from zope.security.management import newInteraction, endInteraction
+from zope.annotation.interfaces import IAttributeAnnotatable
 
-from zope import component
 from zope.app.event.tests.placelesssetup import events, clearEvents
 from zope.app.security.interfaces import IPermission
 from zope.app.security.permission import Permission
-from zope.security.checker import CheckerPublic
-from zope.security.management import newInteraction, endInteraction
 
-from zope.app.annotation.interfaces import IAttributeAnnotatable
-
 from zope.app.workflow.tests.workflowsetup import WorkflowSetup
 from zope.app.workflow.interfaces import IProcessDefinition
 from zope.app.workflow.instance import createProcessInstance

Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_xmlimportexport.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_xmlimportexport.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/stateful/tests/test_xmlimportexport.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -18,11 +18,12 @@
 import unittest
 from StringIO import StringIO
 
-from zope.app import zapi
-from zope.app.annotation.attribute import AttributeAnnotations
+import zope.component
+from zope.annotation.attribute import AttributeAnnotations
+from zope.annotation.interfaces import IAnnotatable, IAnnotations
+from zope.annotation.interfaces import IAttributeAnnotatable
+
 from zope.app.dublincore.annotatableadapter import ZDCAnnotatableAdapter
-from zope.app.annotation.interfaces import IAnnotatable, IAnnotations
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.security.interfaces import IPermission
 from zope.app.component.interfaces.registration import IRegisterable
@@ -132,7 +133,7 @@
 
         self.assertEqual(
             testpd.schemaPermissions['title'],
-            (CheckerPublic, zapi.getUtility(IPermission, 'zope.View')))
+            (CheckerPublic, zope.component.getUtility(IPermission, 'zope.View')))
 
         self.assertEqual(len(testpd.states), 3)
         self.assertEqual(len(testpd.transitions), 3)

Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/tests/test_instance.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/tests/test_instance.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/tests/test_instance.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -17,16 +17,14 @@
 """
 import unittest
 from zope.interface.verify import verifyClass
+from zope.annotation.interfaces import IAnnotations
+from zope.interface import implements
 
-from zope.app.annotation.interfaces import IAnnotations
 from zope.app.testing.placelesssetup import PlacelessSetup
-
-from zope.app.workflow.interfaces import IProcessInstance
 from zope.app.workflow.instance import ProcessInstance
-
-from zope.app.workflow.interfaces import IProcessInstanceContainer
 from zope.app.workflow.instance import ProcessInstanceContainerAdapter, WFKey
-from zope.interface import implements
+from zope.app.workflow.interfaces import IProcessInstance
+from zope.app.workflow.interfaces import IProcessInstanceContainer
 
 class TestAnnotations(dict):
     implements(IAnnotations)

Modified: Zope3/branches/jim-adapter/src/zope/app/workflow/tests/workflowsetup.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/workflow/tests/workflowsetup.py	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/workflow/tests/workflowsetup.py	2006-04-06 18:53:27 UTC (rev 66602)
@@ -18,7 +18,6 @@
 from zope.interface import implements
 
 from zope.app import zapi
-from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.security.interfaces import IAuthenticationService
 from zope.app.security.principalregistry import principalRegistry
 from zope.app.site.tests.placefulsetup import PlacefulSetup
@@ -37,9 +36,3 @@
         self.sm1 = self.makeSite('folder1')
         self.default1 = zapi.traverse(self.sm1, "default")
         self.cm1 = self.default1.registrationManager
-
-
-    def setupAuthService(self):
-        self.root_sm.defineService(Authentication, IAuthenticationService)
-        self.root_sm.provideService(Authentication, principalRegistry)
-        return zapi.getService(Authentication, self.rootFolder)

Modified: Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml	2006-04-06 18:51:54 UTC (rev 66601)
+++ Zope3/branches/jim-adapter/src/zope/app/zptpage/configure.zcml	2006-04-06 18:53:27 UTC (rev 66602)
@@ -28,7 +28,7 @@
         interface=".interfaces.IRenderZPTPage"
         />
     <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
+        interface="zope.annotation.interfaces.IAttributeAnnotatable"
         />
   </class>
 



More information about the Zope3-Checkins mailing list