summaryrefslogtreecommitdiff
path: root/repoze/bfg/includes
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-06-24 19:23:43 +0000
committerChris McDonough <chrism@agendaless.com>2009-06-24 19:23:43 +0000
commit05c02322f5a09c14f49c529d6fd885153e52c66f (patch)
treec09c43dc7b82d6cc475648c33313d1c1e495311e /repoze/bfg/includes
parentaedb399ccb4da1d055163708894f690bb96685c0 (diff)
downloadpyramid-05c02322f5a09c14f49c529d6fd885153e52c66f.tar.gz
pyramid-05c02322f5a09c14f49c529d6fd885153e52c66f.tar.bz2
pyramid-05c02322f5a09c14f49c529d6fd885153e52c66f.zip
Merge noroutes branch to trunk.
Diffstat (limited to 'repoze/bfg/includes')
-rw-r--r--repoze/bfg/includes/meta.zcml15
1 files changed, 3 insertions, 12 deletions
diff --git a/repoze/bfg/includes/meta.zcml b/repoze/bfg/includes/meta.zcml
index 36129c5e3..4acdfe937 100644
--- a/repoze/bfg/includes/meta.zcml
+++ b/repoze/bfg/includes/meta.zcml
@@ -28,21 +28,12 @@
handler="repoze.bfg.zcml.forbidden"
/>
- </meta:directives>
-
- <meta:groupingDirective
- namespace="http://namespaces.repoze.org/bfg"
+ <meta:directive
name="route"
schema="repoze.bfg.zcml.IRouteDirective"
- handler="repoze.bfg.zcml.Route"
+ 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"
- />
+ </meta:directives>
</configure>