summaryrefslogtreecommitdiff
path: root/repoze/bfg/includes
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-01-18 23:38:47 +0000
committerChris McDonough <chrism@agendaless.com>2009-01-18 23:38:47 +0000
commit62267e01d6eeaf8de871487898ad1ce02878c29a (patch)
tree234346245e58993c27e139906ee7a19a7b67a8e4 /repoze/bfg/includes
parent58afb33d70dece410b998a9c064eba42e3f843d7 (diff)
downloadpyramid-62267e01d6eeaf8de871487898ad1ce02878c29a.tar.gz
pyramid-62267e01d6eeaf8de871487898ad1ce02878c29a.tar.bz2
pyramid-62267e01d6eeaf8de871487898ad1ce02878c29a.zip
Merge "routesmapper branch" to trunk.
Diffstat (limited to 'repoze/bfg/includes')
-rw-r--r--repoze/bfg/includes/configure.zcml2
-rw-r--r--repoze/bfg/includes/meta.zcml15
2 files changed, 16 insertions, 1 deletions
diff --git a/repoze/bfg/includes/configure.zcml b/repoze/bfg/includes/configure.zcml
index 6e830e96f..07f8ab3fa 100644
--- a/repoze/bfg/includes/configure.zcml
+++ b/repoze/bfg/includes/configure.zcml
@@ -11,7 +11,7 @@
/>
<adapter
- factory="repoze.bfg.urldispatch.RoutesModelTraverser"
+ factory="repoze.bfg.traversal.RoutesModelTraverser"
provides="repoze.bfg.interfaces.ITraverserFactory"
for="repoze.bfg.interfaces.IRoutesContext"
/>
diff --git a/repoze/bfg/includes/meta.zcml b/repoze/bfg/includes/meta.zcml
index 89d45e0e6..83fb48e87 100644
--- a/repoze/bfg/includes/meta.zcml
+++ b/repoze/bfg/includes/meta.zcml
@@ -18,4 +18,19 @@
</meta:directives>
+ <meta:groupingDirective
+ namespace="http://namespaces.repoze.org/bfg"
+ name="route"
+ schema="repoze.bfg.zcml.IRouteDirective"
+ handler="repoze.bfg.zcml.Route"
+ />
+
+ <meta:directive
+ name="requirement"
+ namespace="http://namespaces.repoze.org/bfg"
+ usedIn="repoze.bfg.zcml.IRouteDirective"
+ schema="repoze.bfg.zcml.IRouteRequirementDirective"
+ handler="repoze.bfg.zcml.route_requirement"
+ />
+
</configure>