jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r896593 - in /incubator/jspwiki/trunk: ./ src/java/org/apache/wiki/ src/java/org/apache/wiki/content/ src/java/org/apache/wiki/content/inspect/ src/java/org/apache/wiki/tags/ src/java/org/apache/wiki/ui/stripes/
Date Wed, 06 Jan 2010 18:17:02 GMT
Author: metskem
Date: Wed Jan  6 18:17:01 2010
New Revision: 896593

URL: http://svn.apache.org/viewvc?rev=896593&view=rev
Log:
3.0.0-svn-196
        
        * got rid of a bunch of JavaDoc warnings
        
        * minor tweaks to build.xml (JSPWIKI-620), webtests
          don't work yet => future work

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/AkismetInspector.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/AsirraCaptcha.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/BanListInspector.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/BotTrapInspector.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Challenge.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/ChangeRateInspector.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Finding.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Inspection.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/LinkCountInspector.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/PatternInspector.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/UserInspector.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/package.html
    incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SpamProtectTag.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/SpamInterceptor.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Jan  6 18:17:01 2010
@@ -1,3 +1,12 @@
+2010-01-06 Harry Metske <metskem@apache.org>
+
+        * 3.0.0-svn-196
+        
+        * got rid of a bunch of JavaDoc warnings
+        
+        * minor tweaks to build.xml (JSPWIKI-620), webtests
+          don't work yet => future work
+        
 2010-01-06 Andrew Jaquith <ajaquith AT apache DOT org>
 
         * 3.0.0-svn-195

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Wed Jan  6 18:17:01 2010
@@ -311,6 +311,9 @@
     <mkdir dir="${install.src}" />
     <delete dir="${release.dir}" />
     <mkdir dir="${release.dir}" />
+    <delete quiet="true">
+      <fileset dir="${war.build}" includes="JSPWiki-jsp.jar,jasper-runtime-*.jar,commons-el-*.jar,web-fragment.xmlf,web.xml"/>
+    </delete>
   </target>
 
   <!--  Builds the jar of all compiled class files -->
@@ -362,12 +365,8 @@
    
   <target name="war" depends="installinit,jar,jar-compiled-jsps,compressedjs"
           description="Builds the WAR file for installation.">
-    <mkdir dir="${war.build}" />
     
     <!-- Build war.xml and the classes/properties files -->
-    <delete quiet="true">
-      <fileset dir="${war.build}" includes="JSPWiki-jsp.jar,jasper-runtime-*.jar,commons-el-*.jar,web-fragment.xmlf,web.xml"/>
-    </delete>
     <copy toDir="${war.build}" overwrite="true">
       <fileset dir="etc">
         <include name="jspwiki.properties" />
@@ -410,8 +409,13 @@
           file so that requests for the JSPs are mapped to the
           servlets generated in step 1.
 
+       Precompiling jsp's immensely speeds up web unit tests.
+       We still copy the source jsp's into the war because TemplateManager
+       depends on it.
+       
        To use JSP pre-compilation, set the "compile.jsps"
        property in build.properties to "true".
+       
   -->
   <target name="jar-compiled-jsps" depends="jar" if="war.compile.jsps">
     <taskdef classname="org.apache.jasper.JspC" name="jasper2">
@@ -483,9 +487,7 @@
        "static.user" and "static.group" in build.properties.
        These should be set to the Unix runtime user and group
        that should own the static files, for example the
-       user "apache" and "daemon" group. If the "static.user"
-       property is not supplied, war-tomcat skips the static
-       content generation step.
+       user "apache" and "daemon" group.
 
        If not present, the target is skipped.
        File permissions are owner and group read (440),
@@ -809,7 +811,7 @@
        - 'admin' with password 'myP@5sw0rd' and roles of 'Authenticated', 'Admin'
        These are the same as the test users in tests/org.apache.wiki.auth.Users.
   -->
-  <target name="webtests" depends="jar,tests-init,jartests,tests-db-init,war">
+  <target name="webtests" depends="jar,tests-init,jartests,tests-db-init,jar-compiled-jsps,war">
     <mkdir dir="${webtests.temp}" />
     <mkdir dir="${webtests.build}" />
   

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Wed Jan  6 18:17:01 2010
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "195";
+    public static final String     BUILD         = "196";
 
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java Wed Jan 
6 18:17:01 2010
@@ -70,8 +70,6 @@
 import org.priha.RepositoryManager;
 import org.priha.util.ConfigurationException;
 
-import com.sun.org.apache.bcel.internal.generic.GETSTATIC;
-
 
 /**
  *  Provides access to the content repository.  Unlike previously, in JSPWiki

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/AkismetInspector.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/AkismetInspector.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/AkismetInspector.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/AkismetInspector.java
Wed Jan  6 18:17:01 2010
@@ -34,7 +34,7 @@
     }
     
     /**
-     * Always returns {@link Scope#REQUEST}.
+     * Always returns {@link Inspector.Scope#REQUEST}.
      */
     public Scope getScope()
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/AsirraCaptcha.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/AsirraCaptcha.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/AsirraCaptcha.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/AsirraCaptcha.java Wed
Jan  6 18:17:01 2010
@@ -80,10 +80,10 @@
  * </ol>
  * <p>
  * This implementation splits processing of the Asirra test into two parts.
- * Method {@link #formContent(WikiContext)}, establishes the Asirra session
+ * Method {@link #formContent(WikiActionBeanContext)}, establishes the Asirra session
  * (step 1 above), parses the response (step 2), extracts the session ID and
  * image URLs, and writes all of this information to the page. Method
- * {@link #check(Inspection)} extracts the user's answers, assembles them into a
+ * {@link #check(WikiActionBeanContext)} extracts the user's answers, assembles them into
a
  * response string, sends the response back to Asirra (step 3) and evaluates the
  * response (step 4).
  * </p>
@@ -219,7 +219,7 @@
 
     /**
      * Calls out to Asirra and returns a new challenge response, which
-     * will be shown to the user via {@link #formContent(WikiContext)}.
+     * will be shown to the user via {@link #formContent(WikiActionBeanContext)}.
      * @return the response from Asirra as a String
      * @throws IOException if Asirra cannot be contacted, or if the response
      * is malformed

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/BanListInspector.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/BanListInspector.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/BanListInspector.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/BanListInspector.java
Wed Jan  6 18:17:01 2010
@@ -10,13 +10,13 @@
 /**
  * {@link Inspector} implementation that checks to see if the user's IP address
  * is on the list of banned addresses on the {@link ReputationManager}. If it
- * is, {@link #inspect(Inspection, String, Change)} will return a Finding with
+ * is, {@link #inspect(Inspection, Change)} will return a Finding with
  * {@link Finding.Result#FAILED}; otherwise {@code null}.
  */
 public class BanListInspector implements Inspector
 {
     /**
-     * Always returns {@link Scope#REQUEST}.
+     * Always returns {@link Inspector.Scope#REQUEST}.
      */
     public Scope getScope()
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/BotTrapInspector.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/BotTrapInspector.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/BotTrapInspector.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/BotTrapInspector.java
Wed Jan  6 18:17:01 2010
@@ -25,7 +25,7 @@
     public static final String REQ_SPAM_PARAM = "__wikiCheck";
 
     /**
-     * Always returns {@link Scope#REQUEST}.
+     * Always returns {@link Inspector.Scope#REQUEST}.
      */
     public Scope getScope()
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Challenge.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Challenge.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Challenge.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Challenge.java Wed Jan
 6 18:17:01 2010
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 
-import org.apache.wiki.WikiContext;
 import org.apache.wiki.tags.SpamProtectTag;
 import org.apache.wiki.ui.stripes.SpamInterceptor;
 import org.apache.wiki.ui.stripes.SpamProtect;
@@ -20,7 +19,7 @@
  * <ol>
  * <li><strong>formContent</strong>. When a JSP containing a &lt;SpamProtect&gt;
  * tag is encountered, the {@link SpamProtectTag#doEndTag()} method calls
- * {@link #formContent(WikiContext)} to generate any content needed to be
+ * {@link #formContent(WikiActionBeanContext)} to generate any content needed to be
  * included in the &lt;form&gt; element of the page. Note that the
  * &lt;SpamProtect&gt tag is not actually guaranteed to be inside of the form
  * element, but in practice, it should be.</li>
@@ -44,7 +43,7 @@
      * encountered on the JSP.
      * 
      * @param actionBeanContext the current ActionBeanContext. Callers can obtain the complete
-     *            request context by calling {@link ActionBeanContext#getRequest().
+     *            request context by calling {@link net.sourceforge.stripes.action.ActionBeanContext#getRequest()}.
      * @return the form content
      */
     public String formContent( WikiActionBeanContext actionBeanContext ) throws IOException;
@@ -53,7 +52,7 @@
      * Tests the Challenge.
      * 
      * @param actionBeanContext the current ActionBeanContext. Callers can obtain the complete
-     *            request context by calling {@link ActionBeanContext#getRequest().
+     *            request context by calling {@link net.sourceforge.stripes.action.ActionBeanContext#getRequest()}.
      * @return {@code true} if the test succeeded; {@code false} otherwise
      */
     public boolean check( WikiActionBeanContext actionBeanContext ) throws IOException;

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/ChangeRateInspector.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/ChangeRateInspector.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/ChangeRateInspector.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/ChangeRateInspector.java
Wed Jan  6 18:17:01 2010
@@ -39,7 +39,7 @@
     private int m_limitSimilarChanges = 2;
 
     /**
-     * Always returns {@link Scope#FIELD}.
+     * Always returns {@link Inspector.Scope#FIELD}.
      */
     public Scope getScope()
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Finding.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Finding.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Finding.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Finding.java Wed Jan
 6 18:17:01 2010
@@ -18,7 +18,7 @@
 public class Finding
 {
     /**
-     * The result of the {@link Inspector#inspect(Inspection, String, Change)}
+     * The result of the {@link Inspector#inspect(Inspection, Change)}
      * method.
      */
     public static enum Result

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Inspection.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Inspection.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Inspection.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/Inspection.java Wed Jan
 6 18:17:01 2010
@@ -78,7 +78,7 @@
      * Adds an InspectionListener for a supplied Topic. The listner object's
      * {@link InspectionListener#changedScore(Inspection, Finding)} method will
      * be called whenever an Inspector's
-     * {@link Inspector#inspect(Inspection, String, Change)} method returns a
+     * {@link Inspector#inspect(Inspection, Change)} method returns a
      * Finding whose Topic is equal to {@code topic}.
      * 
      * @param topic the Topic to listen for

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/LinkCountInspector.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/LinkCountInspector.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/LinkCountInspector.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/LinkCountInspector.java
Wed Jan  6 18:17:01 2010
@@ -37,7 +37,7 @@
     private int m_maxUrls = 10;
 
     /**
-     * Always returns {@link Scope#FIELD}.
+     * Always returns {@link Inspector.Scope#FIELD}.
      */
     public Scope getScope()
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/PatternInspector.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/PatternInspector.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/PatternInspector.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/PatternInspector.java
Wed Jan  6 18:17:01 2010
@@ -46,7 +46,7 @@
     private static final String LISTVAR = "spamwords";
 
     /**
-     * Always returns {@link Scope#FIELD}.
+     * Always returns {@link Inspector.Scope#FIELD}.
      */
     public Scope getScope()
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/UserInspector.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/UserInspector.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/UserInspector.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/UserInspector.java Wed
Jan  6 18:17:01 2010
@@ -23,7 +23,7 @@
     private boolean m_ignoreAuthenticated = false;
 
     /**
-     * Always returns {@link Scope#REQUEST}.
+     * Always returns {@link Inspector.Scope#REQUEST}.
      */
     public Scope getScope()
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/package.html
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/package.html?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/package.html (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/package.html Wed Jan
 6 18:17:01 2010
@@ -5,11 +5,11 @@
 spam. Content may be scored by initializing an {@link
 org.apache.wiki.content.inspect.Inspection} object and then calling the
 {@link
-org.apache.wiki.content.inspect.Inspection#inspect(String,Change)}
+org.apache.wiki.content.inspect.Inspection#inspect(Change...)}
 method. The Inspection's {@code inspect} method, in turn, iterates
 through a variety of previously-configured {@link
 org.apache.wiki.content.inspect.Inspector} objects and calls the {@link
-org.apache.wiki.content.inspect.Inspector#inspect(Inspection,String,Change)}
+org.apache.wiki.content.inspect.Inspector#inspect(Inspection,Change)}
 method for each one. The Inspector is free to perform whatever
 evaluations it wishes. Upon exit, each Inspector's {@code inspect}
 method is expected to return an array of {@link
@@ -55,7 +55,7 @@
 	org.apache.wiki.content.inspect.Inspector} interface specifies how to
 	implement a particular strategy for inspecting content. The Inspector
 	has just one primary method: {@link
-	org.apache.wiki.content.inspect.Inspector#inspect(Inspection,String,Change)}
+	org.apache.wiki.content.inspect.Inspector#inspect(Inspection, Change)}
 	which returns an array of Findings. Each Finding is constructed with the {@link
 	org.apache.wiki.content.inspect.Topic} that the finding applies to,
 	plus the {@link org.apache.wiki.content.inspect.Finding.Result}

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SpamProtectTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SpamProtectTag.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SpamProtectTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/SpamProtectTag.java Wed Jan  6 18:17:01
2010
@@ -51,7 +51,7 @@
  * annotated with the {@link org.apache.wiki.ui.stripes.SpamProtect} annotation.
  * If a Challenge test is required, the required content will be written to the
  * page also, based on the results of
- * {@link Challenge#formContent(org.apache.wiki.content.inspect.Inspection)}.
+ * {@link Challenge#formContent(WikiActionBeanContext)}.
  * </p>
  * <p>
  * This tag has one optional; attribute, {@code challenge}. If supplied, a
@@ -95,7 +95,7 @@
  * with.</li>
  * <li><b>Any parameters needed by the configured {@link Challenge}</b>,
if a
  * Challenge is needed. The appropriate Challenge inspector's method
- * {@link Challenge#formContent(org.apache.wiki.WikiContext)} will be called to
+ * {@link Challenge#formContent(WikiActionBeanContext)} will be called to
  * generate the relevant form parameters or any other markup needed.</li>
  * </ol>
  */
@@ -143,9 +143,9 @@
 
     /**
      * Sets the {@code challenge} attribute for this tag. Valid values are
-     * {@code password} for {@link Challenge.Request#PASSWORD} or {@code
-     * captcha} for {@link Challenge.Request#CAPTCHA}. If not supplied, the
-     * challenge will default to {@link Challenge.Request#CAPTCHA_ON_DEMAND}.
+     * {@code password} for {@link org.apache.wiki.content.inspect.Challenge.Request#PASSWORD}
or {@code
+     * captcha} for {@link org.apache.wiki.content.inspect.Challenge.Request#CAPTCHA}. If
not supplied, the
+     * challenge will default to {@link org.apache.wiki.content.inspect.Challenge.Request#CAPTCHA_ON_DEMAND}.
      * 
      * @param challenge the type of challenge the user should see
      */

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/SpamInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/SpamInterceptor.java?rev=896593&r1=896592&r2=896593&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/SpamInterceptor.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/SpamInterceptor.java Wed Jan
 6 18:17:01 2010
@@ -53,16 +53,17 @@
 /**
  * <p>
  * In collaboration with {@link org.apache.wiki.tags.SpamProtectTag}, intercepts
- * an ActionBean after the {@link LifecycleStage#CustomValidation} to determine
- * whether an ActionBean contains spam. An ActionBean contains spam if an
- * {@link Inspection} produces a {@link Topic#SPAM} score that falls lower than
+ * an ActionBean after the {@link net.sourceforge.stripes.controller.LifecycleStage#CustomValidation}

+ * to determine whether an ActionBean contains spam. 
+ * An ActionBean contains spam if an {@link Inspection} produces 
+ * a {@link Topic#SPAM} score that falls lower than
  * the threshold configured for the WikiEngine (which is always a negative
  * number).
  * </p>
  * <p>
  * SpamInterceptor fires only when the targeted event handler method is
  * annotated with the {@link SpamProtect} annotation. It fires after the
- * {@link LifecycleStage#EventHandlingCustomValidation} stage; that is, after
+ * {@link net.sourceforge.stripes.controller.LifecycleStage#CustomValidation} stage; that
is, after
  * ActionBean and event handler resolution, after parameter binding, and after
  * other all standard and custom validation routines have run. This ensures that
  * if the content needs to be inspected to see if the user needs to complete a
@@ -282,13 +283,13 @@
      * Retrieves the encrypted parameter {@link #CHALLENGE_REQUEST_PARAM} from
      * the HTTP request and returns its value. If the parameter is not found in
      * the request, we assume that the request was made by a spammer or other
-     * naughty person, and the method returns {@link Challenge.Request#NONE}.
+     * naughty person, and the method returns {@link org.apache.wiki.content.inspect.Challenge.Request#OMITTED}.
      * Otherwise, the value of the parameter is decrypted and returned. This
      * method is guaranteed to return a non-{@code null} value.
      * 
      * @param actionBeanContext the action bean context
      * @return the Challenge that was requested, or
-     *         {@link Challenge.Request#NONE} if the parameter
+     *         {@link org.apache.wiki.content.inspect.Challenge.Request#OMITTED} if the parameter
      *         {@link #CHALLENGE_REQUEST_PARAM} was not found.
      */
     protected Challenge.Request getChallengeRequest( ActionBeanContext actionBeanContext
)



Mime
View raw message