You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2009/04/20 00:32:39 UTC
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/
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 <ajaquith AT apache DOT org>
+
+ * 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
+ <wiki:SpamProtect /> as a child element to the <form>
+ or <s:form> 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 <ajaquith AT apache DOT org>
* 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 @@
* <p>
* 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.</li>
</ul>
</li>
- <li><strong>{@link
- net.sourceforge.stripes.ajax.JavaScriptResolution}</strong> - 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
+ <li><strong>{@link net.sourceforge.stripes.ajax.JavaScriptResolution}</strong>
+ - 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.</li>
<li><strong>{@link
net.sourceforge.stripes.action.RedirectResolution}</strong> - 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
* <code>view()</code> handler method is
* </p>
- * <blockquote><code>@HandlerPermission(permissionClass=PagePermission.class, target="${page.qualifiedName}", actions=PagePermission.VIEW_ACTION)</code></blockquote>
+ * <blockquote><code>@HandlerPermission(permissionClass=PagePermission.class, target="${page.path}", actions=PagePermission.VIEW_ACTION)</code></blockquote>
* <p>
* If <code>object</code> is a ViewActionBean whose <code>getPage()</code>
* 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
{