Change directive name to 'jbot'.

zopefoundation · Oct 31, 2009 · 21f666c · 21f666c
1 parent e64a875
commit 21f666c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,10 @@
 Changes
 =======
 
+In next release...
+
+- ZCML-directive is now called ``jbot``. [malthe]
+
 0.5.2 (2009-10-23)
 ------------------
 

diff --git a/README.txt b/README.txt
@@ -31,7 +31,7 @@ use with jbot using a ZCML-directive::
 
   <include package="z3c.jbot" file="meta.zcml" />
 
-  <browser:templateOverrides
+  <browser:jbot
       directory="<path>"
       layer="<layer>" />
 

diff --git a/z3c/jbot/README.txt b/z3c/jbot/README.txt
@@ -176,7 +176,7 @@ Let's try registering the directory again.
 
   >>> xmlconfig.xmlconfig(StringIO("""
   ... <configure xmlns="http://namespaces.zope.org/browser">
-  ... <templateOverrides directory="%s/overrides/interface" />
+  ... <jbot directory="%s/overrides/interface" />
   ... </configure>
   ... """ % directory))
 
@@ -204,7 +204,7 @@ Let's register overrides for the HTTP-request layer.
 
   >>> xmlconfig.xmlconfig(StringIO("""
   ... <configure xmlns="http://namespaces.zope.org/browser">
-  ... <templateOverrides
+  ... <jbot
   ...      directory="%s/overrides/http"
   ...      layer="zope.publisher.interfaces.browser.IHTTPRequest" />
   ... </configure>

diff --git a/z3c/jbot/meta.zcml b/z3c/jbot/meta.zcml
@@ -3,13 +3,19 @@
     xmlns:meta="http://namespaces.zope.org/meta">
 
     <meta:directives namespace="http://namespaces.zope.org/browser">
-        
+
       <meta:directive
          name="templateOverrides"
          schema=".metadirectives.ITemplateOverridesDirective"
          handler=".metaconfigure.templateOverridesDirective"
          />
-
+
+      <meta:directive
+         name="jbot"
+         schema=".metadirectives.ITemplateOverridesDirective"
+         handler=".metaconfigure.templateOverridesDirective"
+         />
+
     </meta:directives>
-           
+
 </configure>
diff --git a/z3c/jbot/metaconfigure.py b/z3c/jbot/metaconfigure.py
@@ -35,7 +35,7 @@ def handler(directory, layer):
 
 def templateOverridesDirective(_context, directory, layer=interface.Interface):
     _context.action(
-        discriminator = ('override', directory, layer),
+        discriminator = ('jbot', directory, layer),
         callable = handler,
         args = (directory, layer),
         )