From 2ce47ee061d680de8ab479326255e36f6716b5bd Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@zmag.de>
Date: Thu, 10 Jun 2010 14:52:07 +0000
Subject: [PATCH] Move to plone.app.discussion-captcha feature declaration to
 meta.zcml.

svn path=/plone.formwidget.captcha/trunk/; revision=37138
---
 CHANGES.txt                             |  3 +++
 plone/formwidget/captcha/configure.zcml |  7 ++-----
 plone/formwidget/captcha/meta.zcml      | 10 ++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 plone/formwidget/captcha/meta.zcml

diff --git a/CHANGES.txt b/CHANGES.txt
index 3b9473a..de6d3ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Changelog
 1.0b2 - unreleased
 ------------------
 
+* Move to plone.app.discussion-captcha feature declaration to meta.zcml.
+  [timo]
+
 * Fix verify method for empty string input values. This is necessary for 
   plone.app.discussion 1.0b5 compatibility.
   [timo] 
diff --git a/plone/formwidget/captcha/configure.zcml b/plone/formwidget/captcha/configure.zcml
index 39b6378..3682340 100644
--- a/plone/formwidget/captcha/configure.zcml
+++ b/plone/formwidget/captcha/configure.zcml
@@ -11,6 +11,8 @@
 
     <include package=".browser" />
 
+    <include file="meta.zcml" />
+	
     <class class=".widget.CaptchaWidget">
         <require
             permission="zope.Public"
@@ -42,11 +44,6 @@
         provides="Products.GenericSetup.interfaces.EXTENSION"
         />
 
-    <!-- Declare that plone.formwidget.captcha provides a Captcha field that 
-         can be used by plone.app.discussion to add a Captcha field to comment 
-         forms. -->
-    <meta:provides feature="plone.app.discussion-captcha" />
-
     <!--
     example:
     http://yourplonesite/@@captcha_form
diff --git a/plone/formwidget/captcha/meta.zcml b/plone/formwidget/captcha/meta.zcml
new file mode 100644
index 0000000..fb0f1c4
--- /dev/null
+++ b/plone/formwidget/captcha/meta.zcml
@@ -0,0 +1,10 @@
+<configure
+    xmlns:meta="http://namespaces.zope.org/meta"
+    xmlns:zcml="http://namespaces.zope.org/zcml">
+
+    <!-- Declare that plone.formwidget.captcha provides a Captcha field that 
+         can be used by plone.app.discussion to add a Captcha field to comment 
+         forms. -->
+    <meta:provides feature="plone.app.discussion-captcha" />
+	
+</configure>