[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ zope:localUtility now also adds the AttributeAnnotatable interface on the

[Stephan Richter]

Log message for revision 28554:
  zope:localUtility now also adds the AttributeAnnotatable interface on the 
  utility. I had this code lying around since the sprint, but forgot to 
  check it in.
  
   --This line, and those below, will be ignored--
  
  M    utility/metaconfigure.py
  M    utility/tests.py
  M    cache/configure.zcml
  M    schemacontent/configure.zcml
  M    schema/configure.zcml
  M    rdb/configure.zcml
  M    workflow/configure.zcml
  M    workflow/stateful/configure.zcml
  M    i18n/configure.zcml
  M    securitypolicy/configure.zcml
  

Changed:
  U   Zope3/trunk/src/zope/app/cache/configure.zcml
  U   Zope3/trunk/src/zope/app/i18n/configure.zcml
  U   Zope3/trunk/src/zope/app/rdb/configure.zcml
  U   Zope3/trunk/src/zope/app/schema/configure.zcml
  U   Zope3/trunk/src/zope/app/schemacontent/configure.zcml
  U   Zope3/trunk/src/zope/app/securitypolicy/configure.zcml
  U   Zope3/trunk/src/zope/app/utility/metaconfigure.py
  U   Zope3/trunk/src/zope/app/utility/tests.py
  U   Zope3/trunk/src/zope/app/workflow/configure.zcml
  U   Zope3/trunk/src/zope/app/workflow/stateful/configure.zcml

-=-
Modified: Zope3/trunk/src/zope/app/cache/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/cache/configure.zcml	2004-12-03 18:52:48 UTC (rev 28553)
+++ Zope3/trunk/src/zope/app/cache/configure.zcml	2004-12-03 20:13:01 UTC (rev 28554)
@@ -17,10 +17,6 @@
         interface="zope.app.cache.interfaces.ICache"
         />
 
-    <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
-        />
-
     <require 
         permission="zope.ManageServices" 
         interface="zope.app.cache.interfaces.ram.IRAMCache"

Modified: Zope3/trunk/src/zope/app/i18n/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/i18n/configure.zcml	2004-12-03 18:52:48 UTC (rev 28553)
+++ Zope3/trunk/src/zope/app/i18n/configure.zcml	2004-12-03 20:13:01 UTC (rev 28554)
@@ -21,9 +21,6 @@
    <factory 
         id="zope.app.TranslationService" 
         />
-    <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" 
-        />
    <allow interface="zope.i18n.interfaces.ITranslationDomain" 
        />
    <require permission="zope.ManageServices"

Modified: Zope3/trunk/src/zope/app/rdb/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/rdb/configure.zcml	2004-12-03 18:52:48 UTC (rev 28553)
+++ Zope3/trunk/src/zope/app/rdb/configure.zcml	2004-12-03 20:13:01 UTC (rev 28554)
@@ -31,9 +31,6 @@
 
   <localUtility class="zope.app.rdb.ZopeDatabaseAdapter">
 
-    <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
-
     <require
         permission="zope.app.rdb.Use"
         interface="zope.app.rdb.interfaces.IZopeDatabaseAdapter" />

Modified: Zope3/trunk/src/zope/app/schema/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/schema/configure.zcml	2004-12-03 18:52:48 UTC (rev 28553)
+++ Zope3/trunk/src/zope/app/schema/configure.zcml	2004-12-03 20:13:01 UTC (rev 28554)
@@ -6,9 +6,6 @@
         title="Mutable Schema"
         description="A Persistent Schema that can be edited through the web"/>
 
-    <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
-
     <require
         permission="zope.ManageServices"
         interface=".interfaces.IMutableSchema" />

Modified: Zope3/trunk/src/zope/app/schemacontent/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/schemacontent/configure.zcml	2004-12-03 18:52:48 UTC (rev 28553)
+++ Zope3/trunk/src/zope/app/schemacontent/configure.zcml	2004-12-03 20:13:01 UTC (rev 28554)
@@ -12,9 +12,6 @@
       title="Content Component Definition"
       description="A Persistent Content Component Definition" />
 
-    <implements
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
-
     <require
       permission="zope.ManageServices"
       interface=".interfaces.IContentComponentDefinition"

Modified: Zope3/trunk/src/zope/app/securitypolicy/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/configure.zcml	2004-12-03 18:52:48 UTC (rev 28553)
+++ Zope3/trunk/src/zope/app/securitypolicy/configure.zcml	2004-12-03 20:13:01 UTC (rev 28554)
@@ -62,9 +62,6 @@
     <factory
         id="zope.security.role.Role"
         />
-    <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
-        />
     <require
         permission="zope.Security"
         interface=".interfaces.IRole"

Modified: Zope3/trunk/src/zope/app/utility/metaconfigure.py
===================================================================
--- Zope3/trunk/src/zope/app/utility/metaconfigure.py	2004-12-03 18:52:48 UTC (rev 28553)
+++ Zope3/trunk/src/zope/app/utility/metaconfigure.py	2004-12-03 20:13:01 UTC (rev 28554)
@@ -18,6 +18,7 @@
 __docformat__ = "reStructuredText"
 from zope.interface import classImplements
 from zope.app.component.contentdirective import ContentDirective
+from zope.app.annotation.interfaces import IAttributeAnnotatable
 
 from interfaces import ILocalUtility
 
@@ -25,5 +26,6 @@
 class LocalUtilityDirective(ContentDirective):
 
     def __init__(self, _context, class_):
+        classImplements(class_, IAttributeAnnotatable)
         classImplements(class_, ILocalUtility)
         super(LocalUtilityDirective, self).__init__(_context, class_)

Modified: Zope3/trunk/src/zope/app/utility/tests.py
===================================================================
--- Zope3/trunk/src/zope/app/utility/tests.py	2004-12-03 18:52:48 UTC (rev 28553)
+++ Zope3/trunk/src/zope/app/utility/tests.py	2004-12-03 20:13:01 UTC (rev 28554)
@@ -29,6 +29,7 @@
 from zope.app.tests import setup
 from zope.app.site.tests import placefulsetup
 from zope.app import utility, zapi
+from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.traversing.api import traverse
 from zope.app.registration.interfaces import IRegistrationStack
 from zope.app.registration.interfaces import UnregisteredStatus
@@ -249,6 +250,7 @@
         ''')
         xmlconfig(f)
         self.assert_(ILocalUtility.implementedBy(UtilityStub))
+        self.assert_(IAttributeAnnotatable.implementedBy(UtilityStub))
     
 
 def test_suite():

Modified: Zope3/trunk/src/zope/app/workflow/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/workflow/configure.zcml	2004-12-03 18:52:48 UTC (rev 28553)
+++ Zope3/trunk/src/zope/app/workflow/configure.zcml	2004-12-03 20:13:01 UTC (rev 28554)
@@ -31,9 +31,6 @@
     <factory
         id="zope.app.workflow.ProcessDefinition"
         />
-    <implements 
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" 
-        />
     <require
         permission="zope.ManageServices"
         interface="zope.app.workflow.interfaces.IProcessDefinition" 

Modified: Zope3/trunk/src/zope/app/workflow/stateful/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/workflow/stateful/configure.zcml	2004-12-03 18:52:48 UTC (rev 28553)
+++ Zope3/trunk/src/zope/app/workflow/stateful/configure.zcml	2004-12-03 20:13:01 UTC (rev 28554)
@@ -7,9 +7,6 @@
   <factory
       id="zope.app.workflow.StatefulProcessDefinition"
       />
-  <implements 
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable" 
-      />
   <require
       permission="zope.workflow.ManageProcessDefinitions"
       interface=".interfaces.IStatefulProcessDefinition"
@@ -95,9 +92,6 @@
   <factory
       id="zope.app.workflow.ContentWorkflowsManager"
       />
-  <implements 
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable" 
-      />
   <require
       permission="zope.ManageServices"
       interface=".interfaces.IContentWorkflowsManager"