From 62267e01d6eeaf8de871487898ad1ce02878c29a Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Sun, 18 Jan 2009 23:38:47 +0000
Subject: Merge "routesmapper branch" to trunk.

---
 repoze/bfg/includes/configure.zcml |  2 +-
 repoze/bfg/includes/meta.zcml      | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'repoze/bfg/includes')

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>
-- 
cgit v1.2.3