[Zope-Checkins] SVN: Zope/trunk/ Moved ``Products/Five/event.zcml`` into the OFS package.

[Hanno Schlichting]

Log message for revision 102390:
  Moved ``Products/Five/event.zcml`` into the OFS package.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  A   Zope/trunk/src/OFS/configure.zcml
  A   Zope/trunk/src/OFS/event.zcml
  U   Zope/trunk/src/OFS/tests/testObjectManager.py
  U   Zope/trunk/src/Products/Five/configure.zcml
  U   Zope/trunk/src/Products/Five/event.zcml

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2009-07-30 19:14:18 UTC (rev 102389)
+++ Zope/trunk/doc/CHANGES.rst	2009-07-30 19:19:53 UTC (rev 102390)
@@ -11,6 +11,8 @@
 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.
 

Added: Zope/trunk/src/OFS/configure.zcml
===================================================================
--- Zope/trunk/src/OFS/configure.zcml	                        (rev 0)
+++ Zope/trunk/src/OFS/configure.zcml	2009-07-30 19:19:53 UTC (rev 102390)
@@ -0,0 +1,5 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <include file="event.zcml"/>
+
+</configure>


Property changes on: Zope/trunk/src/OFS/configure.zcml
___________________________________________________________________
Added: svn:eol-style
   + native

Copied: Zope/trunk/src/OFS/event.zcml (from rev 102379, Zope/trunk/src/Products/Five/event.zcml)
===================================================================
--- Zope/trunk/src/OFS/event.zcml	                        (rev 0)
+++ Zope/trunk/src/OFS/event.zcml	2009-07-30 19:19:53 UTC (rev 102390)
@@ -0,0 +1,22 @@
+<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>

Modified: Zope/trunk/src/OFS/tests/testObjectManager.py
===================================================================
--- Zope/trunk/src/OFS/tests/testObjectManager.py	2009-07-30 19:14:18 UTC (rev 102389)
+++ Zope/trunk/src/OFS/tests/testObjectManager.py	2009-07-30 19:19:53 UTC (rev 102390)
@@ -74,7 +74,8 @@
         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)
 

Modified: Zope/trunk/src/Products/Five/configure.zcml
===================================================================
--- Zope/trunk/src/Products/Five/configure.zcml	2009-07-30 19:14:18 UTC (rev 102389)
+++ Zope/trunk/src/Products/Five/configure.zcml	2009-07-30 19:19:53 UTC (rev 102390)
@@ -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" />

Modified: Zope/trunk/src/Products/Five/event.zcml
===================================================================
--- Zope/trunk/src/Products/Five/event.zcml	2009-07-30 19:14:18 UTC (rev 102389)
+++ Zope/trunk/src/Products/Five/event.zcml	2009-07-30 19:19:53 UTC (rev 102390)
@@ -1,22 +1,5 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
-  <!-- Enable object event dispatcher -->
-  <include package="zope.component" />
+  <include package="OFS" file="event.zcml"/>
 
-  <!-- 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" />
-
 </configure>