[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/ Move registration of traversing adapters out to its own file, along with the inclusion

[Philipp von Weitershausen]

Log message for revision 66229:
  Move registration of traversing adapters out to its own file, along with the inclusion
  of zope.app.traversing.
  
  Move the inclusion of zope.app.event out to event.zcml.
  

Changed:
  U   Products.Five/branches/philikon-local-components/configure.zcml
  U   Products.Five/branches/philikon-local-components/event.zcml
  A   Products.Five/branches/philikon-local-components/traversing.zcml

-=-
Modified: Products.Five/branches/philikon-local-components/configure.zcml
===================================================================
--- Products.Five/branches/philikon-local-components/configure.zcml	2006-03-27 07:55:33 UTC (rev 66228)
+++ Products.Five/branches/philikon-local-components/configure.zcml	2006-03-27 10:39:33 UTC (rev 66229)
@@ -6,6 +6,7 @@
   <include file="i18n.zcml" />
   <include file="event.zcml"/>
   <include file="deprecated.zcml"/>
+  <include file="traversing.zcml"/>
   <include package=".component" />
   <include package=".site" />
   <include package=".browser" />
@@ -14,28 +15,6 @@
   <include package=".skin" />
   <include package=".utilities" />
 
-  <include package="zope.app.event" />
-  <include package="zope.app.traversing" />
-
-  <!-- do 'traditional' traversing by default; needed by ZPT -->
-  <adapter
-      for="*"
-      factory=".traversable.FiveTraversable"
-      provides="zope.app.traversing.interfaces.ITraversable"
-      />
-
-  <adapter
-      for="*"
-      factory="zope.app.traversing.adapters.Traverser"
-      provides="zope.app.traversing.interfaces.ITraverser"
-      />
-
-  <adapter
-      for="*"
-      factory=".viewable.BrowserDefault"
-      provides=".interfaces.IBrowserDefault"
-      />
-
   <!-- this is really lying, but it's to please checkContainer -->
   <five:implements class="OFS.ObjectManager.ObjectManager"
                    interface="zope.app.container.interfaces.IContainer" />

Modified: Products.Five/branches/philikon-local-components/event.zcml
===================================================================
--- Products.Five/branches/philikon-local-components/event.zcml	2006-03-27 07:55:33 UTC (rev 66228)
+++ Products.Five/branches/philikon-local-components/event.zcml	2006-03-27 10:39:33 UTC (rev 66229)
@@ -1,5 +1,8 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
+  <!-- Enable object event dispatcher -->
+  <include package="zope.app.event" />
+
   <!-- Adapter giving sublocations for ObjectManagers, used
        by dispatchToSublocations -->
 

Added: Products.Five/branches/philikon-local-components/traversing.zcml
===================================================================
--- Products.Five/branches/philikon-local-components/traversing.zcml	2006-03-27 07:55:33 UTC (rev 66228)
+++ Products.Five/branches/philikon-local-components/traversing.zcml	2006-03-27 10:39:33 UTC (rev 66229)
@@ -0,0 +1,29 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:five="http://namespaces.zope.org/five">
+
+  <!-- define default namespace adapters, etc. -->
+  <include package="zope.app.traversing" />
+
+  <!-- use ITraverser/ITraversable duo for both publishing traversal
+       and object graph traversal; this should change in the future,
+       publishing traversal should use IPublishTraverse -->
+
+  <adapter
+      for="*"
+      factory=".traversable.FiveTraversable"
+      provides="zope.app.traversing.interfaces.ITraversable"
+      />
+
+  <adapter
+      for="*"
+      factory="zope.app.traversing.adapters.Traverser"
+      provides="zope.app.traversing.interfaces.ITraverser"
+      />
+
+  <adapter
+      for="*"
+      factory=".viewable.BrowserDefault"
+      provides=".interfaces.IBrowserDefault"
+      />
+
+</configure>


Property changes on: Products.Five/branches/philikon-local-components/traversing.zcml
___________________________________________________________________
Name: svn:eol-style
   + native