[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/app/dublincore/ Provide adapts/implements information for zope dublin core adapter (makes

[Philipp von Weitershausen]

Log message for revision 66618:
  Provide adapts/implements information for zope dublin core adapter (makes
  it easier to register in tests and makes the ZCML smaller).
  

Changed:
  U   Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py
  U   Zope3/branches/jim-adapter/src/zope/app/dublincore/configure.zcml

-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py	2006-04-06 20:17:38 UTC (rev 66617)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py	2006-04-06 20:21:03 UTC (rev 66618)
@@ -19,20 +19,21 @@
 
 from persistent.dict import PersistentDict
 
+import zope.component
 from zope.location import Location
 from zope.annotation.interfaces import IAnnotations, IAnnotatable
 from zope.app.dublincore.zopedublincore import ZopeDublinCore
 from zope.app.dublincore.zopedublincore import DateProperty, ScalarProperty
+from zope.app.dublincore.interfaces import IWriteZopeDublinCore
 
-
 DCkey = "zope.app.dublincore.ZopeDublinCore"
 
 
 class ZDCAnnotatableAdapter(ZopeDublinCore, Location):
     """Adapt annotatable objects to Zope Dublin Core."""
+    zope.component.adapts(IAnnotatable)
+    zope.interface.implements(IWriteZopeDublinCore)
 
-    __used_for__ = IAnnotatable
-
     annotations = None
 
     def __init__(self, context):

Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/configure.zcml	2006-04-06 20:17:38 UTC (rev 66617)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/configure.zcml	2006-04-06 20:21:03 UTC (rev 66618)
@@ -14,8 +14,6 @@
 
   <adapter
       factory=".annotatableadapter.ZDCAnnotatableAdapter"
-      provides="zope.app.dublincore.interfaces.IWriteZopeDublinCore"
-      for="zope.annotation.interfaces.IAnnotatable"
       trusted="true"
       />