[Checkins] SVN: zope.traversing/trunk/ fixed zcml-related dependencies
Thomas Lotze
tl at gocept.com
Sun Sep 19 08:41:38 EDT 2010
Log message for revision 116638:
fixed zcml-related dependencies
Changed:
U zope.traversing/trunk/CHANGES.txt
U zope.traversing/trunk/setup.py
U zope.traversing/trunk/src/zope/traversing/browser/configure.zcml
U zope.traversing/trunk/src/zope/traversing/configure.zcml
U zope.traversing/trunk/src/zope/traversing/tests/ftesting.zcml
-=-
Modified: zope.traversing/trunk/CHANGES.txt
===================================================================
--- zope.traversing/trunk/CHANGES.txt 2010-09-19 12:29:31 UTC (rev 116637)
+++ zope.traversing/trunk/CHANGES.txt 2010-09-19 12:41:38 UTC (rev 116638)
@@ -5,7 +5,7 @@
3.13.1 (unreleased)
-------------------
-- Nothing changed yet.
+- Fixed ZCML-related dependencies.
3.13 (2010-07-09)
Modified: zope.traversing/trunk/setup.py
===================================================================
--- zope.traversing/trunk/setup.py 2010-09-19 12:29:31 UTC (rev 116637)
+++ zope.traversing/trunk/setup.py 2010-09-19 12:41:38 UTC (rev 116638)
@@ -37,10 +37,12 @@
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',
Modified: zope.traversing/trunk/src/zope/traversing/browser/configure.zcml
===================================================================
--- zope.traversing/trunk/src/zope/traversing/browser/configure.zcml 2010-09-19 12:29:31 UTC (rev 116637)
+++ zope.traversing/trunk/src/zope/traversing/browser/configure.zcml 2010-09-19 12:41:38 UTC (rev 116638)
@@ -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"
Modified: zope.traversing/trunk/src/zope/traversing/configure.zcml
===================================================================
--- zope.traversing/trunk/src/zope/traversing/configure.zcml 2010-09-19 12:29:31 UTC (rev 116637)
+++ zope.traversing/trunk/src/zope/traversing/configure.zcml 2010-09-19 12:41:38 UTC (rev 116638)
@@ -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"
Modified: zope.traversing/trunk/src/zope/traversing/tests/ftesting.zcml
===================================================================
--- zope.traversing/trunk/src/zope/traversing/tests/ftesting.zcml 2010-09-19 12:29:31 UTC (rev 116637)
+++ zope.traversing/trunk/src/zope/traversing/tests/ftesting.zcml 2010-09-19 12:41:38 UTC (rev 116638)
@@ -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" />
More information about the checkins
mailing list