struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject svn commit: r963014 [5/7] - /websites/production/struts/content/docs/
Date Tue, 25 Aug 2015 07:18:22 GMT
Modified: websites/production/struts/content/docs/release-plan-201.html
==============================================================================
--- websites/production/struts/content/docs/release-plan-201.html (original)
+++ websites/production/struts/content/docs/release-plan-201.html Tue Aug 25 07:18:20 2015
@@ -128,13 +128,13 @@ under the License.
             <div id="ConfluenceContent"><ul><li>Struts 2.0.1 is preparing a "release candidate" build.</li><li>Documentation issues remain as to migrating.</li><li>Assembly/distribution issues remain.</li></ul>
 
 
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For resolved issues, see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10693">Struts 2.0.1 DONE</a> in the issue tracker. </p>
+<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For resolved issues, see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10693">Struts 2.0.1 DONE</a> in the issue tracker. </p>
 
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For known and pending issues (if any) see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10682">Struts 2.0.1 TODO</a> in the issue tracker. </p>
+<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For known and pending issues (if any) see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10682">Struts 2.0.1 TODO</a> in the issue tracker. </p>
 
 <h2 id="ReleasePlan2.0.1-OverallStatus">Overall Status</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://issues.apache.org/struts/browse/SITE-3">Setup Nightly Builds</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Pending </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="unresolved" href="#">Utilize Cookbook format for Showcase and add Struts-Examples use cases</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/
 confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="unresolved" href="#">Add Struts 1 and WW2 Migration Guides</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Initial draft added </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Complete standard release plan </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Pending </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="http
 s://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr></tbody></table></div>
+<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://issues.apache.org/struts/browse/SITE-3">Setup Nightly Builds</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Pending </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="unresolved" href="#">Utilize Cookbook format for Showcase and add Struts-Examples use cases</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/
 s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="unresolved" href="#">Add Struts 1 and WW2 Migration Guides</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Initial draft added </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Complete standard release plan </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Pending </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s
 /en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr></tbody></table></div>
 
 
 <h2 id="ReleasePlan2.0.1-AdditionalBackground">Additional Background</h2>
@@ -197,16 +197,16 @@ under the License.
 
 <h3 id="ReleasePlan2.0.1-TestingSummary">Testing Summary </h3>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Run Unit Test targets </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Play test bundled applications </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img class="emoticon emoticon-light-o
 ff" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></td></tr></tbody></table></div>
+<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Run Unit Test targets </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Play test bundled applications </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img class="emoticon emoticon-light-off" src="ht
 tps://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></td></tr></tbody></table></div>
 
 
 <p>TODO: A Silenium test suite for the applications would be great!</p>
 
 <h2 id="ReleasePlan2.0.1-TestBuildDistributionChecklist(A)">Test Build Distribution Checklist (A)</h2>
 
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See also <a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></p>
+<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See also <a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></p>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Setup new JIRA version level for next distribution </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Update POM version and tag release in svn: ${STRUTS_2_0_1} </p></td><th colspan="1" rowspan="1" class="
 confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A3. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Run Distribution Target </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A4. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Create Sums and Sign Distributions </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-ligh
 t-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A5. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Upload Distribution to <code>people.apache.org/builds/struts/2.0.0/</code> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A6. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Deploy JAR to Apache Java-Repository </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-lig
 ht-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A7. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Post release-quality vote on dev@ lists </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div>
+<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Setup new JIRA version level for next distribution </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Update POM version and tag release in svn: ${STRUTS_2_0_1} </p></td><th colspan="1" rowspan="1" class="confluenceT
 h"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A3. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Run Distribution Target </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A4. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Create Sums and Sign Distributions </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.
 org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A5. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Upload Distribution to <code>people.apache.org/builds/struts/2.0.0/</code> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A6. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Deploy JAR to Apache Java-Repository </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_G
 B/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A7. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Post release-quality vote on dev@ lists </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div>
 
 
 <h3 id="ReleasePlan2.0.1-Vote(A)">Vote (A)</h3>
@@ -219,7 +219,7 @@ under the License.
 
 <h2 id="ReleasePlan2.0.1-PointReleaseDistributionChecklist(B)">Point Release Distribution Checklist (B)</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> B1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Update "Downooads" page on website and Test Downloads </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div>
+<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> B1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Update "Downooads" page on website and Test Downloads </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div>
 
 
 <h3 id="ReleasePlan2.0.1-Vote(B)">Vote (B)</h3>
@@ -302,7 +302,7 @@ under the License.
 <h2 id="ReleasePlan2.0.1-GeneralAvailabilityDistributionChecklist(C)">General Availability Distribution Checklist (C) </h2>
 
 <div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><ol></ol>
-</th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Copy Distribution to Mirrored Directories </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p><img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> After 24 hours, update "Downloads" page on website </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580
 e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C3. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Post an announcement to lists and website </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div>
+</th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Copy Distribution to Mirrored Directories </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p><img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> After 24 hours, update "Downloads" page on website </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646
 be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C3. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Post an announcement to lists and website </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div>
 
 
 <hr>

Modified: websites/production/struts/content/docs/release-plan-202.html
==============================================================================
--- websites/production/struts/content/docs/release-plan-202.html (original)
+++ websites/production/struts/content/docs/release-plan-202.html Tue Aug 25 07:18:20 2015
@@ -128,13 +128,13 @@ under the License.
             <div id="ConfluenceContent"><ul><li>Struts 2.0.2 is preparing a "release candidate" build.</li><li>Documentation issues remain as to migrating.</li><li>Assembly/distribution issues remain.</li></ul>
 
 
-<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For resolved issues, see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10701">Struts 2.0.2 DONE</a> in the issue tracker. </p>
+<p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png" data-emoticon-name="tick" alt="(tick)"> For resolved issues, see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10701">Struts 2.0.2 DONE</a> in the issue tracker. </p>
 
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For known and pending issues (if any) see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10700">Struts 2.0.2 TODO</a> in the issue tracker. </p>
+<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For known and pending issues (if any) see <a shape="rect" class="external-link" href="https://issues.apache.org/struts/secure/IssueNavigator.jspa?mode=hide&amp;requestId=10700">Struts 2.0.2 TODO</a> in the issue tracker. </p>
 
 <h2 id="ReleasePlan2.0.2-OverallStatus">Overall Status</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://issues.apache.org/struts/browse/SITE-3">Setup Nightly Builds</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Pending </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="unresolved" href="#">Utilize Cookbook format for Showcase and add Struts-Examples use cases</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/
 confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="unresolved" href="#">Add Struts 1 and WW2 Migration Guides</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Initial draft added </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Complete standard release plan </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Pending </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="http
 s://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr></tbody></table></div>
+<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="external-link" href="http://issues.apache.org/struts/browse/SITE-3">Setup Nightly Builds</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Pending </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="unresolved" href="#">Utilize Cookbook format for Showcase and add Struts-Examples use cases</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p>&#160;</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/
 s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <a shape="rect" class="unresolved" href="#">Add Struts 1 and WW2 Migration Guides</a> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Initial draft added </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> Complete standard release plan </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> Pending </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s
 /en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr></tbody></table></div>
 
 
 <h2 id="ReleasePlan2.0.2-AdditionalBackground">Additional Background</h2>
@@ -197,16 +197,16 @@ under the License.
 
 <h3 id="ReleasePlan2.0.2-TestingSummary">Testing Summary </h3>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Run Unit Test targets </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Play test bundled applications </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img class="emoticon emoticon-light-o
 ff" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></td></tr></tbody></table></div>
+<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Run Unit Test targets </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> 2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Play test bundled applications </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <img class="emoticon emoticon-light-off" src="ht
 tps://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></td></tr></tbody></table></div>
 
 
 <p>TODO: A Silenium test suite for the applications would be great!</p>
 
 <h2 id="ReleasePlan2.0.2-TestBuildDistributionChecklist(A)">Test Build Distribution Checklist (A)</h2>
 
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See also <a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></p>
+<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> See also <a shape="rect" href="creating-and-signing-a-distribution.html">Creating and Signing a Distribution</a></p>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Setup new JIRA version level for next distribution </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Update POM version and tag release in svn: ${STRUTS_2_0_1} </p></td><th colspan="1" rowspan="1" class="
 confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A3. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Run Distribution Target </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A4. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Create Sums and Sign Distributions </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-ligh
 t-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A5. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Upload Distribution to <code>people.apache.org/builds/struts/2.0.0/</code> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A6. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Deploy JAR to Apache Java-Repository </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-lig
 ht-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A7. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Post release-quality vote on dev@ lists </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div>
+<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> # </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Setup new JIRA version level for next distribution </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Update POM version and tag release in svn: ${STRUTS_2_0_1} </p></td><th colspan="1" rowspan="1" class="confluenceT
 h"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A3. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Run Distribution Target </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A4. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Create Sums and Sign Distributions </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.
 org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A5. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Upload Distribution to <code>people.apache.org/builds/struts/2.0.0/</code> </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A6. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Deploy JAR to Apache Java-Repository </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_G
 B/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> A7. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Post release-quality vote on dev@ lists </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div>
 
 
 <h3 id="ReleasePlan2.0.2-Vote(A)">Vote (A)</h3>
@@ -219,7 +219,7 @@ under the License.
 
 <h2 id="ReleasePlan2.0.2-PointReleaseDistributionChecklist(B)">Point Release Distribution Checklist (B)</h2>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> B1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Update "Downooads" page on website and Test Downloads </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div>
+<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> B1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Update "Downooads" page on website and Test Downloads </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div>
 
 
 <h3 id="ReleasePlan2.0.2-Vote(B)">Vote (B)</h3>
@@ -302,7 +302,7 @@ under the License.
 <h2 id="ReleasePlan2.0.2-GeneralAvailabilityDistributionChecklist(C)">General Availability Distribution Checklist (C) </h2>
 
 <div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><ol></ol>
-</th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Copy Distribution to Mirrored Directories </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p><img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> After 24 hours, update "Downloads" page on website </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580
 e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C3. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Post an announcement to lists and website </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div></div>
+</th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Completed </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C1. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Copy Distribution to Mirrored Directories </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p><img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C2. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> After 24 hours, update "Downloads" page on website </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646
 be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> C3. </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Post an announcement to lists and website </p></td><th colspan="1" rowspan="1" class="confluenceTh"><p> <img class="emoticon emoticon-light-off" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/lightbulb.png" data-emoticon-name="light-off" alt="(grey lightbulb)"> </p></th></tr></tbody></table></div></div>
         </div>
 
         

Modified: websites/production/struts/content/docs/required-validator.html
==============================================================================
--- websites/production/struts/content/docs/required-validator.html (original)
+++ websites/production/struts/content/docs/required-validator.html Tue Aug 25 07:18:20 2015
@@ -140,14 +140,34 @@ under the License.
         <div class="wiki-content">
             <div id="ConfluenceContent">
 <h1 id="requiredvalidator-Description">Description</h1>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+<p>RequiredFieldValidator checks if the specified field is not null.</p>
 
 <h1 id="requiredvalidator-Parameters">Parameters</h1>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+<p></p><ul><li>fieldName - field name if plain-validator syntax is used, not needed if field-validator syntax is used</li></ul>
 
 
 <h1 id="requiredvalidator-Examples">Examples</h1>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
+<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+	   &lt;validators&gt;
+
+        &lt;!-- Plain Validator Syntax --&gt;
+        &lt;validator type=&quot;required&quot;&gt;
+            &lt;param name=&quot;fieldName&quot;&gt;username&lt;/param&gt;
+            &lt;message&gt;username must not be null&lt;/message&gt;
+        &lt;/validator&gt;
+
+
+        &lt;!-- Field Validator Syntax --&gt;
+        &lt;field name=&quot;username&quot;&gt;
+            &lt;field-validator type=&quot;required&quot;&gt;
+            	   &lt;message&gt;username must not be null&lt;/message&gt;
+            &lt;/field-validator&gt;
+        &lt;/field&gt;
+
+    &lt;/validators&gt;
+]]></script>
+</div></div></div>
         </div>
 
         

Modified: websites/production/struts/content/docs/requiredfieldvalidator-annotation.html
==============================================================================
--- websites/production/struts/content/docs/requiredfieldvalidator-annotation.html (original)
+++ websites/production/struts/content/docs/requiredfieldvalidator-annotation.html Tue Aug 25 07:18:20 2015
@@ -138,19 +138,23 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+            <div id="ConfluenceContent"><p>This validator checks that a field is non-null.</p>
 
 <h2 id="RequiredFieldValidatorAnnotation-Usage">Usage</h2>
 
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+<p></p><p>The annotation must be applied at method level.</p>
 
 <h2 id="RequiredFieldValidatorAnnotation-Parameters">Parameters</h2>
 
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">field error message</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">key</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">i18n key from language specific properties file.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">messageParams</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" row
 span="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">Additional params to be used to customize message - will be evaluated against the Value Stack</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">fieldName</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">shortCircuit</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd">false</td><td colspan="1" rowspan="1" class="confluenceTd">If this validator should be used as shortCircuit.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">type</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">ValidatorType.FIELD</td><td colspan="1" rowspan="1" class="confluenceTd">Enum value from Valida
 torType. Either FIELD or SIMPLE can be used here.</td></tr></table></p>
 
 <h2 id="RequiredFieldValidatorAnnotation-Examples">Examples</h2>
 
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
+<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+@RequiredFieldValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true)
+]]></script>
+</div></div></div>
         </div>
 
         

Modified: websites/production/struts/content/docs/requiredstring-validator.html
==============================================================================
--- websites/production/struts/content/docs/requiredstring-validator.html (original)
+++ websites/production/struts/content/docs/requiredstring-validator.html Tue Aug 25 07:18:20 2015
@@ -140,13 +140,42 @@ under the License.
         <div class="wiki-content">
             <div id="ConfluenceContent">
 <h1 id="requiredstringvalidator-Description">Description</h1>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+<p>RequiredStringValidator checks that a String field is non-null and has a length &gt; 0.
+(i.e. it isn't ""). The "trim" parameter determines whether it will {@link String#trim() trim}
+the String before performing the length check.  If unspecified, the String will be trimmed.</p>
 
 <h1 id="requiredstringvalidator-Parameters">Parameters</h1>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li><li>trim - (Optional) Boolean, default true. Trims the field name value before validating.</li><li>trimExpression - (Optional) String. Specifies the trim param as an OGNL expression.</li></ul>
 
 <h1 id="requiredstringvalidator-Examples">Examples</h1>
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
+<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+    &lt;validators&gt;
+        &lt;!-- Plain-Validator Syntax --&gt;
+        &lt;validator type=&quot;requiredstring&quot;&gt;
+            &lt;param name=&quot;fieldName&quot;&gt;username&lt;/param&gt;
+            &lt;param name=&quot;trim&quot;&gt;true&lt;/param&gt;
+            &lt;message&gt;username is required&lt;/message&gt;
+        &lt;/validator&gt;
+        
+        &lt;!-- Field-Validator Syntax --&gt;
+        &lt;field name=&quot;username&quot;&gt;
+        	  &lt;field-validator type=&quot;requiredstring&quot;&gt;
+                &lt;param name=&quot;trim&quot;&gt;true&lt;/param&gt;
+                &lt;message&gt;username is required&lt;/message&gt;
+           &lt;/field-validator&gt;
+        &lt;/field&gt;
+
+        &lt;!-- Field-Validator Syntax with expression --&gt;
+        &lt;field name=&quot;username&quot;&gt;
+        	  &lt;field-validator type=&quot;requiredstring&quot;&gt;
+                &lt;param name=&quot;trimExpression&quot;&gt;${trimValue}&lt;/param&gt; &lt;!-- will be evaluated as: boolean getTrimValue() --&gt;
+                &lt;message&gt;username is required&lt;/message&gt;
+           &lt;/field-validator&gt;
+        &lt;/field&gt;
+    &lt;/validators&gt;
+]]></script>
+</div></div></div>
         </div>
 
         

Modified: websites/production/struts/content/docs/requiredstringvalidator-annotation.html
==============================================================================
--- websites/production/struts/content/docs/requiredstringvalidator-annotation.html (original)
+++ websites/production/struts/content/docs/requiredstringvalidator-annotation.html Tue Aug 25 07:18:20 2015
@@ -138,19 +138,23 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+            <div id="ConfluenceContent"><p>This validator checks that a String field is not empty (i.e. non-null with a length &gt; 0).</p>
 
 <h2 id="RequiredStringValidatorAnnotation-Usage">Usage</h2>
 
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+<p></p><p>The annotation must be applied at method level.</p>
 
 <h2 id="RequiredStringValidatorAnnotation-Parameters">Parameters</h2>
 
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+<p><table class="confluenceTable" summary=""><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">field error message</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">key</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">i18n key from language specific properties file.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">messageParams</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" row
 span="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">Additional params to be used to customize message - will be evaluated against the Value Stack</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">fieldName</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">shortCircuit</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd">false</td><td colspan="1" rowspan="1" class="confluenceTd">If this validator should be used as shortCircuit.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">type</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">ValidatorType.FIELD</td><td colspan="1" rowspan="1" class="confluenceTd">Enum value from Valida
 torType. Either FIELD or SIMPLE can be used here.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> trim </td><td colspan="1" rowspan="1" class="confluenceTd"> no </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> Boolean property.  Determines whether the String is trimmed before performing the length check.  </td></tr></table></p>
 
 <h2 id="RequiredStringValidatorAnnotation-Examples">Examples</h2>
 
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
+<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="brush: java; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+@RequiredStringValidator(message = &quot;Default message&quot;, key = &quot;i18n.key&quot;, shortCircuit = true, trim = true)
+]]></script>
+</div></div></div>
         </div>
 
         

Modified: websites/production/struts/content/docs/rest-plugin.html
==============================================================================
--- websites/production/struts/content/docs/rest-plugin.html (original)
+++ websites/production/struts/content/docs/rest-plugin.html Tue Aug 25 07:18:20 2015
@@ -139,11 +139,11 @@ under the License.
     <div class="pagecontent">
         <div class="wiki-content">
             <div id="ConfluenceContent"><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This plugin is only available with Struts 2.1.1 or later</p></div></div><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1438274296737 {padding: 0px;}
-div.rbtoc1438274296737 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1438274296737 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1440486526369 {padding: 0px;}
+div.rbtoc1440486526369 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1440486526369 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1438274296737">
+/*]]>*/</style></p><div class="toc-macro rbtoc1440486526369">
 <ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#RESTPlugin-Overview">Overview</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#RESTPlugin-Features">Features</a></li><li><span class="TOCOutline">1.2</span> <a shape="rect" href="#RESTPlugin-MappingRESTURLstoStruts2Actions">Mapping REST URLs to Struts 2 Actions</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">1.2.1</span> <a shape="rect" href="#RESTPlugin-RESTfulURLMappingLogic">RESTful URL Mapping Logic</a></li></ul>

Added: websites/production/struts/content/docs/s2-025.html
==============================================================================
--- websites/production/struts/content/docs/s2-025.html (added)
+++ websites/production/struts/content/docs/s2-025.html Tue Aug 25 07:18:20 2015
@@ -0,0 +1,138 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License. 
+-->
+<html>
+<head>
+    <link type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
+    <style type="text/css">
+        .dp-highlighter {
+            width:95% !important;
+        }
+    </style>
+    <style type="text/css">
+        .footer {
+            background-image:      url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+            background-repeat:     repeat-x;
+            background-position:   left top;
+            padding-top:           4px;
+            color:                 #666;
+        }
+    </style>
+    <script type="text/javascript" language="javascript">
+        var hide = null;
+        var show = null;
+        var children = null;
+
+        function init() {
+            /* Search form initialization */
+            var form = document.forms['search'];
+            if (form != null) {
+                form.elements['domains'].value = location.hostname;
+                form.elements['sitesearch'].value = location.hostname;
+            }
+
+            /* Children initialization */
+            hide = document.getElementById('hide');
+            show = document.getElementById('show');
+            children = document.all != null ?
+                    document.all['children'] :
+                    document.getElementById('children');
+            if (children != null) {
+                children.style.display = 'none';
+                show.style.display = 'inline';
+                hide.style.display = 'none';
+            }
+        }
+
+        function showChildren() {
+            children.style.display = 'block';
+            show.style.display = 'none';
+            hide.style.display = 'inline';
+        }
+
+        function hideChildren() {
+            children.style.display = 'none';
+            show.style.display = 'inline';
+            hide.style.display = 'none';
+        }
+    </script>
+    <title>S2-025</title>
+</head>
+<body onload="init()">
+<table border="0" cellpadding="2" cellspacing="0" width="100%">
+    <tr class="topBar">
+        <td align="left" valign="middle" class="topBarDiv" align="left" nowrap>
+            &nbsp;<a href="home.html">Home</a>&nbsp;&gt;&nbsp;<a href="security-bulletins.html">Security Bulletins</a>&nbsp;&gt;&nbsp;<a href="s2-025.html">S2-025</a>
+        </td>
+        <td align="right" valign="middle" nowrap>
+            <form name="search" action="https://www.google.com/search" method="get">
+                <input type="hidden" name="ie" value="UTF-8" />
+                <input type="hidden" name="oe" value="UTF-8" />
+                <input type="hidden" name="domains" value="" />
+                <input type="hidden" name="sitesearch" value="" />
+                <input type="text" name="q" maxlength="255" value="" />
+                <input type="submit" name="btnG" value="Google Search" />
+            </form>
+        </td>
+    </tr>
+</table>
+
+<div id="PageContent">
+    <div class="pageheader" style="padding: 6px 0px 0px 0px;">
+        <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+        <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+        <div style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</div>
+        <div style="margin: 0px 10px 8px 10px"  class="pagetitle">S2-025</div>
+
+        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61312386">
+                <img src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif"
+                     height="16" width="16" border="0" align="absmiddle" title="Edit Page"></a>
+            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61312386">Edit Page</a>
+            &nbsp;
+            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
+                <img src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif"
+                     height="16" width="16" border="0" align="absmiddle" title="Browse Space"></a>
+            <a href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</a>
+            &nbsp;
+            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61312386">
+                <img src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif"
+                     height="16" width="16" border="0" align="absmiddle" title="Add Page"></a>
+            <a href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=61312386">Add Page</a>
+            &nbsp;
+            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61312386">
+                <img src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif"
+                     height="16" width="16" border="0" align="absmiddle" title="Add News"></a>
+            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=61312386">Add News</a>
+        </div>
+    </div>
+
+    <div class="pagecontent">
+        <div class="wiki-content">
+            <div id="ConfluenceContent"><h2 id="S2-025-Summary">Summary</h2>Cross-Site Scripting Vulnerability in Debug Mode<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Who should read this</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>All Struts 2 developers and users</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Impact of vulnerability</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p><span>A</span><span>ffects of a cross-site scripting vulnerability </span>when debug mode is switched on in production environment.</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Maximum security rating</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Low</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Recommendation</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Turn off debug mode in production environment. An upgr
 ade to <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts2320">Struts 2.3.20</a> is recommended.</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Affected Software</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Struts 2.0.0 - Struts <span style="color: rgb(23,35,59);">Struts 2.3.16.3</span></p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Reporter</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p><span style="color: rgb(34,34,34);">Taki Uchiyama, JPCERT/CC</span></p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>CVE Identifier</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>CVE-2015-5169</p></td></tr></tbody></table></div><h2 id="S2-025-Problem">Problem</h2><p>When the Struts2 debug mode is turned on, under certain conditions&#160;an arbitrary&#160;script may be executed in the 'Problem Report' screen.</p><h2 id="S2-025-Solution">Solution</h2><p>It is g
 enerally not advisable to have debug mode switched on outside of the development environment. Debug mode should always be turned off in production setup. Also never expose JSPs files directly and hide them inside&#160;<code>WEB-INF</code> folder or define dedicated security constraints to block access to raw JSP files.&#160;Please also ready our&#160;<a shape="rect" href="security.html">Security</a>&#160;guide - it contains useful informations how to secure your application.</p><p>Struts &gt;= 2.3.20 is not vulnerable to this attack. We recommend upgrading to Struts 2.3.20 or higher.</p><h2 id="S2-025-Backwardcompatibility">Backward compatibility</h2><p>No backward compatibility problems are expected.</p><h2 id="S2-025-Workaround">Workaround</h2><h2 id="S2-025-UpgradetoStruts2.3.20"><span style="font-size: 14.0px;line-height: 20.0px;">Upgrade to Struts 2.3.20</span></h2><p><span style="font-size: 14.0px;line-height: 1.4285715;"><br clear="none"></span></p></div>
+        </div>
+
+        
+    </div>
+</div>
+<div class="footer">
+    Generated by CXF SiteExporter
+</div>
+</body>
+</html>

Modified: websites/production/struts/content/docs/sample-announcements.html
==============================================================================
--- websites/production/struts/content/docs/sample-announcements.html (original)
+++ websites/production/struts/content/docs/sample-announcements.html Tue Aug 25 07:18:20 2015
@@ -127,11 +127,11 @@ under the License.
         <div class="wiki-content">
             <div id="ConfluenceContent"><h1 id="Sampleannouncements-Content">Content</h1>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1438274397886 {padding: 0px;}
-div.rbtoc1438274397886 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1438274397886 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1440486636390 {padding: 0px;}
+div.rbtoc1440486636390 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1440486636390 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1438274397886">
+/*]]>*/</style><div class="toc-macro rbtoc1440486636390">
 <ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#Sampleannouncements-Content">Content</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#Sampleannouncements-SampleStrutsAnnotationsRelease/QualityVote">Sample Struts Annotations Release/Quality Vote</a></li><li><span class="TOCOutline">1.2</span> <a shape="rect" href="#Sampleannouncements-SampleTestBuildAnnouncement">Sample Test Build Announcement</a></li><li><span class="TOCOutline">1.3</span> <a shape="rect" href="#Sampleannouncements-SampleRelease/QualityVote">Sample Release/Quality Vote</a></li><li><span class="TOCOutline">1.4</span> <a shape="rect" href="#Sampleannouncements-SampleReleaseAnnouncement">Sample Release Announcement</a></li><li><span class="TOCOutline">1.5</span> <a shape="rect" href="#Sampleannouncements-Fast-TrackinganImportantSecurityRelease">Fast-Tracking an Important Security Release</a></li></ul>
 </li></ul>

Modified: websites/production/struts/content/docs/scoped-model-driven-interceptor.html
==============================================================================
--- websites/production/struts/content/docs/scoped-model-driven-interceptor.html (original)
+++ websites/production/struts/content/docs/scoped-model-driven-interceptor.html Tue Aug 25 07:18:20 2015
@@ -138,19 +138,43 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+            <div id="ConfluenceContent">
+<p>An interceptor that enables scoped model-driven actions.</p>
+
+<p></p><p>This interceptor only activates on actions that implement the ScopedModelDriven interface.  If
+detected, it will retrieve the model class from the configured scope, then provide it to the Action.</p>
+
 
 <h2 id="ScopedModelDrivenInterceptor-Parameters">Parameters</h2>
 
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+
+<p></p><ul></ul><p></p><ul><li>className - The model class name.  Defaults to the class name of the object returned by the getModel() method.</li></ul><p></p><ul><li>name - The key to use when storing or retrieving the instance in a scope.  Defaults to the model
+           class name.</li></ul><p></p><ul><li>scope - The scope to store and retrieve the model.  Defaults to 'request' but can also be 'session'.</li></ul>
+
 
 <h2 id="ScopedModelDrivenInterceptor-ExtendingtheInterceptor">Extending the Interceptor</h2>
 
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
+
+<p>There are no known extension points for this interceptor.</p>
+
 
 <h2 id="ScopedModelDrivenInterceptor-Examples">Examples</h2>
 
-<div class="error"><span class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div></div>
+<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="brush: xml; gutter: false; theme: Default" type="syntaxhighlighter"><![CDATA[
+
+&lt;-- Basic usage --&gt;
+&lt;interceptor name=&quot;scopedModelDriven&quot; class=&quot;com.opensymphony.interceptor.ScopedModelDrivenInterceptor&quot; /&gt;
+
+&lt;-- Using all available parameters --&gt;
+&lt;interceptor name=&quot;gangsterForm&quot; class=&quot;com.opensymphony.interceptor.ScopedModelDrivenInterceptor&quot;&gt;
+     &lt;param name=&quot;scope&quot;&gt;session&lt;/param&gt;
+     &lt;param name=&quot;name&quot;&gt;gangsterForm&lt;/param&gt;
+     &lt;param name=&quot;className&quot;&gt;com.opensymphony.example.GangsterForm&lt;/param&gt;
+ &lt;/interceptor&gt;
+
+]]></script>
+</div></div></div>
         </div>
 
         

Modified: websites/production/struts/content/docs/security-bulletins.html
==============================================================================
--- websites/production/struts/content/docs/security-bulletins.html (original)
+++ websites/production/struts/content/docs/security-bulletins.html Tue Aug 25 07:18:20 2015
@@ -126,7 +126,7 @@ under the License.
     <div class="pagecontent">
         <div class="wiki-content">
             <div id="ConfluenceContent"><p>The following security bulletins are available:</p>
-<ul class="childpages-macro"><li><a shape="rect" href="s2-001.html">S2-001</a> &#8212; <span class="smalltext">Remote code exploit on form validation error</span></li><li><a shape="rect" href="s2-002.html">S2-002</a> &#8212; <span class="smalltext">Cross site scripting (XSS) vulnerability on &lt;s:url&gt; and &lt;s:a&gt; tags</span></li><li><a shape="rect" href="s2-003.html">S2-003</a> &#8212; <span class="smalltext">XWork ParameterInterceptors bypass allows OGNL statement execution</span></li><li><a shape="rect" href="s2-004.html">S2-004</a> &#8212; <span class="smalltext">Directory traversal vulnerability while serving static content</span></li><li><a shape="rect" href="s2-005.html">S2-005</a> &#8212; <span class="smalltext">XWork ParameterInterceptors bypass allows remote command execution</span></li><li><a shape="rect" href="s2-006.html">S2-006</a> &#8212; <span class="smalltext">Multiple Cross-Site Scripting (XSS) in XWork generated error pages</span></li><li><a shape="rect" hr
 ef="s2-007.html">S2-007</a> &#8212; <span class="smalltext">User input is evaluated as an OGNL expression when there's a conversion error</span></li><li><a shape="rect" href="s2-008.html">S2-008</a> &#8212; <span class="smalltext">Multiple critical vulnerabilities in Struts2</span></li><li><a shape="rect" href="s2-009.html">S2-009</a> &#8212; <span class="smalltext">ParameterInterceptor vulnerability allows remote command execution</span></li><li><a shape="rect" href="s2-010.html">S2-010</a> &#8212; <span class="smalltext">When using Struts 2 token mechanism for CSRF protection, token check may be bypassed by misusing known session attributes</span></li><li><a shape="rect" href="s2-011.html">S2-011</a> &#8212; <span class="smalltext">Long request parameter names might significantly promote the effectiveness of DOS attacks</span></li><li><a shape="rect" href="s2-012.html">S2-012</a> &#8212; <span class="smalltext">Showcase app vulnerability allows remote command execution</span></li>
 <li><a shape="rect" href="s2-013.html">S2-013</a> &#8212; <span class="smalltext">A vulnerability, present in the includeParams attribute of the URL and Anchor Tag, allows remote command execution</span></li><li><a shape="rect" href="s2-014.html">S2-014</a> &#8212; <span class="smalltext">A vulnerability introduced by forcing parameter inclusion in the URL and Anchor Tag allows remote command execution, session access and manipulation and XSS attacks</span></li><li><a shape="rect" href="s2-015.html">S2-015</a> &#8212; <span class="smalltext">A vulnerability introduced by wildcard matching mechanism or double evaluation of OGNL Expression allows remote command execution.</span></li><li><a shape="rect" href="s2-016.html">S2-016</a> &#8212; <span class="smalltext">A vulnerability introduced by manipulating parameters prefixed with "action:"/"redirect:"/"redirectAction:" allows remote command execution</span></li><li><a shape="rect" href="s2-017.html">S2-017</a> &#8212; <span class="sma
 lltext">A vulnerability introduced by manipulating parameters prefixed with "redirect:"/"redirectAction:" allows for open redirects</span></li><li><a shape="rect" href="s2-018.html">S2-018</a> &#8212; <span class="smalltext">Broken Access Control Vulnerability in Apache Struts2</span></li><li><a shape="rect" href="s2-019.html">S2-019</a> &#8212; <span class="smalltext">Dynamic Method Invocation disabled by default</span></li><li><a shape="rect" href="s2-020.html">S2-020</a> &#8212; <span class="smalltext">Upgrade Commons FileUpload to version 1.3.1 (avoids DoS attacks) and adds 'class' to exclude params in ParametersInterceptor (avoid ClassLoader manipulation)</span></li><li><a shape="rect" href="s2-021.html">S2-021</a> &#8212; <span class="smalltext">Improves excluded params in ParametersInterceptor and CookieInterceptor to avoid ClassLoader manipulation</span></li><li><a shape="rect" href="s2-022.html">S2-022</a> &#8212; <span class="smalltext">Extends excluded params in CookieInt
 erceptor to avoid manipulation of Struts' internals</span></li><li><a shape="rect" href="s2-023.html">S2-023</a> &#8212; <span class="smalltext">Generated value of token can be predictable</span></li><li><a shape="rect" href="s2-024.html">S2-024</a> &#8212; <span class="smalltext">Wrong excludeParams overrides those defined in DefaultExcludedPatternsChecker</span></li></ul></div>
+<ul class="childpages-macro"><li><a shape="rect" href="s2-001.html">S2-001</a> &#8212; <span class="smalltext">Remote code exploit on form validation error</span></li><li><a shape="rect" href="s2-002.html">S2-002</a> &#8212; <span class="smalltext">Cross site scripting (XSS) vulnerability on &lt;s:url&gt; and &lt;s:a&gt; tags</span></li><li><a shape="rect" href="s2-003.html">S2-003</a> &#8212; <span class="smalltext">XWork ParameterInterceptors bypass allows OGNL statement execution</span></li><li><a shape="rect" href="s2-004.html">S2-004</a> &#8212; <span class="smalltext">Directory traversal vulnerability while serving static content</span></li><li><a shape="rect" href="s2-005.html">S2-005</a> &#8212; <span class="smalltext">XWork ParameterInterceptors bypass allows remote command execution</span></li><li><a shape="rect" href="s2-006.html">S2-006</a> &#8212; <span class="smalltext">Multiple Cross-Site Scripting (XSS) in XWork generated error pages</span></li><li><a shape="rect" hr
 ef="s2-007.html">S2-007</a> &#8212; <span class="smalltext">User input is evaluated as an OGNL expression when there's a conversion error</span></li><li><a shape="rect" href="s2-008.html">S2-008</a> &#8212; <span class="smalltext">Multiple critical vulnerabilities in Struts2</span></li><li><a shape="rect" href="s2-009.html">S2-009</a> &#8212; <span class="smalltext">ParameterInterceptor vulnerability allows remote command execution</span></li><li><a shape="rect" href="s2-010.html">S2-010</a> &#8212; <span class="smalltext">When using Struts 2 token mechanism for CSRF protection, token check may be bypassed by misusing known session attributes</span></li><li><a shape="rect" href="s2-011.html">S2-011</a> &#8212; <span class="smalltext">Long request parameter names might significantly promote the effectiveness of DOS attacks</span></li><li><a shape="rect" href="s2-012.html">S2-012</a> &#8212; <span class="smalltext">Showcase app vulnerability allows remote command execution</span></li>
 <li><a shape="rect" href="s2-013.html">S2-013</a> &#8212; <span class="smalltext">A vulnerability, present in the includeParams attribute of the URL and Anchor Tag, allows remote command execution</span></li><li><a shape="rect" href="s2-014.html">S2-014</a> &#8212; <span class="smalltext">A vulnerability introduced by forcing parameter inclusion in the URL and Anchor Tag allows remote command execution, session access and manipulation and XSS attacks</span></li><li><a shape="rect" href="s2-015.html">S2-015</a> &#8212; <span class="smalltext">A vulnerability introduced by wildcard matching mechanism or double evaluation of OGNL Expression allows remote command execution.</span></li><li><a shape="rect" href="s2-016.html">S2-016</a> &#8212; <span class="smalltext">A vulnerability introduced by manipulating parameters prefixed with "action:"/"redirect:"/"redirectAction:" allows remote command execution</span></li><li><a shape="rect" href="s2-017.html">S2-017</a> &#8212; <span class="sma
 lltext">A vulnerability introduced by manipulating parameters prefixed with "redirect:"/"redirectAction:" allows for open redirects</span></li><li><a shape="rect" href="s2-018.html">S2-018</a> &#8212; <span class="smalltext">Broken Access Control Vulnerability in Apache Struts2</span></li><li><a shape="rect" href="s2-019.html">S2-019</a> &#8212; <span class="smalltext">Dynamic Method Invocation disabled by default</span></li><li><a shape="rect" href="s2-020.html">S2-020</a> &#8212; <span class="smalltext">Upgrade Commons FileUpload to version 1.3.1 (avoids DoS attacks) and adds 'class' to exclude params in ParametersInterceptor (avoid ClassLoader manipulation)</span></li><li><a shape="rect" href="s2-021.html">S2-021</a> &#8212; <span class="smalltext">Improves excluded params in ParametersInterceptor and CookieInterceptor to avoid ClassLoader manipulation</span></li><li><a shape="rect" href="s2-022.html">S2-022</a> &#8212; <span class="smalltext">Extends excluded params in CookieInt
 erceptor to avoid manipulation of Struts' internals</span></li><li><a shape="rect" href="s2-023.html">S2-023</a> &#8212; <span class="smalltext">Generated value of token can be predictable</span></li><li><a shape="rect" href="s2-024.html">S2-024</a> &#8212; <span class="smalltext">Wrong excludeParams overrides those defined in DefaultExcludedPatternsChecker</span></li><li><a shape="rect" href="s2-025.html">S2-025</a> &#8212; <span class="smalltext">Cross-Site Scripting Vulnerability in Debug Mode</span></li></ul></div>
         </div>
 
                     <div class="tabletitle">
@@ -141,6 +141,9 @@ under the License.
                     <span class="smalltext">(Apache Struts 2 Documentation)</span>
                     <br>
                                     $page.link($child)
+                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
+                    <br>
+                                    $page.link($child)
                     <span class="smalltext">(Apache Struts 2 Documentation)</span>
                     <br>
                                     $page.link($child)



Mime
View raw message