From 05c02322f5a09c14f49c529d6fd885153e52c66f Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Wed, 24 Jun 2009 19:23:43 +0000
Subject: Merge noroutes branch to trunk.

---
 repoze/bfg/includes/meta.zcml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'repoze/bfg/includes')

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