Modified: websites/production/struts/content/docs/version-notes-25.html
==============================================================================
--- websites/production/struts/content/docs/version-notes-25.html (original)
+++ websites/production/struts/content/docs/version-notes-25.html Tue May 31
12:41:53 2016
@@ -155,7 +155,7 @@ under the License.
<url>https://repository.apache.org/content/groups/staging/</url>
</repository>
</repositories></pre>
-</div></div><h2 id="VersionNotes2.5-InternalChanges">Internal
Changes</h2><ul><li><img class="emoticon emoticon-warning"
src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png";
data-emoticon-name="warning" alt="(warning)"> All security patches from
prior versions were merged into this version</li><li>XWork source was merged
into Struts Core source, it means that there be no more <code>xwork</code>
artifact nor dedicated jar</li><li><span style="line-height: 1.42857;">Spring
dependency for tests and spring plugin was upgraded to version 4.1.6, see
</span><a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4510"; style="line-height:
1.42857;">WW-4510</a><span style="line-height:
1.42857;">.</span></li><li>Struts2 internal logging api was marked as
deprecated and was replaced with new <a shape="rect" class="external-link"
href="http://logging.apache.org/log
4j/2.x/">Log4j2</a> api as logging layer, see <a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/browse/WW-4504";>WW-4504</a>.</li><li>Struts2
is now build with JDK7, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4503";>WW-4503</a>.</li><li>New
plugin to support <a shape="rect"
href="https://cwiki.apache.org/confluence/display/WW/Bean+Validation+Plugin";>bean
validation</a> is now part of the distribution, see <a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/browse/WW-4505";>WW-4505</a>.</li><li>Deprecated
plugins are now removed from the distribution and are not longer supported
anymore.<ul><li>Dojo Plugin</li><li>Codebehind Plugin</li><li>JSF
Plugin</li><li>Struts1 Plugin</li></ul></li><li>New security option was added -
Strict Method Invocation (also known as Strict DMI), see <a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/browse/WW-4540";>WW-4540</a></li><li>Ad
ded support for latest stable AngularJS in Maven archetype, see <a
shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4522";>WW-4522</a></li><li>Dropped
support for <code>id</code> and <code>name</code> - replaced
with <code>var</code>, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-2069";>WW-2069</a></li><li>Dedicated
archive with a minimal set of dependencies was introduced, see <a
shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4570";>WW-4570</a></li><li>It is
possible to use multiple names when defining a result, see <a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/browse/WW-4590";>WW-4590</a></li><li>Rest
plugin honors Accept header, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4588";>WW-4588</a></li><li><p>New
result 'JSONActionRedirectResult' in json-plugin was define
d, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4591";>WW-4591</a></p></li><li>Tiles
plugin was upgrade to the latest Tiles 3 and tiles3-plugin was dropped,
see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4584";>WW-4584</a></li><li>JasperReports
plugins was upgraded to JasperReport 6.0, see <a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/browse/WW-4381";>WW-4381</a></li><li>OGNL
was upgraded to version 3.1.4 and it breaks access to properties as it follows
Java Bean Specification, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4207";>WW-4207</a> and <a
shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-3909";>WW-3909</a></li><li>Annotations
to configure Tiles, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4594";>WW-4594</a> and <a shap
e="rect"
href="https://cwiki.apache.org/confluence/display/WW/Tiles+Plugin";>Tiles
Plugin</a></li></ul><h3 id="VersionNotes2.5-Packagenameshavechanged">Package
names have changed</h3><p>Some classes were moved to different packages, see
the list below for more details:</p><ul style="list-style-type:
square;"><li>New:<br clear="none"><code>import
org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</code><br
clear="none"><code>import
org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</code><br
clear="none"><code>import
org.apache.struts2.dispatcher.listener.StrutsListener<br clear="none">import
org.apache.struts2.result.ServletRedirectResult</code></li><li>Old:<br
clear="none"><code>import
org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</code><br
clear="none"><code>import
org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</code><br
clear="none"><code>import
org.apache.struts2.dispatcher.ng.listener.StrutsListener</code><br
clear="none"><code>import org.a
pache.struts2.dispatcher.ServletRedirectResult</code></li></ul><h2
id="VersionNotes2.5-IssueDetail">Issue Detail</h2><ul><li><a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12324447&projectId=12311041";>JIRA
Release Notes 2.5</a></li></ul><h2 id="VersionNotes2.5-IssueList">Issue
List</h2><ul><li><a shape="rect" class="external-link"
href="https://issues.apache.org/jira/issues/?filter=12335472";>Struts 2.3.28
DONE</a></li><li><a shape="rect" class="external-link"
href="https://issues.apache.org/jira/issues/?filter=12335667";>Struts 2.5.x
TODO</a></li></ul><h2 id="VersionNotes2.5-Otherresources">Other
resources</h2><ul><li><a shape="rect" class="external-link"
href="http://www.mail-archive.com/commits%40struts.apache.org/";
rel="nofollow">Commit Logs</a></li><li><a shape="rect" class="external-link"
href="https://git-wip-us.apache.org/repos/asf?p=struts.git;a=tree;h=refs/heads/develop;hb=develop";>Source
Code Repository</a></li
></ul><div><span style="font-size: 24.0px;line-height: 30.0px;"><br
>clear="none"></span></div><div><span style="font-size: 24.0px;line-height:
>30.0px;background-color: rgb(245,245,245);"><br
>clear="none"></span></div></div>
+</div></div><h2 id="VersionNotes2.5-InternalChanges">Internal
Changes</h2><ul><li><img class="emoticon emoticon-warning"
src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png";
data-emoticon-name="warning" alt="(warning)"> All security patches from
prior versions were merged into this version</li><li>XWork source was merged
into Struts Core source, it means that there be no more <code>xwork</code>
artifact nor dedicated jar</li><li><span style="line-height: 1.42857;">Spring
dependency for tests and spring plugin was upgraded to version 4.1.6, see
</span><a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4510"; style="line-height:
1.42857;">WW-4510</a><span style="line-height:
1.42857;">.</span></li><li>Struts2 internal logging api was marked as
deprecated and was replaced with new <a shape="rect" class="external-link"
href="http://logging.apache.org/log
4j/2.x/">Log4j2</a> api as logging layer, see <a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/browse/WW-4504";>WW-4504</a>.</li><li>Struts2
is now build with JDK7, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4503";>WW-4503</a>.</li><li>New
plugin to support <a shape="rect"
href="https://cwiki.apache.org/confluence/display/WW/Bean+Validation+Plugin";>bean
validation</a> is now part of the distribution, see <a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/browse/WW-4505";>WW-4505</a>.</li><li>Deprecated
plugins are now removed from the distribution and are not longer supported
anymore.<ul><li>Dojo Plugin</li><li>Codebehind Plugin</li><li>JSF
Plugin</li><li>Struts1 Plugin</li></ul></li><li>New security option was added -
Strict Method Invocation (also known as Strict DMI), see <a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/browse/WW-4540";>WW-4540</a></li><li>Ad
ded support for latest stable AngularJS in Maven archetype, see <a
shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4522";>WW-4522</a></li><li>Dropped
support for <code>id</code> and <code>name</code> - replaced
with <code>var</code>, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-2069";>WW-2069</a></li><li>Dedicated
archive with a minimal set of dependencies was introduced, see <a
shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4570";>WW-4570</a></li><li>It is
possible to use multiple names when defining a result, see <a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/browse/WW-4590";>WW-4590</a></li><li>Rest
plugin honors Accept header, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4588";>WW-4588</a></li><li><p>New
result 'JSONActionRedirectResult' in json-plugin was define
d, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4591";>WW-4591</a></p></li><li>Tiles
plugin was upgrade to the latest Tiles 3 and tiles3-plugin was dropped,
see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4584";>WW-4584</a></li><li>JasperReports
plugins was upgraded to JasperReport 6.0, see <a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/browse/WW-4381";>WW-4381</a></li><li>OGNL
was upgraded to version 3.1.4 and it breaks access to properties as it follows
Java Bean Specification, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4207";>WW-4207</a> and <a
shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-3909";>WW-3909</a></li><li>Annotations
to configure Tiles, see <a shape="rect" class="external-link"
href="https://issues.apache.org/jira/browse/WW-4594";>WW-4594</a> and <a shap
e="rect"
href="https://cwiki.apache.org/confluence/display/WW/Tiles+Plugin";>Tiles
Plugin</a></li></ul><h3 id="VersionNotes2.5-Packagenameshavechanged">Package
names have changed</h3><p>Some classes were moved to different packages, see
the list below for more details:</p><ul style="list-style-type:
square;"><li>New:<br
clear="none"><code>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</code><br
clear="none"><code>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</code><br
clear="none"><code>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</code><br
clear="none"><code>org.apache.struts2.dispatcher.listener.StrutsListener</code><br
clear="none"><code>org.apache.struts2.result.ServletRedirectResult<br
clear="none">com.opensymphony.xwork2.interceptor.ValidationAware </code></li><li>Old:<br
clear="none"><code>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</code><br
clear="none"><code>org.apache.struts2.dispatcher.ng.filter.Str
utsExecuteFilter</code><br
clear="none"><code>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</code><br
clear="none"><code>org.apache.struts2.dispatcher.ng.listener.StrutsListener</code><br
clear="none"><code>org.apache.struts2.dispatcher.ServletRedirectResult<br
clear="none"><span>com.opensymphony.xwork2.</span><span>ValidationAware</span> </code></li></ul><h2
id="VersionNotes2.5-IssueDetail">Issue Detail</h2><ul><li><a shape="rect"
class="external-link"
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12324447&projectId=12311041";>JIRA
Release Notes 2.5</a></li></ul><h2 id="VersionNotes2.5-IssueList">Issue
List</h2><ul><li><a shape="rect" class="external-link"
href="https://issues.apache.org/jira/issues/?filter=12335472";>Struts 2.3.28
DONE</a></li><li><a shape="rect" class="external-link"
href="https://issues.apache.org/jira/issues/?filter=12335667";>Struts 2.5.x
TODO</a></li></ul><h2 id="VersionNotes2.5-Otherresources">Other resources</h2><u
l><li><a shape="rect" class="external-link"
href="http://www.mail-archive.com/commits%40struts.apache.org/";
rel="nofollow">Commit Logs</a></li><li><a shape="rect" class="external-link"
href="https://git-wip-us.apache.org/repos/asf?p=struts.git;a=tree;h=refs/heads/develop;hb=develop";>Source
Code Repository</a></li></ul><div><span style="font-size: 24.0px;line-height:
30.0px;"><br clear="none"></span></div><div><span style="font-size:
24.0px;line-height: 30.0px;background-color: rgb(245,245,245);"><br
clear="none"></span></div></div>
</div>
Modified: websites/production/struts/content/docs/xhtml-theme.html
==============================================================================
--- websites/production/struts/content/docs/xhtml-theme.html (original)
+++ websites/production/struts/content/docs/xhtml-theme.html Tue May 31
12:41:53 2016
@@ -275,11 +275,11 @@ under the License.
class="label"<#t/>
</#if>
><#t/>
-<#if parameters.required!false &&
parameters.requiredPosition!"right" != 'right'>
+<#if (parameters.required!false) &&
((parameters.requiredPosition!"right") != 'right')>
<span class="required">*</span><#t/>
</#if>
${parameters.label?html}<#t/>
-<#if parameters.required!false &&
parameters.requiredPosition!"right" == 'right'>
+<#if (parameters.required!false) &&
((parameters.requiredPosition!"right") == 'right')>
<span class="required">*</span><#t/>
</#if>
${parameters.labelseparator!":"?html}<#t/>
![https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png"](https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/warning.png"){kind=link}