Register the event subscribers for the correct interfaces in Plone 3.

svn path=/plone.app.discussion/trunk/; revision=33488
2010-01-27 13:51:44 +00:00
parent 1b78a1839b
commit efc60b2620
2 changed files with 65 additions and 25 deletions
@@ -1,37 +1,76 @@
 <configure
    xmlns="http://namespaces.zope.org/zope"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
    i18n_domain="plone.app.discussion">

    <!-- Event subscribers -->

-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectAddedEvent"
-        handler=".comment.notify_workflow"
-        />
+    <configure zcml:condition="not-installed zope.app.container">

-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectAddedEvent"
-        handler=".comment.notify_content_object"
-        />
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.lifecycleevent.interfaces.IObjectAddedEvent"
+          handler=".comment.notify_workflow"
+          />

-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectRemovedEvent"
-        handler=".comment.notify_content_object"
-        />
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.lifecycleevent.interfaces.IObjectAddedEvent"
+          handler=".comment.notify_content_object"
+          />

-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectAddedEvent"
-        handler=".tool.index_object"
-        />
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.lifecycleevent.interfaces.IObjectRemovedEvent"
+          handler=".comment.notify_content_object"
+          />

-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectRemovedEvent"
-        handler=".tool.unindex_object"
-        />
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.lifecycleevent.interfaces.IObjectAddedEvent"
+          handler=".tool.index_object"
+          />
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.lifecycleevent.interfaces.IObjectRemovedEvent"
+          handler=".tool.unindex_object"
+          />
+
+      </configure>
+
+    <configure zcml:condition="installed zope.app.container">
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectAddedEvent"
+          handler=".comment.notify_workflow"
+          />
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectAddedEvent"
+          handler=".comment.notify_content_object"
+          />
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectRemovedEvent"
+          handler=".comment.notify_content_object"
+          />
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectAddedEvent"
+          handler=".tool.index_object"
+          />
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectRemovedEvent"
+          handler=".tool.unindex_object"
+          />
+
+      </configure>

 </configure>