Author: ajaquith
Date: Tue Feb 23 22:04:43 2010
New Revision: 915546
URL: http://svn.apache.org/viewvc?rev=915546&view=rev
Log:
Version bump and changelog.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
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=915546&r1=915545&r2=915546&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Feb 23 22:04:43 2010
@@ -1,3 +1,40 @@
+2010-02-23 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 3.0.0-svn-208
+
+ * Useful tweaks to the AJAX-related Stripes JavaScript. The
+ client-side JavaScript now injects validation errors and messages
+ that were generated server-side by an EventResolution, using the same
+ prefixes and headers defined in CoreResources for "normal" JSP
+ validation errors and messages. Generation of an EventResolution
+ for AJAX methods that generate errors is automatic when the
+ event method is annotated with @AjaxEvent. Practically speaking,
+ what it means is this: to call an Stripes method via Ajax, just
+ annotate the method with @AjaxEvent. Then, client-side scripts
+ need only call the JavaScript function Stripes.submitFormEvent().
+ The rest is MAGIC.
+
+ * Captcha interface gains an isEnabled() method to allow
+ SpamProtect tag to check whether the CAPTCHA is operational
+ before generating output. This is required in stand-alone or
+ testing scenarios where an outbound network connection cannot
+ be assumed.
+
+ * Moved the admin-related JSPs to the templates directory.
+ Added a new layout JSP, StaticLayout.jsp, that is used with
+ template JSPs that do not need dynamic content, such as
+ Install.jsp. Among other things, this allows admin-related
+ JSPs to look more like ordinary pages, and use the same CSS.
+
+ * Tweaked TemplateManager to make the "resource resolver" initialize
+ safely even when the WikiEngine does not. This means the 'templates'
+ JSTL scripting variable can be used everywhere, for example in
+ Install.jsp, Error.jsp or any pages that must load safely.
+
+ * Moved all images in top-level /images directory to template
+ /images dir, and made code/JSP changes to make sure they can
+ be "found" as needed by the TemplateManager resource resolver.
+
2010-02-20 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-207
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp?rev=915546&r1=915545&r2=915546&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
Tue Feb 23 22:04:43 2010
@@ -41,41 +41,41 @@
<th class="changenote"><fmt:message key="info.changenote" /></th>
</tr>
- <c:forEach var="att" items="${wikiActionBean.attachments}" >
+ <c:forEach var="attachment" items="${wikiActionBean.attachments}" >
<tr>
<%-- The 'title' attribute is used to sort empty cells --%>
- <td title="${att.contentType}">
- <div class="${fn:replace(att.contentType,'/','-')}"> </div>
+ <td title="${attachment.contentType}">
+ <div
class="${fn:replace(attachment.contentType,'/','-')}"> </div>
</td>
- <td title="${att.name}">
+ <td title="${attachment.name}">
<s:link beanclass="org.apache.wiki.action.AttachmentActionBean"
event="download">
- <s:param name="page" value="${att.path}" />
- ${wiki:shorten(att.name,30)}
+ <s:param name="page" value="${attachment.path}" />
+ ${wiki:shorten(attachment.name,30)}
</s:link>
</td>
<td style="white-space:nowrap;text-align:right;">
- <fmt:formatNumber value="${att.size div 1000}"
maxFractionDigits="1" minFractionDigits="1" /> <fmt:message
key="info.kilobytes" />
+ <fmt:formatNumber value="${attachment.size div 1000}"
maxFractionDigits="1" minFractionDigits="1" /> <fmt:message
key="info.kilobytes" />
</td>
- <c:set var="attTitle"><fmt:message key="attach.moreinfo.title"
/></c:set>
+ <c:set var="attachmentTitle"><fmt:message
key="attach.moreinfo.title" /></c:set>
<td style="text-align:center;">
- <s:link beanclass="org.apache.wiki.action.ViewActionBean"
event="info" title="${attTitle}">
- <s:param name="page" value="${att.path}" />
- ${att.version}
+ <s:link beanclass="org.apache.wiki.action.ViewActionBean"
event="info" title="${attachmentTitle}">
+ <s:param name="page" value="${attachment.path}" />
+ ${attachment.version}
</s:link>
</td>
- <td jspwiki:sortvalue="${wiki:iso8601date(att.lastModified)}">
- <fmt:formatDate value="${att.lastModified}"
pattern="${prefs.TimeFormat}" timeZone="${prefs.TimeZone}" />
+ <td
jspwiki:sortvalue="${wiki:iso8601date(attachment.lastModified)}">
+ <fmt:formatDate value="${attachment.lastModified}"
pattern="${prefs.TimeFormat}" timeZone="${prefs.TimeZone}" />
</td>
<td style="white-space:nowrap;" ><wiki:Author/></td>
<wiki:Permission permission="delete">
<td>
<s:form beanclass="org.apache.wiki.action.DeleteActionBean">
- <s:param name="page" value="${att.path}" />
+ <s:param name="page" value="${attachment.path}" />
<s:submit name="delete"><fmt:message key="attach.delete"
/></s:submit>
</s:form>
</td>
</wiki:Permission>
- <td class="changenote"><c:out value="${att.changeNote}"/></td>
+ <td class="changenote"><c:out
value="${attachment.changeNote}"/></td>
</tr>
</c:forEach>
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=915546&r1=915545&r2=915546&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Tue Feb 23
22:04:43 2010
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "207";
+ public static final String BUILD = "208";
/**
* This is the generic version string you should use
