Index: web/standard/pom.xml
===================================================================
--- web/standard/pom.xml	(revision 26266)
+++ web/standard/pom.xml	(working copy)
@@ -91,6 +91,12 @@
       <version>1.5.8</version>
       <scope>runtime</scope>
     </dependency>
+    <!-- Captcha component -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-core-captcha</artifactId>
+      <version>${platform.core.version}</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
Index: web/standard/src/main/webapp/WEB-INF/struts-config.xml
===================================================================
--- web/standard/src/main/webapp/WEB-INF/struts-config.xml	(revision 26266)
+++ web/standard/src/main/webapp/WEB-INF/struts-config.xml	(working copy)
@@ -402,8 +402,8 @@
         </action>
 
 
-        <action path="/jcaptcha/"
-                type="com.octo.captcha.module.struts.image.RenderImageCaptchaAction">
+        <action path="/imagecaptcha/"
+                type="org.xwiki.captcha.internal.DefaultImageCaptchaAction">
         </action>
 
         <action path="/unknown/"
Index: core/xwiki-captcha/src/main/java/org/xwiki/captcha/CaptchaVerifier.java
===================================================================
--- core/xwiki-captcha/src/main/java/org/xwiki/captcha/CaptchaVerifier.java	(revision 0)
+++ core/xwiki-captcha/src/main/java/org/xwiki/captcha/CaptchaVerifier.java	(revision 0)
@@ -0,0 +1,55 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.captcha;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.xwiki.component.annotation.ComponentRole;
+
+/**
+ * The CaptchaVerifier interface allows us to check if an answer to a captcha was correct.
+ * 
+ * @version $Id $
+ * @since Future
+ */
+@ComponentRole()
+public interface CaptchaVerifier
+{
+    /**
+     * Check if the solution to a captcha is correct.
+     *
+     * @param captchaId A String used to identify the captcha which is to be solved because multiple users may 
+     *                  be solving captchas at the same time and which captcha belongs to who can't be confused.
+     * @param answer The provided solution.
+     * @return true if the solution is correct for the identified captcha.
+     * @throws Exception If for some reason the CaptchaService fails or cannot be reached, or if the
+     *                   CaptchaService has no record of any captcha gotten with the given captchaId.
+     */
+    boolean isAnswerCorrect(String captchaId, String answer) throws Exception;
+
+    /**
+     * Uses an HttpServletRequest object to get a unique id string to tell different users apart.
+     * depending on the implementation, the id may be the servlet id or a generated value passed through a parameter.
+     *
+     * @param request The HttpServletRequest sent by the user who must be identified.
+     * @return A unique String representing the user who sent the request
+     */
+    String getUserId(HttpServletRequest request);
+}

Property changes on: core/xwiki-captcha/src/main/java/org/xwiki/captcha/CaptchaVerifier.java
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision HeadURL
Name: svn:eol-style
   + native

Index: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/DefaultSoundCaptchaAction.java
===================================================================
--- core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/DefaultSoundCaptchaAction.java	(revision 0)
+++ core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/DefaultSoundCaptchaAction.java	(revision 0)
@@ -0,0 +1,49 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.captcha.internal;
+
+import org.xwiki.component.annotation.Component;
+
+import com.octo.captcha.service.sound.SoundCaptchaService;
+import com.octo.captcha.service.sound.DefaultManageableSoundCaptchaService;
+
+/**
+ * The DefaultSoundCaptchaAction creates a wav file with a word which is spelled
+ * out loud by a speech synthesizer.
+ * 
+ * @version $Id $
+ * @since Future
+ */
+@Component("sound")
+public class DefaultSoundCaptchaAction extends AbstractSoundCaptchaAction
+{
+    /** The service which provides the captcha, must be static because struts instanciates per request. */
+    private static final SoundCaptchaService SERVICE = new DefaultManageableSoundCaptchaService();
+
+    /**
+     * {@inheritDoc}
+     *
+     * @see AbstractCaptchaAction#getCaptchaService()
+     */
+    SoundCaptchaService getCaptchaService()
+    {
+        return SERVICE;
+    }
+}

Property changes on: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/DefaultSoundCaptchaAction.java
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision HeadURL
Name: svn:eol-style
   + native

Index: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractCaptchaAction.java
===================================================================
--- core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractCaptchaAction.java	(revision 0)
+++ core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractCaptchaAction.java	(revision 0)
@@ -0,0 +1,62 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.captcha.internal;
+
+import org.xwiki.captcha.CaptchaVerifier;
+
+import org.apache.struts.action.Action;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.octo.captcha.service.CaptchaService;
+
+/**
+ * The AbstractCaptchaAction handles things which are needed by all types of captchas.
+ * 
+ * @param <T> The type of captcha service for the implementation.
+ * @version $Id $
+ * @since Future
+ */
+public abstract class AbstractCaptchaAction<T extends CaptchaService> extends Action
+    implements CaptchaVerifier
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @see CaptchaVerifier#isAnswerCorrect(String, String)
+     */
+    public boolean isAnswerCorrect(String userId, String answer)
+    {
+        return getCaptchaService().validateResponseForID(userId, answer);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @see CaptchaVerifier#getUserId()
+     */
+    public String getUserId(HttpServletRequest request)
+    {
+        return request.getSession().getId();
+    }
+
+    /** @return The CaptchaService which supplies the captchas */
+    abstract T getCaptchaService();
+}

Property changes on: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractCaptchaAction.java
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision HeadURL
Name: svn:eol-style
   + native

Index: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractImageCaptchaAction.java
===================================================================
--- core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractImageCaptchaAction.java	(revision 0)
+++ core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractImageCaptchaAction.java	(revision 0)
@@ -0,0 +1,60 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.captcha.internal;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import com.octo.captcha.module.web.image.ImageToJpegHelper;
+import com.octo.captcha.service.image.ImageCaptchaService;
+
+/**
+ * Extensions of AbstractImageCaptchaAction create jpeg image captchas.
+ * 
+ * @version $Id $
+ * @since Future
+ */
+public abstract class AbstractImageCaptchaAction extends AbstractCaptchaAction<ImageCaptchaService>
+{
+    /** Easily puts a captcha from the captchaService to the response object as a jpeg image. */
+    private final ImageToJpegHelper helper = new ImageToJpegHelper();
+
+    /**
+     * {@inheritDoc}
+     *
+     * @see AbstractCaptchaAction#execute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    public ActionForward execute(ActionMapping actionMapping, ActionForm actionForm,
+                                 HttpServletRequest request, HttpServletResponse response)
+        throws Exception
+    {
+        this.helper.flushNewCaptchaToResponse(request,
+                                              response,
+                                              null,
+                                              getCaptchaService(),
+                                              getUserId(request),
+                                              request.getLocale());
+        return null;
+    }
+}

Property changes on: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractImageCaptchaAction.java
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision HeadURL
Name: svn:eol-style
   + native

Index: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/DefaultImageCaptchaAction.java
===================================================================
--- core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/DefaultImageCaptchaAction.java	(revision 0)
+++ core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/DefaultImageCaptchaAction.java	(revision 0)
@@ -0,0 +1,48 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.captcha.internal;
+
+import org.xwiki.component.annotation.Component;
+
+import com.octo.captcha.service.image.ImageCaptchaService;
+import com.octo.captcha.service.image.DefaultManageableImageCaptchaService;
+
+/**
+ * The DefaultImageCaptchaAction creates a simple generic jpeg image captcha.
+ * 
+ * @version $Id $
+ * @since Future
+ */
+@Component("image")
+public class DefaultImageCaptchaAction extends AbstractImageCaptchaAction
+{
+    /** The service which provides the captcha, must be static because struts instanciates per request. */
+    private static final ImageCaptchaService SERVICE = new DefaultManageableImageCaptchaService();
+
+    /**
+     * {@inheritDoc}
+     *
+     * @see AbstractCaptchaAction#getCaptchaService()
+     */
+    ImageCaptchaService getCaptchaService()
+    {
+        return SERVICE;
+    }
+}

Property changes on: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/DefaultImageCaptchaAction.java
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision HeadURL
Name: svn:eol-style
   + native

Index: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/VelocityCaptchaService.java
===================================================================
--- core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/VelocityCaptchaService.java	(revision 0)
+++ core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/VelocityCaptchaService.java	(revision 0)
@@ -0,0 +1,89 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.captcha.internal.velocity;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+import org.xwiki.captcha.CaptchaVerifier;
+import org.xwiki.configuration.ConfigurationSource;
+
+/**
+ * Provides access to the classes implementing Captcha.
+ *
+ * @version $Id$
+ * @since 2.1M2
+ */
+public class VelocityCaptchaService
+{
+    /** The configuration key for the.  */
+    private static final String IS_CAPTCHA_ENABLED_CFG_KEY = "captcha.internal.velocity.VelocityCaptchaService.enabled";
+
+    /** A Map of all captchas by their names. */
+    private Map<String, CaptchaVerifier> captchas;
+
+    /** A ConfigurationSource in which to look for whether the captcha should be enabled. */
+    private ConfigurationSource configuration;
+
+    /**
+     * The Constructor.
+     *
+     * @param captchas A Map of registered components which implement Captcha by their names
+     * @param configuration A ConfigurationSource in which to look for whether the captcha should be enabled
+     */
+    public VelocityCaptchaService(Map<String, CaptchaVerifier> captchas, ConfigurationSource configuration)
+    {
+        this.captchas = captchas;
+        this.configuration = configuration;
+    }
+
+    /**
+     * Get a {@link org.xwiki.captcha.CaptchaVerifier} from the service.
+     *
+     * @param captchaName The name of the type of captcha, use {@link #listCaptchaNames()} for a list
+     * @return A captcha object which can be used to check a specific answer for a given challange
+     * @throws CaptchaVerifierNotFoundException If the named VaptchaVerifier could not be found.
+     */
+    public CaptchaVerifier getCaptchaVerifier(String captchaName) throws CaptchaVerifierNotFoundException
+    {
+        if (captchas.get(captchaName) == null) {
+            throw new CaptchaVerifierNotFoundException(captchaName);
+        }
+        return new VelocityCaptchaVerifier(captchas.get(captchaName));
+    }
+
+    /** @return a List of the names of all registered classes implementing {@link org.xwiki.captcha.CaptchaVerifier}. */
+    public List<String> listCaptchaNames()
+    {
+        return new ArrayList(captchas.keySet());
+    }
+
+    /**
+     * If this is false, the captcha system will still work.
+     * It is for velocity scripts to determine whether captchas are needed.
+     *
+     * @return Is the captcha service enabled in the configuration.
+     */
+    public boolean isEnabled()
+    {
+        return configuration.getProperty(IS_CAPTCHA_ENABLED_CFG_KEY, Boolean.FALSE).booleanValue();
+    }
+}

Property changes on: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/VelocityCaptchaService.java
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision HeadURL
Name: svn:eol-style
   + native

Index: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/CaptchaVelocityContextInitializer.java
===================================================================
--- core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/CaptchaVelocityContextInitializer.java	(revision 0)
+++ core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/CaptchaVelocityContextInitializer.java	(revision 0)
@@ -0,0 +1,61 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.captcha.internal.velocity;
+
+import java.util.Map;
+
+import org.xwiki.component.annotation.Component;
+import org.xwiki.component.annotation.Requirement;
+import org.xwiki.captcha.CaptchaVerifier;
+import org.xwiki.velocity.VelocityContextInitializer;
+import org.xwiki.configuration.ConfigurationSource;
+
+import org.apache.velocity.VelocityContext;
+
+/**
+ * Loads VelocityCaptchaService into the Velocity context.
+ * 
+ * @version $Id$
+ * @since 2.1M2
+ */
+@Component("captchaservice")
+public class CaptchaVelocityContextInitializer implements VelocityContextInitializer
+{
+    /** The key to use for the captcha in the velocity context. */
+    public static final String VELOCITY_CONTEXT_KEY = "captchaservice";
+
+    /** A Map of all captchas by their hint. */
+    @Requirement(role = CaptchaVerifier.class)
+    private Map<String, CaptchaVerifier> captchas;
+
+    /** A ConfigurationSource in which to look for whether the captcha should be enabled. */
+    @Requirement
+    private ConfigurationSource configuration;
+
+    /**
+     * {@inheritDoc}
+     *
+     * @see org.xwiki.velocity.VelocityContextInitializer#initialize(VelocityContext)
+     */
+    public void initialize(VelocityContext context)
+    {
+        context.put(VELOCITY_CONTEXT_KEY, new VelocityCaptchaService(captchas, configuration));
+    }
+}

Property changes on: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/CaptchaVelocityContextInitializer.java
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision HeadURL
Name: svn:eol-style
   + native

Index: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/CaptchaVerifierNotFoundException.java
===================================================================
--- core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/CaptchaVerifierNotFoundException.java	(revision 0)
+++ core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/CaptchaVerifierNotFoundException.java	(revision 0)
@@ -0,0 +1,40 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.captcha.internal.velocity;
+
+/**
+ * Thrown when the velocity programmer tries to get a CaptchaVerifier which doesn't exist.
+ *
+ * @version $Id$
+ * @since 2.1M2
+ */
+public class CaptchaVerifierNotFoundException extends Exception
+{
+    /**
+     * The Constructor.
+     *
+     * @param captchaName The name of the CaptchaVerifier which was not found.
+     */
+    public CaptchaVerifierNotFoundException(String captchaName)
+    {
+        super("The CaptchaVerifier you are trying to get (" + captchaName 
+              + ") doesn't exist in the list, try $captchaservice.listCaptchaNames()");
+    }
+}

Property changes on: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/CaptchaVerifierNotFoundException.java
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision HeadURL
Name: svn:eol-style
   + native

Index: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/VelocityCaptchaVerifier.java
===================================================================
--- core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/VelocityCaptchaVerifier.java	(revision 0)
+++ core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/VelocityCaptchaVerifier.java	(revision 0)
@@ -0,0 +1,74 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.captcha.internal.velocity;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.xwiki.captcha.CaptchaVerifier;
+
+/**
+ * VelocityCaptchaVerifier wraps a CaptchaVerifier object and passes all calls to it and returns from it.
+ * It catches any Exceptions because Velocity is unable to catch exceptions and it never returns null
+ * because Velocity will not make an assignment if the output is null.
+ *
+ * @version $Id $
+ * @since future
+ */
+public class VelocityCaptchaVerifier implements CaptchaVerifier
+{
+    /** The internal captcha which this VelocityCaptcha wraps. */
+    private final CaptchaVerifier wrappedCaptcha;
+
+    /**
+     * The Constructor.
+     *
+     * @param toWrap A Captcha object which this VelocityCaptcha should wrap.
+     */
+    public VelocityCaptchaVerifier(CaptchaVerifier toWrap)
+    {
+        this.wrappedCaptcha = toWrap;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @see CaptchaVerifier#getUserId(HttpServletRequest)
+     */
+    public String getUserId(HttpServletRequest request)
+    {
+        String x = wrappedCaptcha.getUserId(request);
+        // If getUserId returns null, we should return "" because velocity will not assign null.
+        return (x == null) ? "" : x;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @see CaptchaVerifier#isAnswerCorrect(String, String)
+     */
+    public boolean isAnswerCorrect(String userId, String answer)
+    {
+        try {
+            return (userId.length() == 0) ? false : wrappedCaptcha.isAnswerCorrect(userId, answer);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+}

Property changes on: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/velocity/VelocityCaptchaVerifier.java
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision HeadURL
Name: svn:eol-style
   + native

Index: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractSoundCaptchaAction.java
===================================================================
--- core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractSoundCaptchaAction.java	(revision 0)
+++ core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractSoundCaptchaAction.java	(revision 0)
@@ -0,0 +1,60 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.captcha.internal;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import com.octo.captcha.module.web.sound.SoundToWavHelper;
+import com.octo.captcha.service.sound.SoundCaptchaService;
+
+/**
+ * Extensions of AbstractSoundCaptchaAction create wav audio captchas.
+ * 
+ * @version $Id $
+ * @since Future
+ */
+public abstract class AbstractSoundCaptchaAction extends AbstractCaptchaAction<SoundCaptchaService>
+{
+    /** Easily puts a captcha from the captchaService to the response object as a jpeg image. */
+    private final SoundToWavHelper helper = new SoundToWavHelper();
+
+    /**
+     * {@inheritDoc}
+     *
+     * @see AbstractCaptchaAction#execute(ActionMapping, ActionForm, HttpServletRequest, HttpServletResponse)
+     */
+    public ActionForward execute(ActionMapping actionMapping, ActionForm actionForm,
+                                 HttpServletRequest request, HttpServletResponse response)
+        throws Exception
+    {
+        this.helper.flushNewCaptchaToResponse(request,
+                                              response,
+                                              null,
+                                              getCaptchaService(),
+                                              getUserId(request),
+                                              request.getLocale());
+        return null;
+    }
+}

Property changes on: core/xwiki-captcha/src/main/java/org/xwiki/captcha/internal/AbstractSoundCaptchaAction.java
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision HeadURL
Name: svn:eol-style
   + native

Index: core/xwiki-captcha/src/main/resources/META-INF/components.txt
===================================================================
--- core/xwiki-captcha/src/main/resources/META-INF/components.txt	(revision 0)
+++ core/xwiki-captcha/src/main/resources/META-INF/components.txt	(revision 0)
@@ -0,0 +1,2 @@
+org.xwiki.captcha.internal.DefaultImageCaptchaAction
+org.xwiki.captcha.internal.velocity.CaptchaVelocityContextInitializer

Property changes on: core/xwiki-captcha/src/main/resources/META-INF/components.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Index: core/xwiki-captcha/pom.xml
===================================================================
--- core/xwiki-captcha/pom.xml	(revision 0)
+++ core/xwiki-captcha/pom.xml	(revision 0)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ *
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.xwiki.platform</groupId>
+    <artifactId>xwiki-core-parent</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <artifactId>xwiki-core-captcha</artifactId>
+  <name>XWiki Platform - Core - Captcha</name>
+  <packaging>jar</packaging>
+  <description>XWiki Platform - Core - Captcha</description>
+  <dependencies>
+    <!-- CaptchaActions are components -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-core-component-api</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <!-- CaptchaAction extends Action -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-core-action</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <!-- CaptchaVelocityContextInitializer needs ConfigurationSource to tell whether captchas should be enabled -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-core-configuration-api</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <!-- CaptchaVelocityContextInitializer needs access to VelocityContextInitializer -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-core-velocity</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <!-- Jcaptcha Api -->
+    <dependency>
+      <groupId>com.octo.captcha</groupId>
+      <artifactId>jcaptcha-api</artifactId>
+      <version>2.0-alpha-1-SNAPSHOT</version>
+    </dependency>
+    <!-- Jcaptcha -->
+    <dependency>
+      <groupId>com.octo.captcha</groupId>
+      <artifactId>jcaptcha</artifactId>
+      <version>2.0-alpha-1-SNAPSHOT</version>
+    </dependency>
+    <!-- For sound captcha integration -->
+    <dependency>
+      <groupId>com.octo.captcha</groupId>
+      <artifactId>jcaptcha-extension-sound-freetts</artifactId>
+      <version>2.0-alpha-1-SNAPSHOT</version>
+    </dependency>
+    <!-- Need servlet api for getting HttpSession id and flushing captcha to HttpResponse -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- AbstractCaptchaAction extends org.apache.struts.action.Action -->
+    <dependency>
+      <groupId>struts</groupId>
+      <artifactId>struts</artifactId>
+      <version>1.2.9</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <!--
+          Apply the Checkstyle configurations defined in the top level
+          pom.xml file
+        -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Property changes on: core/xwiki-captcha/pom.xml
___________________________________________________________________
Name: svn:keywords
   + Author Id Revision HeadURL
Name: svn:eol-style
   + native