fixed zcml-related dependencies

5 files changed, 11 insertions, 7 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index c737bfc..8b7b536 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,7 +5,7 @@ Changes
 3.13.1 (unreleased)
 -------------------
 
-- Nothing changed yet.
+- Fixed ZCML-related dependencies.
 
 
 3.13 (2010-07-09)
diff --git a/setup.py b/setup.py
index 0474063..03b6907 100644
--- a/setup.py
+++ b/setup.py
@@ -37,10 +37,12 @@ setup(name='zope.traversing',
       package_dir = {'': 'src'},
       namespace_packages=['zope',],
       extras_require = dict(test=['zope.browserpage',
-                                  'zope.browserresource',
+                                  'zope.browserresource[zcml]>=3.12.0dev',
+                                  'zope.component[zcml]',
                                   'zope.configuration',
                                   'zope.container',
                                   'zope.pagetemplate',
+                                  'zope.security[zcml]>=3.8.0dev',
                                   'zope.site',
                                   'zope.tal >= 3.5.0',
                                   'zope.testing',
diff --git a/src/zope/traversing/browser/configure.zcml b/src/zope/traversing/browser/configure.zcml
index a96fc78..9e6c0cc 100644
--- a/src/zope/traversing/browser/configure.zcml
+++ b/src/zope/traversing/browser/configure.zcml
@@ -2,6 +2,9 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser">
 
+  <include file="meta.zcml" package="zope.component" />
+  <include file="meta.zcml" package="zope.browserpage" />
+
   <view
       for="*"
       name="absolute_url"
@@ -10,7 +13,7 @@
       permission="zope.Public"
       allowed_interface=".interfaces.IAbsoluteURL"
       />
-      
+
   <view
       for="*"
       factory=".AbsoluteURL"
@@ -27,7 +30,7 @@
       permission="zope.Public"
       allowed_interface=".interfaces.IAbsoluteURL"
       />
-      
+
   <view
       for="zope.location.interfaces.IRoot"
       factory=".SiteAbsoluteURL"
diff --git a/src/zope/traversing/configure.zcml b/src/zope/traversing/configure.zcml
index 5fd8332..b631a4b 100644
--- a/src/zope/traversing/configure.zcml
+++ b/src/zope/traversing/configure.zcml
@@ -1,6 +1,8 @@
 <configure xmlns="http://namespaces.zope.org/zope"
   xmlns:zcml="http://namespaces.zope.org/zcml">
 
+<include package="zope.component" file="meta.zcml" />
+
 <adapter
     for="*"
     factory="zope.traversing.adapters.Traverser"
diff --git a/src/zope/traversing/tests/ftesting.zcml b/src/zope/traversing/tests/ftesting.zcml
index bc4e131..b087a55 100644
--- a/src/zope/traversing/tests/ftesting.zcml
+++ b/src/zope/traversing/tests/ftesting.zcml
@@ -6,7 +6,6 @@
    >
 
   <include package="zope.browserpage" file="meta.zcml" />
-  <include package="zope.component" file="meta.zcml" />
   <include package="zope.publisher" file="meta.zcml" />
   <include package="zope.security" file="meta.zcml" />
 
@@ -14,8 +13,6 @@
   <include package="zope.container" />
   <include package="zope.location" />
   <include package="zope.publisher" />
-  <include package="zope.security" />
-  <include package="zope.site" />
   <include package="zope.traversing" />
 
   <browser:defaultView name="index.html" />