Moved ``Products/Five/event.zcml`` into the OFS package.

doc/CHANGES.rst

@@ -11,6 +11,8 @@ Trunk (unreleased)
 Restructuring
 +++++++++++++
 
+- Moved ``Products/Five/event.zcml`` into the OFS package.
+
 - Removed no longer maintained ``configure, make, make install`` related
   installation files. Zope2 can only be installed via its setup.py.
 

src/OFS/configure.zcml

+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <include file="event.zcml"/>
+
+</configure>

src/OFS/event.zcml

+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <!-- Enable object event dispatcher -->
+  <include package="zope.component" />
+
+  <!-- Adapter giving sublocations for ObjectManagers, used
+       by dispatchToSublocations -->
+  <adapter factory=".subscribers.ObjectManagerSublocations" />
+
+  <!-- dispatch IObjectWillBeMovedEvent with "bottom-up" semantics -->
+  <subscriber handler=".subscribers.dispatchObjectWillBeMovedEvent" />
+
+  <!-- dispatch IObjectMovedEvent with "top-down" semantics -->
+  <subscriber handler=".subscribers.dispatchObjectMovedEvent" />
+
+  <!-- dispatch IObjectClonedEvent with "top-down" semantics -->
+  <subscriber handler=".subscribers.dispatchObjectClonedEvent" />
+
+  <!-- dispatch IObjectCopiedEvent with "top-down" semantics -->
+  <subscriber handler=".subscribers.dispatchObjectCopiedEvent" />
+
+</configure>

src/OFS/tests/testObjectManager.py

@@ -74,7 +74,8 @@ class ObjectManagerTests(PlacelessSetup, unittest.TestCase):
         super(ObjectManagerTests, self).setUp()
         self.saved_cfg_debug_mode = getConfiguration().debug_mode
         zcml.load_config('meta.zcml', Products.Five)
-        zcml.load_config('event.zcml', Products.Five)
+        import OFS
+        zcml.load_config('event.zcml', OFS)
         zcml.load_config('deprecated.zcml', Products.Five)
         setDeprecatedManageAddDelete(ItemForDeletion)
 

src/Products/Five/configure.zcml

@@ -4,10 +4,12 @@
   <include file="meta.zcml" />
   <include file="permissions.zcml" />
   <include file="i18n.zcml" />
-  <include file="event.zcml"/>
   <include file="deprecated.zcml"/>
   <include file="publisher.zcml"/>
   <include file="traversing.zcml"/>
+
+  <include package="OFS "/>
+
   <include package=".component" />
   <include package=".browser" />
   <include package=".form" />

src/Products/Five/event.zcml

 <configure xmlns="http://namespaces.zope.org/zope">
 
-  <!-- Enable object event dispatcher -->
-  <include package="zope.component" />
-
-  <!-- Adapter giving sublocations for ObjectManagers, used
-       by dispatchToSublocations -->
-  <adapter factory="OFS.subscribers.ObjectManagerSublocations" />
-
-  <!-- dispatch IObjectWillBeMovedEvent with "bottom-up" semantics -->
-  <subscriber handler="OFS.subscribers.dispatchObjectWillBeMovedEvent" />
-
-  <!-- dispatch IObjectMovedEvent with "top-down" semantics -->
-  <subscriber handler="OFS.subscribers.dispatchObjectMovedEvent" />
-
-  <!-- dispatch IObjectClonedEvent with "top-down" semantics -->
-  <subscriber handler="OFS.subscribers.dispatchObjectClonedEvent" />
-
-  <!-- dispatch IObjectCopiedEvent with "top-down" semantics -->
-  <subscriber handler="OFS.subscribers.dispatchObjectCopiedEvent" />
+  <include package="OFS" file="event.zcml"/>
 
 </configure>