revert r33808 (revert r33488 (Register the event subscribers for the correct interfaces in Plone 3.), since this is breaking 13 tests.).

svn path=/plone.app.discussion/trunk/; revision=33813

plone/app/discussion/subscribers.zcml

@@ -1,9 +1,12 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone.app.discussion">
 
     <!-- Event subscribers -->
 
+    <configure zcml:condition="not-installed zope.app.container">
+
       <subscriber
           for="plone.app.discussion.interfaces.IComment
                zope.lifecycleevent.interfaces.IObjectAddedEvent"
@@ -35,3 +38,39 @@
           />
 
       </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>