[jboss-cvs] jboss-seam/src/main/org/jboss/seam/captcha ...

[Gavin King]

  User: gavin   
  Date: 07/02/14 02:48:06

  Modified:    src/main/org/jboss/seam/captcha    Captcha.java
                        CaptchaImage.java
  Removed:     src/main/org/jboss/seam/captcha    CaptchaService.java
  Log:
  simplify
  
  Revision  Changes    Path
  1.4       +2 -2      jboss-seam/src/main/org/jboss/seam/captcha/Captcha.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Captcha.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/captcha/Captcha.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Captcha.java	14 Feb 2007 07:36:27 -0000	1.3
  +++ Captcha.java	14 Feb 2007 07:48:06 -0000	1.4
  @@ -19,7 +19,7 @@
    */
   @Name("org.jboss.seam.captcha.captcha")
   @Scope(ScopeType.PAGE)
  - at Install(dependencies="org.jboss.seam.captcha.captchaService")
  + at Install(dependencies="org.jboss.seam.captcha.captchaImage")
   public class Captcha implements Serializable
   {
      private String id;
  @@ -33,7 +33,7 @@
      
      boolean validateResponse(String response)
      {
  -      boolean valid = CaptchaService.instance().validateResponseForID(id, response);
  +      boolean valid = CaptchaImage.instance().validateResponse(id, response);
         if (!valid) 
         {
            init();
  
  
  
  1.4       +30 -3     jboss-seam/src/main/org/jboss/seam/captcha/CaptchaImage.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CaptchaImage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/captcha/CaptchaImage.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- CaptchaImage.java	14 Feb 2007 07:38:40 -0000	1.3
  +++ CaptchaImage.java	14 Feb 2007 07:48:06 -0000	1.4
  @@ -12,15 +12,19 @@
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   
  +import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
  +import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.servlet.AbstractResource;
   
   import com.octo.captcha.service.CaptchaServiceException;
  +import com.octo.captcha.service.image.DefaultManageableImageCaptchaService;
  +import com.octo.captcha.service.image.ImageCaptchaService;
   
   /**
    * Provides Captcha image resources
  @@ -30,10 +34,33 @@
   @Startup
   @Scope(APPLICATION)
   @Name("org.jboss.seam.captcha.captchaImage")
  - at Install(precedence = BUILT_IN, dependencies="org.jboss.seam.captcha.captchaService")
   @Intercept(NEVER)
  + at Install(precedence = BUILT_IN,  
  +         classDependencies="com.octo.captcha.service.image.ImageCaptchaService")
   public class CaptchaImage extends AbstractResource
   {
  +   private ImageCaptchaService service;
  +   
  +   public static CaptchaImage instance()
  +   {
  +      if ( !Contexts.isApplicationContextActive() )
  +      {
  +         throw new IllegalStateException("No application context active");
  +      }
  +      return (CaptchaImage) Contexts.getApplicationContext().get(CaptchaImage.class);
  +   }
  +   
  +   public boolean validateResponse(String id, String response)
  +   {
  +      return service.validateResponseForID(id, response);
  +   }
  +   
  +   @Create
  +   public void create()
  +   {
  +      service = new DefaultManageableImageCaptchaService();
  +   }
  +   
      @Override
      protected String getResourcePath()
      {
  @@ -52,8 +79,7 @@
   
            String captchaId = request.getQueryString();
   
  -         BufferedImage challenge = CaptchaService.instance()
  -               .getImageChallengeForID( captchaId, request.getLocale() );
  +         BufferedImage challenge = service.getImageChallengeForID( captchaId, request.getLocale() );
   
            ImageIO.write(challenge, "jpeg", out);
         }
  @@ -80,4 +106,5 @@
         response.getOutputStream().flush();
         response.getOutputStream().close();
      }
  +   
   }