Return-Path: Delivered-To: apmail-incubator-jspwiki-commits-archive@minotaur.apache.org Received: (qmail 61738 invoked from network); 30 Jan 2010 15:40:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Jan 2010 15:40:51 -0000 Received: (qmail 76598 invoked by uid 500); 30 Jan 2010 15:40:51 -0000 Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org Received: (qmail 76577 invoked by uid 500); 30 Jan 2010 15:40:51 -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 76568 invoked by uid 99); 30 Jan 2010 15:40:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Jan 2010 15:40:51 +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; Sat, 30 Jan 2010 15:40:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7582D23889DA; Sat, 30 Jan 2010 15:40:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r904801 - in /incubator/jspwiki/trunk: ChangeLog src/java/org/apache/wiki/Release.java Date: Sat, 30 Jan 2010 15:40:27 -0000 To: jspwiki-commits@incubator.apache.org From: ajaquith@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100130154027.7582D23889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ajaquith Date: Sat Jan 30 15:40:27 2010 New Revision: 904801 URL: http://svn.apache.org/viewvc?rev=904801&view=rev Log: Version/changelog bump. Modified: incubator/jspwiki/trunk/ChangeLog incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Modified: incubator/jspwiki/trunk/ChangeLog URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=904801&r1=904800&r2=904801&view=diff ============================================================================== --- incubator/jspwiki/trunk/ChangeLog (original) +++ incubator/jspwiki/trunk/ChangeLog Sat Jan 30 15:40:27 2010 @@ -1,3 +1,56 @@ +2010-01-30 Andrew Jaquith + + * 3.0.0-svn-201 aka the JSP Consolidation Checkin + + * [JSPWIKI-578] Eliminated top-level JSPs for Wiki.jsp, + PageInfo.jsp, Diff.jsp, Delete.jsp and Attachments.jsp. + The relevant ActionBeans are still bound to these URLs + (except PageInfo.jsp), but there are no longer physical + JSPs for these top-level paths. The template JSPs in + /templates/default now contain all of the formatting + and markup and are mostly HTML and JSTL. At the moment, + ActionBeans all forward to to hard-wired template JSP + paths in /templates/default. A "TemplateResolution" + class that makes forwards dynamic based on the current + template will come a little later. + + * Added convenience accessors getHistory() and + getAttachments() to AbstractPageActionBean so that + subclasses can inherit them. This also means template JSPs + now have easy JSTL access to page history and attachments. + + * Added option to PageTimeComparator to allow descending + order sorts, used by AbstractPageActionBean. Also replaced + several spurious uses of the default constructor that + should have used the static instance instead. + + * Fixed bug in AttachmentActionBean that prevented the + size of uploaded attachments from being seen. + + * Fixed bug in DeleteActionBean that prevented attachments + from being deleted properly. + + * Fixed bug in EditActionBean that prevented the author from + being correctly set when the user was already authenticated. + + * Added methods getCreated() and getChangeNote() to WikiPage + and JCRWikiPage. Fixed bug in ContentManager that was + preventing creation and modification times from being + correctly set upon save. + + * Added new JspFunctions class for convenient "short formatting" + of file names, ISO8601 date formatting, and the attachments + tab name (localized). These replace scriptlet code formerly + located in the old top-level Wiki.jsp and elsewhere. For example, + to output an ISO8601 date, JSPs can simply use a JSTL expression + like this: "${wiki:iso8601date(att.lastModified)}". + + * TabTag now accepts two new attributes, which can be used + in place of the "url" attribute: "beanclass" and "event". + These are used to specify ActionBean names and event, and + are used in the same manner as . TabTag + also now accepts child tags to make this easier. + 2010-01-21 Andrew Jaquith * 3.0.0-svn-200 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=904801&r1=904800&r2=904801&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original) +++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sat Jan 30 15:40:27 2010 @@ -77,7 +77,7 @@ *

* If the build identifier is empty, it is not added. */ - public static final String BUILD = "200"; + public static final String BUILD = "201"; /** * This is the generic version string you should use