Return-Path: Delivered-To: apmail-incubator-jspwiki-commits-archive@minotaur.apache.org Received: (qmail 31891 invoked from network); 19 Apr 2009 22:33:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 19 Apr 2009 22:33:01 -0000 Received: (qmail 61035 invoked by uid 500); 19 Apr 2009 22:33:01 -0000 Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org Received: (qmail 61018 invoked by uid 500); 19 Apr 2009 22:33:01 -0000 Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-commits@incubator.apache.org Received: (qmail 61009 invoked by uid 99); 19 Apr 2009 22:33:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Apr 2009 22:33:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Apr 2009 22:33:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 05BBE238896D; Sun, 19 Apr 2009 22:32:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r766541 - in /incubator/jspwiki/trunk: ./ src/java/org/apache/wiki/ src/java/org/apache/wiki/action/ src/java/org/apache/wiki/ui/stripes/ Date: Sun, 19 Apr 2009 22:32:39 -0000 To: jspwiki-commits@incubator.apache.org From: ajaquith@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090419223240.05BBE238896D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ajaquith Date: Sun Apr 19 22:32:39 2009 New Revision: 766541 URL: http://svn.apache.org/viewvc?rev=766541&view=rev Log: Random nips and tucks too minor to note elsewhere. Bumped Changelog and Release. Modified: incubator/jspwiki/trunk/ChangeLog incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/HandlerInfo.java incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java Modified: incubator/jspwiki/trunk/ChangeLog URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=766541&r1=766540&r2=766541&view=diff ============================================================================== --- incubator/jspwiki/trunk/ChangeLog (original) +++ incubator/jspwiki/trunk/ChangeLog Sun Apr 19 22:32:39 2009 @@ -1,3 +1,51 @@ +2009-04-19 Andrew Jaquith + + * 3.0.0-svn-103 + + * Fixed bug in JCRWikiPage.isAttachment() that caused non-existent pages + to be erroneously treated as attachments. + + * Fixed NPE in VariableManager. + + * Fixed bug in WikiEngine.getFinalPageName() that was causing + page lookups to fail horribly. Made PageNameResolver implementations + consistent in terms of how they treat page variants that are not found. + + * Fixed bug where the WikiPage references stored by WikiActionBeanContext + and the underlying WikiContext were not synchronized. As a result, + AbstractPageActionBean's m_page field is now private. + + * Massive refactoring to EditActionBean, and related spam-protection + classes. Bug-fix to ContentManager's page-save task. + Editing actually works again! More fixes coming later. + + * WikiPageTypeConverter's behavior changed. Unless the string + passed to convert() is a special page, WikiPageTypeConverter is + now guaranteed to return a WikiPage (which may or may not be + persisted in the repository). SpecialPage names still cause + the converter to return null, by design. The result of this + change is that editing/viewing functions don't "break" if + the page doesn't exist. + + * Fixed bug in InsertPageTag caused by recent introduction of + PageNotFoundException, that was causing content not to be properly + inserted. Fixed bugs with similar cause in LinkTag. + + * Fixed NPE in PermissionTag. + + * The @SpamProtect annotation and SpamProtect tag are now fully + functional. Any JSP that submits to a WikiActionBean whose handler + method is annotated with @SpamProtect receives the protection + automatically, thanks to SpamInterceptor and collaborating + SpamFilter. All that is needed is to add the tag + as a child element to the
+ or elements. The same three-way check used in the + old Edit.jsp is still done: random "trap" parameter; random + "token" parameter; UTF-8 check parameter. To help ActionBean + unit test classes run with protected handler events, the + static method TestEngine.addSpamProtectParams(MockRoundtrip) + was created. + 2009-04-16 Andrew Jaquith * 3.0.0-svn-102 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=766541&r1=766540&r2=766541&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Apr 19 22:32:39 2009 @@ -77,7 +77,7 @@ *

* If the build identifier is empty, it is not added. */ - public static final String BUILD = "102"; + public static final String BUILD = "103"; /** * This is the generic version string you should use Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html?rev=766541&r1=766540&r2=766541&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/package.html Sun Apr 19 22:32:39 2009 @@ -450,11 +450,10 @@ to "display JSPs" that render pages. -

  • {@link - net.sourceforge.stripes.ajax.JavaScriptResolution} - converts a Java - object web to a web of JavaScript objects and arrays, and stream the - JavaScript back to the client. The output of this resolution can be - evaluated in JavaScript using the eval() function, and will return a +
  • {@link net.sourceforge.stripes.ajax.JavaScriptResolution} + - converts a Java object web to a web of JavaScript objects and arrays, + and stream the JavaScript back to the client. The output of this resolution + can be evaluated in JavaScript using the eval() function, and will return a reference to the top level JavaScript object.
  • {@link net.sourceforge.stripes.action.RedirectResolution} - redirects the user Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/HandlerInfo.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/HandlerInfo.java?rev=766541&r1=766540&r2=766541&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/HandlerInfo.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/HandlerInfo.java Sun Apr 19 22:32:39 2009 @@ -365,7 +365,7 @@ * For example, suppose the HandlerPermission annotation for the * view() handler method is *

    - *
    @HandlerPermission(permissionClass=PagePermission.class, target="${page.qualifiedName}", actions=PagePermission.VIEW_ACTION)
    + *
    @HandlerPermission(permissionClass=PagePermission.class, target="${page.path}", actions=PagePermission.VIEW_ACTION)
    *

    * If object is a ViewActionBean whose getPage() * property returns page "Main" in the wiki named "Default", the returned Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java?rev=766541&r1=766540&r2=766541&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiRuntimeConfiguration.java Sun Apr 19 22:32:39 2009 @@ -36,9 +36,11 @@ * by the {@link net.sourceforge.stripes.controller.StripesFilter}, so it is * one of the very first things that happens. The {@link #init()} method * performs all of the initialization tasks. After initialization, the current - * StripesConfiguration can be retrieved at any time by calling {@link }. + * StripesConfiguration can be retrieved at any time by calling + * {@link #getConfiguration(ServletContext)}. * * @author Andrew Jaquith + * @since 3.0 */ public class WikiRuntimeConfiguration extends RuntimeConfiguration {