From d90c436f8a681650adb0a0f60677be8dab28b68b Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Thu, 16 Dec 2010 02:12:13 +0000
Subject: [PATCH] Removed the conditional loading of event subscribers: -
 zope.app.container is available in both Plone 3 and Plone 4, so the
 'not-installed zope.app.container' condition was always false -
 zope.lifecycleevent.interfaces does not have an IObjectAddedEvent or
 IObjectRemovedEvent so even if the condition would have been true, the
 loading would have failed.

svn path=/plone.app.discussion/trunk/; revision=46367
---
 plone/app/discussion/notifications.zcml |  45 +++-------
 plone/app/discussion/subscribers.zcml   | 108 +++++++-----------------
 2 files changed, 40 insertions(+), 113 deletions(-)

diff --git a/plone/app/discussion/notifications.zcml b/plone/app/discussion/notifications.zcml
index fdda42d..754004b 100644
--- a/plone/app/discussion/notifications.zcml
+++ b/plone/app/discussion/notifications.zcml
@@ -3,41 +3,16 @@
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone.app.discussion">
 
-    <!-- Plone 3 Event Subscribers -->
+  <subscriber
+      for="plone.app.discussion.interfaces.IComment
+           zope.app.container.interfaces.IObjectAddedEvent"
+      handler=".comment.notify_user"
+      />
 
-    <configure zcml:condition="not-installed zope.app.container">
-
-      <subscriber
-          for="plone.app.discussion.interfaces.IComment
-               zope.lifecycleevent.interfaces.IObjectAddedEvent"
-          handler=".comment.notify_user"
-          />
-
-      <subscriber
-          for="plone.app.discussion.interfaces.IComment
-               zope.lifecycleevent.interfaces.IObjectAddedEvent"
-          handler=".comment.notify_moderator"
-          />
-
-    </configure>
-
-
-    <!-- Plone 4 Event Subscribers -->
-
-    <configure zcml:condition="installed zope.app.container">
-
-      <subscriber
-          for="plone.app.discussion.interfaces.IComment
-               zope.app.container.interfaces.IObjectAddedEvent"
-          handler=".comment.notify_user"
-          />
-
-      <subscriber
-          for="plone.app.discussion.interfaces.IComment
-               zope.app.container.interfaces.IObjectAddedEvent"
-          handler=".comment.notify_moderator"
-          />
-
-    </configure>
+  <subscriber
+      for="plone.app.discussion.interfaces.IComment
+           zope.app.container.interfaces.IObjectAddedEvent"
+      handler=".comment.notify_moderator"
+      />
 
 </configure>
diff --git a/plone/app/discussion/subscribers.zcml b/plone/app/discussion/subscribers.zcml
index 79bf94b..73207ae 100644
--- a/plone/app/discussion/subscribers.zcml
+++ b/plone/app/discussion/subscribers.zcml
@@ -3,89 +3,41 @@
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone.app.discussion">
 
-    <!-- Plone 3 Event Subscribers -->
+    <subscriber
+        for="plone.app.discussion.interfaces.IComment
+             zope.app.container.interfaces.IObjectAddedEvent"
+        handler=".comment.notify_workflow"
+        />
 
-    <configure zcml:condition="not-installed zope.app.container">
+    <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.lifecycleevent.interfaces.IObjectAddedEvent"
-          handler=".comment.notify_workflow"
-          />
+    <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.lifecycleevent.interfaces.IObjectAddedEvent"
-          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.lifecycleevent.interfaces.IObjectRemovedEvent"
-          handler=".comment.notify_content_object"
-          />
+    <subscriber
+        for="plone.app.discussion.interfaces.IComment
+             zope.app.container.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"
-          />
-
-      <subscriber
-          for="Products.CMFCore.interfaces.IContentish
-               zope.lifecycleevent.interfaces.IObjectRemovedEvent"
-          handler=".comment.notify_content_object_deleted"
-          />
-
-    </configure>
-
-
-    <!-- Plone 4 Event Subscribers -->
-
-    <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"
-          />
-
-      <subscriber
-          for="Products.CMFCore.interfaces.IContentish
-               zope.app.container.interfaces.IObjectRemovedEvent"
-          handler=".comment.notify_content_object_deleted"
-          />
-    </configure>
+    <subscriber
+        for="Products.CMFCore.interfaces.IContentish
+             zope.app.container.interfaces.IObjectRemovedEvent"
+        handler=".comment.notify_content_object_deleted"
+        />
 
     <!-- Control panel event subscribers -->