From fde7f2f82843ae117ed664d767a3b2725bd8e550 Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@zmag.de>
Date: Sat, 6 Feb 2010 14:10:56 +0000
Subject: [PATCH] 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=33808
---
 plone/app/discussion/subscribers.zcml | 89 ++++++++-------------------
 1 file changed, 25 insertions(+), 64 deletions(-)

diff --git a/plone/app/discussion/subscribers.zcml b/plone/app/discussion/subscribers.zcml
index 1be80e1..a56fed9 100644
--- a/plone/app/discussion/subscribers.zcml
+++ b/plone/app/discussion/subscribers.zcml
@@ -1,76 +1,37 @@
 <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"
+        handler=".comment.notify_workflow"
+        />
 
-      <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.IObjectAddedEvent"
+        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.IObjectRemovedEvent"
+        handler=".comment.notify_content_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.IObjectAddedEvent"
+        handler=".tool.index_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>
+    <subscriber
+        for="plone.app.discussion.interfaces.IComment
+             zope.lifecycleevent.interfaces.IObjectRemovedEvent"
+        handler=".tool.unindex_object"
+        />
 
 </configure>