You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2013/10/01 08:43:56 UTC

svn commit: r880619 [1/2] - in /websites/production/struts/content/development/2.x/docs: ./ form-validation-using-xml.data/

Author: lukaszlenart
Date: Tue Oct  1 06:43:55 2013
New Revision: 880619

Log:
Updates draft docs

Added:
    websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/form-validation-1.png   (with props)
    websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/form-validation-2.png   (with props)
    websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/form-validation-3.png   (with props)
    websites/production/struts/content/development/2.x/docs/s2-018.html
    websites/production/struts/content/development/2.x/docs/s2-019.html
    websites/production/struts/content/development/2.x/docs/security.html
    websites/production/struts/content/development/2.x/docs/version-notes-23152.html
Removed:
    websites/production/struts/content/development/2.x/docs/ajax-event-system.html
    websites/production/struts/content/development/2.x/docs/apache-struts-pseudo-nightly-builds-on-apache-hudson.html
    websites/production/struts/content/development/2.x/docs/file.html
    websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/Screen-shot-2010-05-05-at-10.05.14-AM.png
    websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/Screen-shot-2010-05-05-at-10.25.38-AM.png
    websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/Screen-shot-2010-05-05-at-10.45.18-AM.png
    websites/production/struts/content/development/2.x/docs/iterator-tag-examples.html
    websites/production/struts/content/development/2.x/docs/logging.html
    websites/production/struts/content/development/2.x/docs/plaintext-result.html
    websites/production/struts/content/development/2.x/docs/related-tools.html
    websites/production/struts/content/development/2.x/docs/validation-interceptor.html
Modified:
    websites/production/struts/content/development/2.x/docs/building-struts-2-fast-track-release.html
    websites/production/struts/content/development/2.x/docs/building-struts-2-normal-release.html
    websites/production/struts/content/development/2.x/docs/config-browser-plugin.html
    websites/production/struts/content/development/2.x/docs/core-developers-guide.html
    websites/production/struts/content/development/2.x/docs/debugging-struts.html
    websites/production/struts/content/development/2.x/docs/form-validation-using-xml.html
    websites/production/struts/content/development/2.x/docs/getting-started.html
    websites/production/struts/content/development/2.x/docs/guides.html
    websites/production/struts/content/development/2.x/docs/home.html
    websites/production/struts/content/development/2.x/docs/interceptors.html
    websites/production/struts/content/development/2.x/docs/json-plugin.html
    websites/production/struts/content/development/2.x/docs/migration-guide.html
    websites/production/struts/content/development/2.x/docs/redirect-result.html
    websites/production/struts/content/development/2.x/docs/security-bulletins.html
    websites/production/struts/content/development/2.x/docs/stream-result.html
    websites/production/struts/content/development/2.x/docs/struts-2-annotations.html
    websites/production/struts/content/development/2.x/docs/struts-2-form-tags.html
    websites/production/struts/content/development/2.x/docs/struts-2-maven-archetypes.html
    websites/production/struts/content/development/2.x/docs/struts-2-themes.html
    websites/production/struts/content/development/2.x/docs/struts-control-tags.html
    websites/production/struts/content/development/2.x/docs/struts-next.html
    websites/production/struts/content/development/2.x/docs/strutsproperties.html
    websites/production/struts/content/development/2.x/docs/unit-testing.html
    websites/production/struts/content/development/2.x/docs/using-struts-2-tags.html
    websites/production/struts/content/development/2.x/docs/validation.html
    websites/production/struts/content/development/2.x/docs/websphere.html
    websites/production/struts/content/development/2.x/docs/wildcard-method-selection.html

Modified: websites/production/struts/content/development/2.x/docs/building-struts-2-fast-track-release.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/building-struts-2-fast-track-release.html (original)
+++ websites/production/struts/content/development/2.x/docs/building-struts-2-fast-track-release.html Tue Oct  1 06:43:55 2013
@@ -137,22 +137,26 @@ under the License. 
         <div class="wiki-content">
             <div id="ConfluenceContent"><h1><a shape="rect" name="BuildingStruts2-Fasttrackrelease-Content"></a>Content</h1>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1370246252845 {margin-left: 0px;padding: 0px;}
-div.rbtoc1370246252845 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1370246252845 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1379779052399 {margin-left: 0px;padding: 0px;}
+div.rbtoc1379779052399 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1379779052399 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="rbtoc1370246252845">
-<ul><li><span class="TOCOutline">1</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-BuildingSteps%28Struts%29">Building Steps (Struts)</a></li><ul><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Gettingready">Getting ready</a></li><li><span class="TOCOutline">1.2</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Obtainafreshcheckoutofcreatedbranch.">Obtain a fresh checkout of created branch.</a></li><li><span class="TOCOutline">1.3</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Updateversionofarchetypes">Update version of archetypes</a></li><li><span class="TOCOutline">1.4</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Applysecuritypatch">Apply security patch</a></li><li><span class="TOCOutline">1.5</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Preparerelease">Prepare release</a></li><li><span class="TOCOutline">1.6</span> <a shape="rect" href="#BuildingStruts2
 -Fasttrackrelease-Performtherelease">Perform the release</a></li><li><span class="TOCOutline">1.7</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Movetheassembliestothe%2Fwww%2Fpeople.apache.org%2Fbuilds%2Fstruts%2F%24VERSIONdir">Move the assemblies to the /www/people.apache.org/builds/struts/$VERSION dir</a></li><li><span class="TOCOutline">1.8</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Jirastuff">Jira stuff</a></li><li><span class="TOCOutline">1.9</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Voteonit">Vote on it</a></li><li><span class="TOCOutline">1.10</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Copyfiles">Copy files</a></li><li><span class="TOCOutline">1.11</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Promoterelease">Promote release</a></li><li><span class="TOCOutline">1.12</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Cleanupoldreleases">Clean up old releases</a></li><li><
 span class="TOCOutline">1.13</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Waitforrsync">Wait for rsync</a></li><li><span class="TOCOutline">1.14</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-%28Optional%29UpdateSecurityBulletins">(Optional) - Update Security Bulletins</a></li><li><span class="TOCOutline">1.15</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Updatesite%28Struts2site%29">Update site (Struts 2 site)</a></li><li><span class="TOCOutline">1.16</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Updatesite%28Strutstoplevelsite%29">Update site (Struts top level site)</a></li><li><span class="TOCOutline">1.17</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Redeploythedraftdocs">Redeploy the draft docs</a></li><li><span class="TOCOutline">1.18</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Permissions">Permissions</a></li><li><span class="TOCOutline">1.19</span> <a shape="rect" href="#B
 uildingStruts2-Fasttrackrelease-Postannouncements">Post announcements</a></li></ul></ul></div>
+/*]]>*/</style><div class="rbtoc1379779052399">
+<ul><li><span class="TOCOutline">1</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-BuildingSteps%28Struts%29">Building Steps (Struts)</a></li><ul><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Gettingready">Getting ready</a></li><li><span class="TOCOutline">1.2</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Obtainafreshcheckoutofcreatedbranch.">Obtain a fresh checkout of created branch.</a></li><li><span class="TOCOutline">1.3</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Updateversionofarchetypes">Update version of archetypes</a></li><li><span class="TOCOutline">1.4</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Applysecuritypatch">Apply security patch</a></li><li><span class="TOCOutline">1.5</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Preparerelease">Prepare release</a></li><li><span class="TOCOutline">1.6</span> <a shape="rect" href="#BuildingStruts2
 -Fasttrackrelease-Performtherelease">Perform the release</a></li><li><span class="TOCOutline">1.7</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Movetheassembliestothe%2Fwww%2Fpeople.apache.org%2Fbuilds%2Fstruts%2F%24VERSIONdir">Move the assemblies to the /www/people.apache.org/builds/struts/$VERSION dir</a></li><li><span class="TOCOutline">1.8</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Jirastuff">Jira stuff</a></li><li><span class="TOCOutline">1.9</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Voteonit">Vote on it</a></li><li><span class="TOCOutline">1.10</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Copyfiles">Copy files</a></li><li><span class="TOCOutline">1.11</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Promoterelease">Promote release</a></li><li><span class="TOCOutline">1.12</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Cleanupoldreleases">Clean up old releases</a></li><li><
 span class="TOCOutline">1.13</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Waitforrsync">Wait for rsync</a></li><li><span class="TOCOutline">1.14</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-%28Optional%29UpdateSecurityBulletins">(Optional) - Update Security Bulletins</a></li><li><span class="TOCOutline">1.15</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Updatesite%28Strutstoplevelsite%29">Update site (Struts top level site)</a></li><li><span class="TOCOutline">1.16</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Updatesite%28Struts2site%29">Update site (Struts 2 site)</a></li><li><span class="TOCOutline">1.17</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Postannouncements">Post announcements</a></li></ul></ul></div>
 
 <h2><a shape="rect" name="BuildingStruts2-Fasttrackrelease-BuildingSteps%28Struts%29"></a>Building Steps (Struts)</h2>
 
 <h3><a shape="rect" name="BuildingStruts2-Fasttrackrelease-Gettingready"></a>Getting ready</h3>
-<ol><li>When a serious security issue arises, we should try to create a <tt>STRUTS_#_#_#_X</tt> branch from the last GA release (from tag - check it out and use <tt>mvn release:branch</tt> as below).
+<ol><li>Prepare new Security Bulletin - use just brief description about the security vulnerability, no examples, no proof-of-concept, anything that could be used against users, secure the page to allow access only member of struts-committers group in Confluence</li><li>Create a new Version Notes page in Confluence, link from <a shape="rect" href="migration-guide.html" title="Migration Guide">Migration Guide</a>, and link to prior release page and JIRA DONE filters of the version to release, secure the page to allow access only member of struts-committers group in Confluence</li><li>When a serious security issue arises, we should try to create a <tt>STRUTS_#_#_#_X</tt> branch from the last GA release (from tag - check it out and use <tt>mvn release:branch</tt> as below).
 <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre>mvn release:branch -DbranchName=STRUTS_#_#_#_X -DupdateBranchVersions=true -DupdateWorkingCopyVersions=false -DautoVersionSubmodules=true
+<pre>svn co https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_#_#_#
+
+cd STRUTS_#_#_#
+
+mvn release:branch -DbranchName=STRUTS_#_#_#_X -DupdateBranchVersions=true -DupdateWorkingCopyVersions=false -DautoVersionSubmodules=true
 </pre>
 </div></div>
-<p>Read the <a shape="rect" class="external-link" href="http://maven.apache.org/maven-release/maven-release-plugin/examples/branch.html">maven release:branch</a> docs for further details or alternatively </p></li><li>Apply to that branch only the security  patch</li><li>Commit the fix. No reference should be make to the commit being related to a security vulnerability.</li><li>If the patch first applies to some other dependency, implore the other group to do the same, to avoid side-effects from other changes.</li><li>Release the upcoming version in JIRA (under Administration/Manage Releases) and tag the release date</li><li>Create DONE and TODO filters for the new version, share with all, and remove obsolete TODO filter</li><li>Create a new Version Notes page in Confluence, link from <a shape="rect" href="migration-guide.html" title="Migration Guide">Migration Guide</a>, and link to prior release page and JIRA DONE filters of the version to release, secure the page to allow access o
 nly member of struts-committers group in Confluence</li></ol>
+<p>Read the <a shape="rect" class="external-link" href="http://maven.apache.org/maven-release/maven-release-plugin/examples/branch.html">maven release:branch</a> docs for further details or alternatively </p></li><li>Apply to that branch only the security  patch</li><li>Commit the fix. No reference should be make to the commit being related to a security vulnerability.</li><li>If the patch first applies to some other dependency, implore the other group to do the same, to avoid side-effects from other changes.</li><li>Release the upcoming version in JIRA (under Administration/Manage Releases) and tag the release date</li><li>Create DONE and TODO filters for the new version, share with all, and remove obsolete TODO filter</li></ol>
 
 
 <h3><a shape="rect" name="BuildingStruts2-Fasttrackrelease-Obtainafreshcheckoutofcreatedbranch."></a>Obtain a fresh checkout of created branch.</h3>
@@ -259,6 +263,10 @@ for f in struts2-assembly-*.pom*
 do
  rm $f
 done
+
+# remove unneeded hashes
+rm *.asc.md5
+rm *.asc.sha1
 ]]></script>
 </div></div>
 <p>After that move the assemblies directory to the builds destination with</p>
@@ -306,23 +314,6 @@ See <a shape="rect" class="external-link
 <h3><a shape="rect" name="BuildingStruts2-Fasttrackrelease-%28Optional%29UpdateSecurityBulletins"></a>(Optional) - Update Security Bulletins</h3>
 <p>If the release will fix a - hopefully yet undisclosed - security issue, it's now time to update the <a shape="rect" href="security-bulletins.html" title="Security Bulletins">Security Bulletins</a> page and add a new announcement. For a template, just check former announcements</p>
 
-<h3><a shape="rect" name="BuildingStruts2-Fasttrackrelease-Updatesite%28Struts2site%29"></a>Update site (Struts 2 site)</h3>
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-ssh people.apache.org
-export VERSION=2.#.#
-
-unzip /www/people.apache.org/builds/struts/$VERSION/struts-$VERSION-docs.zip -d ~/docs
-#now the docs are under ~/docs/struts-$VERSION/docs
-mkdir -p /www/struts.apache.org/$VERSION
-mv ~/docs/struts-$VERSION/docs/* /www/struts.apache.org/$VERSION
-chmod -R g+w /www/struts.apache.org/$VERSION
-chown -R :struts /www/struts.apache.org/$VERSION
-]]></script>
-</div></div>
-
-<p>Edit /www/struts.apache.org/$VERSION/archetype-catalog.xml and update the version of artifacts</p>
-
 <h3><a shape="rect" name="BuildingStruts2-Fasttrackrelease-Updatesite%28Strutstoplevelsite%29"></a>Update site (Struts top level site)</h3>
 <ul><li>Check out site src code
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -345,11 +336,28 @@ mvn site-deploy
 <p>It takes a few hours for the site changes to go live</p></li></ul>
 
 
-<h3><a shape="rect" name="BuildingStruts2-Fasttrackrelease-Redeploythedraftdocs"></a>Redeploy the draft docs</h3>
-<p>Make public available all the pages that could leak confidential information about the vulnerability. Wait or manually export the space in Confluence. Build snapshot locally and copy assembly/target/assembly/out/struts2-#.#.#-SNAPSHOT-docs.zip to people.apache.org and update /www/struts.apache.org/2.x/docs</p>
+<h3><a shape="rect" name="BuildingStruts2-Fasttrackrelease-Updatesite%28Struts2site%29"></a>Update site (Struts 2 site)</h3>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+svn co https://svn.apache.org/repos/infra/websites/production/struts/content/ struts-production-site
+
+export VERSION=2.3.X
+
+wget -erobots=off http://people.apache.org/builds/struts/$VERSION/struts-$VERSION-docs.zip
+
+unzip struts-$VERSION-docs.zip -d docs
+
+cd $VERSION
+
+mvn site:site site:stage -DstagingDirectory=struts-production-site/release/2.3.x/
+
+svn add ./ --force
 
-<h3><a shape="rect" name="BuildingStruts2-Fasttrackrelease-Permissions"></a>Permissions </h3>
-<p>After updating the site, be sure that the permissions are set to group writeable (<tt>$ chmod -R g+w .</tt> and <tt>$ chown -R :struts .</tt>) </p>
+svn status | grep '^\!' | sed 's/! *//' | awk 'BEGIN {FS="\t"};{print "\""$1"\""}' | xargs svn del --force
+
+svn commit -m "Updates release docs" --no-auth-cache
+]]></script>
+</div></div>
 
 <h3><a shape="rect" name="BuildingStruts2-Fasttrackrelease-Postannouncements"></a>Post announcements </h3>
 <p>We leave this as the last step, once the artifacts have had time to sync up on the mirrors. <br clear="none">

Modified: websites/production/struts/content/development/2.x/docs/building-struts-2-normal-release.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/building-struts-2-normal-release.html (original)
+++ websites/production/struts/content/development/2.x/docs/building-struts-2-normal-release.html Tue Oct  1 06:43:55 2013
@@ -138,11 +138,11 @@ under the License. 
         <div class="wiki-content">
             <div id="ConfluenceContent"><h1><a shape="rect" name="BuildingStruts2-Normalrelease-Content"></a>Content</h1>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1375365963244 {margin-left: 0px;padding: 0px;}
-div.rbtoc1375365963244 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1375365963244 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1379494986856 {margin-left: 0px;padding: 0px;}
+div.rbtoc1379494986856 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1379494986856 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="rbtoc1375365963244">
+/*]]>*/</style><div class="rbtoc1379494986856">
 <ul><li><span class="TOCOutline">1</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-BuildingSteps%28Struts%29">Building Steps (Struts)</a></li><ul><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Gettingready">Getting ready</a></li><li><span class="TOCOutline">1.2</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Obtainafreshcheckout.">Obtain a fresh checkout.</a></li><li><span class="TOCOutline">1.3</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Changesitetarget">Change site target</a></li><ul><li><span class="TOCOutline">1.3.1</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Before%3A">Before:</a></li><li><span class="TOCOutline">1.3.2</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-After%3A">After:</a></li></ul><li><span class="TOCOutline">1.4</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Updateversionofarchetypes">Update version of archetypes</a></li><li><span class
 ="TOCOutline">1.5</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Preparerelease">Prepare release</a></li><li><span class="TOCOutline">1.6</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Performtherelease">Perform the release</a></li><li><span class="TOCOutline">1.7</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Movetheassemblies">Move the assemblies</a></li><li><span class="TOCOutline">1.8</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Jirastuff">Jira stuff</a></li><li><span class="TOCOutline">1.9</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Announceavailability">Announce availability</a></li><li><span class="TOCOutline">1.10</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Voteonit">Vote on it</a></li><li><span class="TOCOutline">1.11</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Copyfiles">Copy files</a></li><li><span class="TOCOutline">1.12</span> <a shape="rect" href="#BuildingStruts2-Norm
 alrelease-Promoterelease">Promote release</a></li><li><span class="TOCOutline">1.13</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Cleanupoldreleases">Clean up old releases</a></li><li><span class="TOCOutline">1.14</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Waitforrsync">Wait for rsync</a></li><li><span class="TOCOutline">1.15</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-%28Optional%29UpdateSecurityBulletins">(Optional) - Update Security Bulletins</a></li><li><span class="TOCOutline">1.16</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Updatesite%28Struts2site%29">Update site (Struts 2 site)</a></li><li><span class="TOCOutline">1.17</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Updatesite%28Strutstoplevelsite%29">Update site (Struts top level site)</a></li><li><span class="TOCOutline">1.18</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Rollbacksitetarget">Rollback site target</a></li><li><span class=
 "TOCOutline">1.19</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Redeploythedraftdocs%28Optional%29">Redeploy the draft docs (Optional)</a></li><li><span class="TOCOutline">1.20</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Permissions">Permissions</a></li><li><span class="TOCOutline">1.21</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Postannouncements">Post announcements</a></li></ul></ul></div>
 
 <h2><a shape="rect" name="BuildingStruts2-Normalrelease-BuildingSteps%28Struts%29"></a>Building Steps (Struts)</h2>
@@ -286,16 +286,20 @@ do
  rm $f
 done
 
+# remove unneeded hashes
 rm *.asc.md5
 rm *.asc.sha1
 ]]></script>
 </div></div>
+
 <p>After that move the assemblies directory to the builds destination with</p>
+
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 mv $VERSION /www/people.apache.org/builds/struts/
 ]]></script>
 </div></div>
+
 <h3><a shape="rect" name="BuildingStruts2-Normalrelease-Jirastuff"></a>Jira stuff </h3>
 <ul><li>Update JIRA roadmap with tag/release date - release the version in JIRA</li><li>Add next milestone to the JIRA roadmap</li><li>Create DONE and TODO filters, share with all, and remove obsolete TODO filter</li><li>Create new release page, link from <a shape="rect" href="migration-guide.html" title="Migration Guide">Migration Guide</a>, and link to prior release page and JIRA filters</li></ul>
 

Modified: websites/production/struts/content/development/2.x/docs/config-browser-plugin.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/config-browser-plugin.html (original)
+++ websites/production/struts/content/development/2.x/docs/config-browser-plugin.html Tue Oct  1 06:43:55 2013
@@ -126,6 +126,7 @@ under the License. 
     <div class="pagecontent">
         <div class="wiki-content">
             <div id="ConfluenceContent"><p>The Config Browser Plugin is a simple tool to help view an application's configuration at runtime.  It is very useful when debugging problems that could be related to configuration issues.</p>
+<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">This plugin should be used only during development phase and access to it should be strictly restricted!</td></tr></table></div>
 
 <h2><a shape="rect" name="ConfigBrowserPlugin-Features"></a>Features</h2>
 
@@ -138,7 +139,7 @@ under the License. 
 
 <p><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" height="16" width="16" alt="" border="0"> In most cases (if you are using the default <a shape="rect" href="actionmapper.html" title="ActionMapper">ActionMapper</a>), the URL is something like <a shape="rect" class="external-link" href="http://localhost:8080/starter/config-browser/index.action" rel="nofollow">http://localhost:8080/starter/config-browser/index.action</a> or <a shape="rect" class="external-link" href="http://localhost:8080/starter/config-browser/index" rel="nofollow">http://localhost:8080/starter/config-browser/index</a>.</p>
 
-<h3><a shape="rect" name="ConfigBrowserPlugin-Example"></a>Example </h3>
+<h3><a shape="rect" name="ConfigBrowserPlugin-Example"></a>Example</h3>
 
 <p><span class="image-wrap" style=""><img src="config-browser-plugin.data/config-browser-example.png" style="border: 1px solid black"></span></p>
 

Modified: websites/production/struts/content/development/2.x/docs/core-developers-guide.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/core-developers-guide.html (original)
+++ websites/production/struts/content/development/2.x/docs/core-developers-guide.html Tue Oct  1 06:43:55 2013
@@ -136,8 +136,8 @@ under the License. 
 		<ul><li><a shape="rect" href="action-configuration.html" title="Action Configuration">Actions</a>, <a shape="rect" href="wildcard-mappings.html" title="Wildcard Mappings">Wildcard Mappings</a>, <a shape="rect" href="bean-configuration.html" title="Bean Configuration">Beans</a>, <a shape="rect" href="constant-configuration.html" title="Constant Configuration">Constants</a></li><li><a shape="rect" href="exception-configuration.html" title="Exception Configuration">Exceptions</a>, <a shape="rect" href="include-configuration.html" title="Include Configuration">Includes</a>, <a shape="rect" href="interceptor-configuration.html" title="Interceptor Configuration">Interceptors</a></li><li><a shape="rect" href="namespace-configuration.html" title="Namespace Configuration">Namespaces</a>, <a shape="rect" href="package-configuration.html" title="Package Configuration">Packages</a>, <a shape="rect" href="result-configuration.html" title="Result Configuration">Results</a></li><li><a shape="rec
 t" href="unknown-handlers.html" title="Unknown Handlers">Unknown Handlers</a></li></ul>
 		</li><li><a shape="rect" href="configuration-files.html" title="Configuration Files">Configuration Files</a>
 		<ul><li><a shape="rect" href="webxml.html" title="web.xml">web.xml</a></li><li><a shape="rect" href="strutsxml.html" title="struts.xml">struts.xml</a></li><li><a shape="rect" href="strutsproperties.html" title="struts.properties">struts.properties</a></li><li><a shape="rect" href="struts-defaultxml.html" title="struts-default.xml">struts-default.xml</a></li><li><a shape="rect" href="velocityproperties.html" title="velocity.properties">velocity.properties</a></li><li><a shape="rect" href="struts-defaultvm.html" title="struts-default.vm">struts-default.vm</a></li></ul>
-		</li><li><a shape="rect" href="application-servers.html" title="Application Servers">Application Servers</a></li><li><a shape="rect" href="performance-tuning.html" title="Performance Tuning">Performance Tuning</a> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" alt="" border="0"></li></ul>
-	</li></ul>
+		</li><li><a shape="rect" href="application-servers.html" title="Application Servers">Application Servers</a></li><li><a shape="rect" href="performance-tuning.html" title="Performance Tuning">Performance Tuning</a></li></ul>
+	</li><li><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" alt="" border="0"><a shape="rect" href="security.html" title="Security">Security</a></li></ul>
 </td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="testing-actions.html" title="Testing Actions">Testing Actions</a>
 	<ul><li><a shape="rect" class="external-link" href="http://arsenalist.com/2007/06/18/unit-testing-struts-2-actions-spring-junit/" rel="nofollow">(arsenalist)</a></li><li><a shape="rect" class="external-link" href="http://fassisrosa.blogspot.com/2006/11/unit-testing-struts-20.html" rel="nofollow">(rosa)</a></li></ul>
 	</li><li><a shape="rect" href="interceptors.html" title="Interceptors">Interceptors</a>
@@ -274,6 +274,9 @@ under the License. 
                                     $page.link($child)
                     <span class="smalltext">(Apache Struts 2 Documentation)</span>
                     <br>
+                                    $page.link($child)
+                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
+                    <br>
                             </div>
         
     </div>

Modified: websites/production/struts/content/development/2.x/docs/debugging-struts.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/debugging-struts.html (original)
+++ websites/production/struts/content/development/2.x/docs/debugging-struts.html Tue Oct  1 06:43:55 2013
@@ -156,7 +156,7 @@ under the License. 
 <p>In the example application, there is a link to the configuration browser on the index.jsp page.</p>
 
 <p>Clicking on the link for the configuration browser will cause the Struts 2 framework to return this page to your browser.<br clear="none">
-<span class="image-wrap" style=""><img src="debugging-struts.data/debuging-struts+1.png" style="border: 0px solid black"></span></p>
+<span class="image-wrap" style=""><img src="debugging-struts.data/debuging-struts-1.png" style="border: 0px solid black"></span></p>
 
 <p>You can click on an action link to see the configuration for that action.  For example clicking on the register action link results in this.<br clear="none">
 <span class="image-wrap" style=""><img src="debugging-struts.data/debuging-struts-2.png" style="border: 0px solid black"></span></p>

Added: websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/form-validation-1.png
==============================================================================
Binary file - no diff available.

Propchange: websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/form-validation-1.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/form-validation-2.png
==============================================================================
Binary file - no diff available.

Propchange: websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/form-validation-2.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/form-validation-3.png
==============================================================================
Binary file - no diff available.

Propchange: websites/production/struts/content/development/2.x/docs/form-validation-using-xml.data/form-validation-3.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: websites/production/struts/content/development/2.x/docs/form-validation-using-xml.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/form-validation-using-xml.html (original)
+++ websites/production/struts/content/development/2.x/docs/form-validation-using-xml.html Tue Oct  1 06:43:55 2013
@@ -147,7 +147,7 @@ under the License. 
 
 <p>To enable the user to edit his information that is stored in the Person object, we have this form:</p>
 
-<p><span class="image-wrap" style=""><img src="form-validation-using-xml.data/Screen+shot+2010-05-05+at+10.05.14+AM.png" style="border: 1px solid black"></span></p>
+<p><span class="image-wrap" style=""><img src="form-validation-using-xml.data/form-validation-1.png" style="border: 1px solid black"></span></p>
 
 <p>When the user submits the form, we want to validate his entries into the form fields.  </p>
 
@@ -183,7 +183,7 @@ under the License. 
 
 <p>For example if the user doesn't enter a value in the first name form field and clicks on the Save Changes button, he will see the following.</p>
 
-<p><span class="image-wrap" style=""><img src="form-validation-using-xml.data/Screen+shot+2010-05-05+at+10.25.38+AM.png" style="border: 1px solid black"></span></p>
+<p><span class="image-wrap" style=""><img src="form-validation-using-xml.data/form-validation-2.png" style="border: 1px solid black"></span></p>
 
 <h3><a shape="rect" name="FormValidationUsingXML-ValidatingAnEmailAddress"></a>Validating An Email Address</h3>
 <p>You can use the Struts 2 <a shape="rect" href="email-validator.html" title="email validator">email validator</a> to validate the user's input in the email field.  Here is the validator node that is in the EditAction-validation.xml file.</p>
@@ -217,7 +217,7 @@ under the License. 
  &lt;/validator&gt;
 &lt;validator type="regex"&gt;
 	&lt;param name="fieldname"&gt;personBean.phoneNumber&lt;/param&gt;
-	&lt;param name="expression"&gt;&lt;![CDATA[\d{3}-\d{3}-\d{4}]]&gt;&lt;/param&gt;
+	&lt;param name="regex"&gt;&lt;![CDATA[\d{3}-\d{3}-\d{4}]]&gt;&lt;/param&gt;
 	&lt;message&gt;Phone number must be entered as 999-999-9999.&lt;/message&gt;
 &lt;/validator&gt;
 
@@ -247,8 +247,7 @@ under the License. 
 
 <p>If the user did not check any of the check boxes, the Array returned by the getCarModels method will have a length value of 0.  Since the complete OGNL expression will only evaluate to true if the length value is greater than 0, the validation fails.  The user will see this.</p>
 
-<p><span class="image-wrap" style=""><img src="form-validation-using-xml.data/Screen+shot+2010-05-05+at+10.45.18+AM.png" style="border: 1px solid black"></span></p>
-
+<p><span class="image-wrap" style=""><img src="form-validation-using-xml.data/form-validation-3.png" style="border: 1px solid black"></span></p>
 
 <p>The fieldexpression validator is useful when doing conditional validation of a user's input.  If the OGNL expression doesn't evaluate to true then the user's input won't be allowed.</p>
 
@@ -262,7 +261,6 @@ under the License. 
 <div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Next </th><td colspan="1" rowspan="1" class="confluenceTd"> Onward to <a shape="rect" href="wildcard-method-selection.html" title="Wildcard Method Selection">Wildcard Method Selection</a> </td></tr></tbody></table>
 </div>
-
 </div>
         </div>
 

Modified: websites/production/struts/content/development/2.x/docs/getting-started.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/getting-started.html (original)
+++ websites/production/struts/content/development/2.x/docs/getting-started.html Tue Oct  1 06:43:55 2013
@@ -128,7 +128,9 @@ under the License. 
             <div id="ConfluenceContent"><div class="panelMacro"><table class="infoMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">The framework documentation is written for active web developers and assumes a working knowledge about how Java web applications are built. For more about the underlying nuts and bolts, see the <a shape="rect" class="external-link" href="http://struts.apache.org/primer.html">Key Technologies Primer</a>.</td></tr></table></div>
 
 
-<p>Follow along with these tutorials to get started using Struts 2.  The example project for each tutorial is available online at Google Code - <a shape="rect" class="external-link" href="http://code.google.com/p/struts2-examples/downloads/list" rel="nofollow">http://code.google.com/p/struts2-examples/downloads/list</a> in two different versions:  one version with all artifacts using Ant to build the application and one version using Maven to manage the artifacts and build the application.</p>
+<p>Follow along with these tutorials to get started using Struts 2.  The example code for the tutorialsis available for checkout from the <br clear="none">
+Struts 2 subversion sandbox at <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2examples">https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2examples</a>. The example projects use Maven<br clear="none">
+to manage the artifact dependencies and to build the .war files.</p>
 
 <div class="panelMacro"><table class="tipMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">The <a shape="rect" class="external-link" href="http://struts.apache.org/mail.html">Struts 2 user mailing list</a> is an excellent place to get help.  If you are having a problem getting the tutorial example applications to work search the Struts 2 mailing list.  If you don't find an answer to your problem, post a question on the mailing list.</td></tr></table></div>
 

Modified: websites/production/struts/content/development/2.x/docs/guides.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/guides.html (original)
+++ websites/production/struts/content/development/2.x/docs/guides.html Tue Oct  1 06:43:55 2013
@@ -142,8 +142,8 @@ under the License. 
 		<ul><li><a shape="rect" href="action-configuration.html" title="Action Configuration">Actions</a>, <a shape="rect" href="wildcard-mappings.html" title="Wildcard Mappings">Wildcard Mappings</a>, <a shape="rect" href="bean-configuration.html" title="Bean Configuration">Beans</a>, <a shape="rect" href="constant-configuration.html" title="Constant Configuration">Constants</a></li><li><a shape="rect" href="exception-configuration.html" title="Exception Configuration">Exceptions</a>, <a shape="rect" href="include-configuration.html" title="Include Configuration">Includes</a>, <a shape="rect" href="interceptor-configuration.html" title="Interceptor Configuration">Interceptors</a></li><li><a shape="rect" href="namespace-configuration.html" title="Namespace Configuration">Namespaces</a>, <a shape="rect" href="package-configuration.html" title="Package Configuration">Packages</a>, <a shape="rect" href="result-configuration.html" title="Result Configuration">Results</a></li><li><a shape="rec
 t" href="unknown-handlers.html" title="Unknown Handlers">Unknown Handlers</a></li></ul>
 		</li><li><a shape="rect" href="configuration-files.html" title="Configuration Files">Configuration Files</a>
 		<ul><li><a shape="rect" href="webxml.html" title="web.xml">web.xml</a></li><li><a shape="rect" href="strutsxml.html" title="struts.xml">struts.xml</a></li><li><a shape="rect" href="strutsproperties.html" title="struts.properties">struts.properties</a></li><li><a shape="rect" href="struts-defaultxml.html" title="struts-default.xml">struts-default.xml</a></li><li><a shape="rect" href="velocityproperties.html" title="velocity.properties">velocity.properties</a></li><li><a shape="rect" href="struts-defaultvm.html" title="struts-default.vm">struts-default.vm</a></li></ul>
-		</li><li><a shape="rect" href="application-servers.html" title="Application Servers">Application Servers</a></li><li><a shape="rect" href="performance-tuning.html" title="Performance Tuning">Performance Tuning</a> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" alt="" border="0"></li></ul>
-	</li></ul>
+		</li><li><a shape="rect" href="application-servers.html" title="Application Servers">Application Servers</a></li><li><a shape="rect" href="performance-tuning.html" title="Performance Tuning">Performance Tuning</a></li></ul>
+	</li><li><img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" alt="" border="0"><a shape="rect" href="security.html" title="Security">Security</a></li></ul>
 </td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="testing-actions.html" title="Testing Actions">Testing Actions</a>
 	<ul><li><a shape="rect" class="external-link" href="http://arsenalist.com/2007/06/18/unit-testing-struts-2-actions-spring-junit/" rel="nofollow">(arsenalist)</a></li><li><a shape="rect" class="external-link" href="http://fassisrosa.blogspot.com/2006/11/unit-testing-struts-20.html" rel="nofollow">(rosa)</a></li></ul>
 	</li><li><a shape="rect" href="interceptors.html" title="Interceptors">Interceptors</a>
@@ -215,7 +215,7 @@ under the License. 
 
 <h3><a shape="rect" name="Guides-VersionNotes2.3.x"></a>Version Notes 2.3.x</h3>
 
-<ul><li><a shape="rect" href="version-notes-2316.html" title="Version Notes 2.3.16">Version Notes 2.3.16</a></li><li><a shape="rect" href="version-notes-23151.html" title="Version Notes 2.3.15.1">Version Notes 2.3.15.1</a></li><li><a shape="rect" href="version-notes-2315.html" title="Version Notes 2.3.15">Version Notes 2.3.15</a></li><li><a shape="rect" href="version-notes-23143.html" title="Version Notes 2.3.14.3">Version Notes 2.3.14.3</a></li><li><a shape="rect" href="version-notes-23142.html" title="Version Notes 2.3.14.2">Version Notes 2.3.14.2</a></li><li><a shape="rect" href="version-notes-23141.html" title="Version Notes 2.3.14.1">Version Notes 2.3.14.1</a></li><li><a shape="rect" href="version-notes-2314.html" title="Version Notes 2.3.14">Version Notes 2.3.14</a></li><li><a shape="rect" href="version-notes-23120.html" title="Version Notes 2.3.12.0">Version Notes 2.3.12.0</a></li><li><a shape="rect" href="version-notes-238.html" title="Version Notes 2.3.8">Version Notes 2.3.
 8</a></li><li><a shape="rect" href="version-notes-237.html" title="Version Notes 2.3.7">Version Notes 2.3.7</a></li><li><a shape="rect" href="version-notes-2341.html" title="Version Notes 2.3.4.1">Version Notes 2.3.4.1</a></li><li><a shape="rect" href="version-notes-234.html" title="Version Notes 2.3.4">Version Notes 2.3.4</a></li><li><a shape="rect" href="version-notes-233.html" title="Version Notes 2.3.3">Version Notes 2.3.3</a></li><li><a shape="rect" href="version-notes-2312.html" title="Version Notes 2.3.1.2">Version Notes 2.3.1.2</a></li><li><a shape="rect" href="version-notes-2311.html" title="Version Notes 2.3.1.1">Version Notes 2.3.1.1</a></li><li><a shape="rect" href="version-notes-231.html" title="Version Notes 2.3.1">Version Notes 2.3.1</a></li></ul>
+<ul><li><a shape="rect" href="version-notes-2316.html" title="Version Notes 2.3.16">Version Notes 2.3.16</a> - TBD</li><li><a shape="rect" href="version-notes-23152.html" title="Version Notes 2.3.15.2">Version Notes 2.3.15.2</a></li><li><a shape="rect" href="version-notes-23151.html" title="Version Notes 2.3.15.1">Version Notes 2.3.15.1</a></li><li><a shape="rect" href="version-notes-2315.html" title="Version Notes 2.3.15">Version Notes 2.3.15</a></li><li><a shape="rect" href="version-notes-23143.html" title="Version Notes 2.3.14.3">Version Notes 2.3.14.3</a></li><li><a shape="rect" href="version-notes-23142.html" title="Version Notes 2.3.14.2">Version Notes 2.3.14.2</a></li><li><a shape="rect" href="version-notes-23141.html" title="Version Notes 2.3.14.1">Version Notes 2.3.14.1</a></li><li><a shape="rect" href="version-notes-2314.html" title="Version Notes 2.3.14">Version Notes 2.3.14</a></li><li><a shape="rect" href="version-notes-23120.html" title="Version Notes 2.3.12.0">Version
  Notes 2.3.12.0</a></li><li><a shape="rect" href="version-notes-238.html" title="Version Notes 2.3.8">Version Notes 2.3.8</a></li><li><a shape="rect" href="version-notes-237.html" title="Version Notes 2.3.7">Version Notes 2.3.7</a></li><li><a shape="rect" href="version-notes-2341.html" title="Version Notes 2.3.4.1">Version Notes 2.3.4.1</a></li><li><a shape="rect" href="version-notes-234.html" title="Version Notes 2.3.4">Version Notes 2.3.4</a></li><li><a shape="rect" href="version-notes-233.html" title="Version Notes 2.3.3">Version Notes 2.3.3</a></li><li><a shape="rect" href="version-notes-2312.html" title="Version Notes 2.3.1.2">Version Notes 2.3.1.2</a></li><li><a shape="rect" href="version-notes-2311.html" title="Version Notes 2.3.1.1">Version Notes 2.3.1.1</a></li><li><a shape="rect" href="version-notes-231.html" title="Version Notes 2.3.1">Version Notes 2.3.1</a></li></ul>
 
 
 <h3><a shape="rect" name="Guides-VersionNotes2.2.x"></a>Version Notes 2.2.x</h3>

Modified: websites/production/struts/content/development/2.x/docs/home.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/home.html (original)
+++ websites/production/struts/content/development/2.x/docs/home.html Tue Oct  1 06:43:55 2013
@@ -127,7 +127,7 @@ under the License. 
         <div class="wiki-content">
             <div id="ConfluenceContent"><p>Apache Struts 2 is an elegant, extensible framework for building enterprise-ready Java web applications. <a shape="rect" class="external-link" href="http://struts.apache.org/downloads.html">Distributions of Struts 2</a> are available as a free download under the Apache License. </p>
 
-<ul><li>For more about the Apache Struts project itself, visit the <a shape="rect" class="external-link" href="http://struts.apache.org/">project web site</a>.</li><li>Struts 2 is extended using <a shape="rect" href="plugins.html" title="Plugins">Plugins</a>. A list of available plugins is available at the <a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/home.html">Struts 2 Plugin Registry</a>.</li><li>Tired of XML-based configurations, or need some extra agility? Try the <a shape="rect" href="convention-plugin.html" title="Convention Plugin">Convention Plugin</a> or its RESTful cousin, the <a shape="rect" href="rest-plugin.html" title="REST Plugin">REST Plugin</a>.</li><li>Interested in books, articles, and presentations about Struts? Check out some <a shape="rect" href="other-resources.html" title="Other Resources">Other Resources</a>.</li><li>For other community-supported Struts resources, visit the <a shape="rect" class="external-link" href="http://c
 wiki.apache.org/S2WIKI/welcome-to-apache-struts2.html">Struts 2 Wiki</a>.</li></ul>
+<ul><li>For more about the Apache Struts project itself, visit the <a shape="rect" class="external-link" href="http://struts.apache.org/">project web site</a>.</li><li><b>Quickstart</b> with <a shape="rect" href="struts-2-maven-archetypes.html" title="Struts 2 Maven Archetypes">Struts 2 Maven Archetypes</a>.</li><li>Struts 2 is extended using <a shape="rect" href="plugins.html" title="Plugins">Plugins</a>. A list of available plugins is available at the <a shape="rect" class="external-link" href="http://cwiki.apache.org/S2PLUGINS/home.html">Struts 2 Plugin Registry</a>.</li><li>Tired of XML-based configurations, or need some extra agility? Try the <a shape="rect" href="convention-plugin.html" title="Convention Plugin">Convention Plugin</a> or its RESTful cousin, the <a shape="rect" href="rest-plugin.html" title="REST Plugin">REST Plugin</a>.</li><li>Interested in books, articles, and presentations about Struts? Check out some <a shape="rect" href="other-resources.html" title="Other 
 Resources">Other Resources</a>.</li><li>For other community-supported Struts resources, visit the <a shape="rect" class="external-link" href="http://cwiki.apache.org/S2WIKI/welcome-to-apache-struts2.html">Struts 2 Wiki</a>.</li></ul>
 
 
 <p>The contents of the Struts 2 documentation wiki (what you're reading now) are distributed with each release, but maintained via the on-line wiki. </p>

Modified: websites/production/struts/content/development/2.x/docs/interceptors.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/interceptors.html (original)
+++ websites/production/struts/content/development/2.x/docs/interceptors.html Tue Oct  1 06:43:55 2013
@@ -593,7 +593,7 @@ includeMethods takes precedence over exc
 
 
 <h3><a shape="rect" name="Interceptors-InterceptorParameterOverriding"></a>Interceptor Parameter Overriding</h3>
-<p>Interceptor's parameter could be overriden through the following ways :</p>
+<p>Interceptor's parameter could be overridden through the following ways :</p>
 
 <p><b>Method 1</b>: </p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -612,25 +612,28 @@ includeMethods takes precedence over exc
     &lt;interceptor-ref name="params"/&gt;
     &lt;interceptor-ref name="conversionError"/&gt;
     &lt;interceptor-ref name="validation"&gt;
-    &lt;param name="excludeMethods"&gt;myValidationExcudeMethod&lt;/param&gt;
+        &lt;param name="excludeMethods"&gt;myValidationExcudeMethod&lt;/param&gt;
     &lt;/interceptor-ref&gt;
     &lt;interceptor-ref name="workflow"&gt;
-    &lt;param name="excludeMethods"&gt;myWorkflowExcludeMethod&lt;/param&gt;
+        &lt;param name="excludeMethods"&gt;myWorkflowExcludeMethod&lt;/param&gt;
     &lt;/interceptor-ref&gt;
 &lt;/action&gt;
 ]]></script>
 </div></div>
+
 <p><b>Method 2</b>:</p>
+
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;action name="myAction" class="myActionClass"&gt;
-  &lt;interceptor-ref name="defaultStack"&gt;
-    &lt;param name="validation.excludeMethods"&gt;myValidationExcludeMethod&lt;/param&gt;
-    &lt;param name="workflow.excludeMethods"&gt;myWorkflowExcludeMethod&lt;/param&gt;
-  &lt;/interceptor-ref&gt;
+    &lt;interceptor-ref name="defaultStack"&gt;
+        &lt;param name="validation.excludeMethods"&gt;myValidationExcludeMethod&lt;/param&gt;
+        &lt;param name="workflow.excludeMethods"&gt;myWorkflowExcludeMethod&lt;/param&gt;
+    &lt;/interceptor-ref&gt;
 &lt;/action&gt;
 ]]></script>
 </div></div>
+
 <p>In the first method, the whole default stack is copied and the parameter then changed accordingly.</p>
 
 <p>In the second method, the <tt>interceptor-ref</tt> refers to an existing interceptor-stack, namely <tt>defaultStack</tt> in this example, and override the <tt>validator</tt> and <tt>workflow</tt> interceptor <tt>excludeMethods</tt> attribute. Note that in the <tt>param</tt> tag, the name attribute contains a dot (.) the word before the dot(.) specifies the interceptor name whose parameter is to be overridden and the word after the dot (.) specifies the parameter itself. The syntax is as follows:</p>
@@ -641,6 +644,22 @@ includeMethods takes precedence over exc
 </div></div>
 <p>Note also that in this case the <tt>interceptor-ref</tt> name attribute is used to indicate an interceptor stack which makes sense as if it is referring to the interceptor itself it would be just using Method 1 describe above. </p>
 
+<p><b>Method 3</b>:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;interceptors&gt;
+    &lt;interceptor-stack name="parentStack"&gt;
+        &lt;interceptor-ref name="defaultStack"&gt;
+            &lt;param name="params.excludeParams"&gt;token&lt;/param&gt;
+        &lt;/interceptor-ref&gt;
+    &lt;/interceptor-stack&gt;
+&lt;/interceptors&gt;
+
+&lt;default-interceptor-ref name="parentStack"/&gt;
+]]></script>
+</div></div>
+
 <h3><a shape="rect" name="Interceptors-InterceptorParameterOverridingInheritance"></a>Interceptor Parameter Overriding Inheritance</h3>
 
 <p>Parameters override are not inherited in interceptors, meaning that the last set of overridden parameters will be used. For example, if a stack overrides the parameter "defaultBlock" for the "postPrepareParameterFilter" interceptor as:</p>

Modified: websites/production/struts/content/development/2.x/docs/json-plugin.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/json-plugin.html (original)
+++ websites/production/struts/content/development/2.x/docs/json-plugin.html Tue Oct  1 06:43:55 2013
@@ -539,7 +539,23 @@ public class JSONExample {
 <ol><li>Add the map inside a package that extends "json-default"</li><li>Add a result of type "json"</li></ol>
 
 
-<p>Example:</p>
+<p>Example with Convention Plugin Configuration:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+import java.util.HashMap;
+import java.util.Map;
+
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.convention.annotation.Result;
+
+@Result(type = "json")
+public class JSONExample extends ActionSupport {
+// action code
+}
+]]></script>
+</div></div>
+
+<p>Example with XML Configuration:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;?xml version="1.0" encoding="UTF-8" ?&gt;

Modified: websites/production/struts/content/development/2.x/docs/migration-guide.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/migration-guide.html (original)
+++ websites/production/struts/content/development/2.x/docs/migration-guide.html Tue Oct  1 06:43:55 2013
@@ -130,7 +130,7 @@ under the License. 
 
 <h3><a shape="rect" name="MigrationGuide-VersionNotes2.3.x"></a>Version Notes 2.3.x</h3>
 
-<ul><li><a shape="rect" href="version-notes-2316.html" title="Version Notes 2.3.16">Version Notes 2.3.16</a></li><li><a shape="rect" href="version-notes-23151.html" title="Version Notes 2.3.15.1">Version Notes 2.3.15.1</a></li><li><a shape="rect" href="version-notes-2315.html" title="Version Notes 2.3.15">Version Notes 2.3.15</a></li><li><a shape="rect" href="version-notes-23143.html" title="Version Notes 2.3.14.3">Version Notes 2.3.14.3</a></li><li><a shape="rect" href="version-notes-23142.html" title="Version Notes 2.3.14.2">Version Notes 2.3.14.2</a></li><li><a shape="rect" href="version-notes-23141.html" title="Version Notes 2.3.14.1">Version Notes 2.3.14.1</a></li><li><a shape="rect" href="version-notes-2314.html" title="Version Notes 2.3.14">Version Notes 2.3.14</a></li><li><a shape="rect" href="version-notes-23120.html" title="Version Notes 2.3.12.0">Version Notes 2.3.12.0</a></li><li><a shape="rect" href="version-notes-238.html" title="Version Notes 2.3.8">Version Notes 2.3.
 8</a></li><li><a shape="rect" href="version-notes-237.html" title="Version Notes 2.3.7">Version Notes 2.3.7</a></li><li><a shape="rect" href="version-notes-2341.html" title="Version Notes 2.3.4.1">Version Notes 2.3.4.1</a></li><li><a shape="rect" href="version-notes-234.html" title="Version Notes 2.3.4">Version Notes 2.3.4</a></li><li><a shape="rect" href="version-notes-233.html" title="Version Notes 2.3.3">Version Notes 2.3.3</a></li><li><a shape="rect" href="version-notes-2312.html" title="Version Notes 2.3.1.2">Version Notes 2.3.1.2</a></li><li><a shape="rect" href="version-notes-2311.html" title="Version Notes 2.3.1.1">Version Notes 2.3.1.1</a></li><li><a shape="rect" href="version-notes-231.html" title="Version Notes 2.3.1">Version Notes 2.3.1</a></li></ul>
+<ul><li><a shape="rect" href="version-notes-2316.html" title="Version Notes 2.3.16">Version Notes 2.3.16</a> - TBD</li><li><a shape="rect" href="version-notes-23152.html" title="Version Notes 2.3.15.2">Version Notes 2.3.15.2</a></li><li><a shape="rect" href="version-notes-23151.html" title="Version Notes 2.3.15.1">Version Notes 2.3.15.1</a></li><li><a shape="rect" href="version-notes-2315.html" title="Version Notes 2.3.15">Version Notes 2.3.15</a></li><li><a shape="rect" href="version-notes-23143.html" title="Version Notes 2.3.14.3">Version Notes 2.3.14.3</a></li><li><a shape="rect" href="version-notes-23142.html" title="Version Notes 2.3.14.2">Version Notes 2.3.14.2</a></li><li><a shape="rect" href="version-notes-23141.html" title="Version Notes 2.3.14.1">Version Notes 2.3.14.1</a></li><li><a shape="rect" href="version-notes-2314.html" title="Version Notes 2.3.14">Version Notes 2.3.14</a></li><li><a shape="rect" href="version-notes-23120.html" title="Version Notes 2.3.12.0">Version
  Notes 2.3.12.0</a></li><li><a shape="rect" href="version-notes-238.html" title="Version Notes 2.3.8">Version Notes 2.3.8</a></li><li><a shape="rect" href="version-notes-237.html" title="Version Notes 2.3.7">Version Notes 2.3.7</a></li><li><a shape="rect" href="version-notes-2341.html" title="Version Notes 2.3.4.1">Version Notes 2.3.4.1</a></li><li><a shape="rect" href="version-notes-234.html" title="Version Notes 2.3.4">Version Notes 2.3.4</a></li><li><a shape="rect" href="version-notes-233.html" title="Version Notes 2.3.3">Version Notes 2.3.3</a></li><li><a shape="rect" href="version-notes-2312.html" title="Version Notes 2.3.1.2">Version Notes 2.3.1.2</a></li><li><a shape="rect" href="version-notes-2311.html" title="Version Notes 2.3.1.1">Version Notes 2.3.1.1</a></li><li><a shape="rect" href="version-notes-231.html" title="Version Notes 2.3.1">Version Notes 2.3.1</a></li></ul>
 
 
 <h3><a shape="rect" name="MigrationGuide-VersionNotes2.2.x"></a>Version Notes 2.2.x</h3>
@@ -363,6 +363,9 @@ under the License. 
                                     $page.link($child)
                     <span class="smalltext">(Apache Struts 2 Documentation)</span>
                     <br>
+                                    $page.link($child)
+                    <span class="smalltext">(Apache Struts 2 Documentation)</span>
+                    <br>
                             </div>
         
     </div>

Modified: websites/production/struts/content/development/2.x/docs/redirect-result.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/redirect-result.html (original)
+++ websites/production/struts/content/development/2.x/docs/redirect-result.html Tue Oct  1 06:43:55 2013
@@ -179,16 +179,16 @@ This result follows the same rules from 
 &lt;package name="passingRequestParameters" extends="struts-default" namespace="/passingRequestParameters"&gt;
    &lt;-- Pass parameters (reportType, width and height) --&gt;
    &lt;!--
-   The redirect-action url generated will be :
-   /genReport/generateReport.jsp?reportType=pie&amp;width=100&amp;height=100#summary
+   The redirect url generated will be - the namespace of current acction will be appended as location doesn't start with "/":
+   /passingRequestParameters/generateReport.jsp?reportType=pie&amp;width=100&amp;height=100#summary
    --&gt;
    &lt;action name="gatherReportInfo" class="..."&gt;
       &lt;result name="showReportResult" type="redirect"&gt;
          &lt;param name="location"&gt;generateReport.jsp&lt;/param&gt;
-         &lt;param name="namespace"&gt;/genReport&lt;/param&gt;
          &lt;param name="reportType"&gt;pie&lt;/param&gt;
          &lt;param name="width"&gt;100&lt;/param&gt;
          &lt;param name="height"&gt;100&lt;/param&gt;
+         &lt;param name="parse"&gt;false&lt;/param&gt;
          &lt;param name="anchor"&gt;summary&lt;/param&gt;
       &lt;/result&gt;
    &lt;/action&gt;

Added: websites/production/struts/content/development/2.x/docs/s2-018.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/s2-018.html (added)
+++ websites/production/struts/content/development/2.x/docs/s2-018.html Tue Oct  1 06:43:55 2013
@@ -0,0 +1,163 @@
+<!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-018</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-018.html">S2-018</a>
+        </td>
+        <td align="right" valign="middle" nowrap>
+            <form name="search" action="http://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-018</div>
+
+        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34019020">
+                <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=34019020">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=34019020">
+                <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=34019020">Add Page</a>
+            &nbsp;
+            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34019020">
+                <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=34019020">Add News</a>
+        </div>
+    </div>
+
+    <div class="pagecontent">
+        <div class="wiki-content">
+            <div id="ConfluenceContent"><h2><a shape="rect" name="S2-018-Summary"></a>Summary</h2>
+
+
+<p>Broken Access Control Vulnerability in Apache Struts2</p>
+
+
+<div class="table-wrap">
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Who should read this </th><td colspan="1" rowspan="1" class="confluenceTd"> All Struts 2 developers and users </td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> Impact of vulnerability </th><td colspan="1" rowspan="1" class="confluenceTd"> Permissions, Privileges, and Access Controls </td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> Maximum security rating </th><td colspan="1" rowspan="1" class="confluenceTd"> Important </td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> Recommendation </th><td colspan="1" rowspan="1" class="confluenceTd"> Developers should immediately upgrade to <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23152">Struts 2.3.15.2</a> </td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> Affected Software </th><td colspan="1" rowspan="1" class="confluenceTd"> Struts 2.0.0 - Struts 2.3.1
 5.1 </td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> Reporter </th><td colspan="1" rowspan="1" class="confluenceTd"> Zhu Gang, Zhang Jin, Huawei PSIRT </td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> CVE Identifier </th><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4310" rel="nofollow">CVE-2013-4310</a> </td></tr></tbody></table>
+</div>
+
+
+<h2><a shape="rect" name="S2-018-Problem"></a>Problem</h2>
+
+<p>The Struts 2 action mapping mechanism supports the special parameter prefix action: which is intended to help with attaching navigational information to buttons within forms.</p>
+
+<p>In Struts 2 before 2.3.15.2, under certain conditions this can be used to bypass security constraints. More details will available later on when the patch will be widely adopted.</p>
+
+<h2><a shape="rect" name="S2-018-Solution"></a>Solution</h2>
+
+<p>In Struts 2.3.15.2 the action mapping mechanism was changed to avoid circumventing security constraints.</p>
+
+<p>Another option is to write your own ActionMapper and completely drop support for "action:" prefix if support for multiple submit buttons isn't used. Consult manual how to write your own ActionMapper.</p>
+
+<div class="panelMacro"><table class="noteMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Backward Compatibility</b><br clear="none">After upgrading to Struts &gt;= 2.3.15.2, applications using the "action:" should still work as expected.</td></tr></table></div>
+
+<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>It is strongly recommended to upgrade to</b> <b><a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23152">Struts 2.3.15.2</a></b><b>, which contains the corrected Struts2-Core library.</b></td></tr></table></div></div>
+        </div>
+
+        
+    </div>
+</div>
+<div class="footer">
+    Generated by CXF SiteExporter
+</div>
+</body>
+</html>
\ No newline at end of file

Added: websites/production/struts/content/development/2.x/docs/s2-019.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/s2-019.html (added)
+++ websites/production/struts/content/development/2.x/docs/s2-019.html Tue Oct  1 06:43:55 2013
@@ -0,0 +1,175 @@
+<!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>
+    <link href='http://struts.apache.org/highlighter/style/shCoreStruts.css' rel='stylesheet' type='text/css' />
+    <link href='http://struts.apache.org/highlighter/style/shThemeStruts.css' rel='stylesheet' type='text/css' />
+    <script src='http://struts.apache.org/highlighter/js/shCore.js' type='text/javascript'></script>
+            <script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
+            <script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
+    
+    <script type="text/javascript">
+        SyntaxHighlighter.defaults['toolbar'] = false;
+        SyntaxHighlighter.all();
+    </script>
+    <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-019</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-019.html">S2-019</a>
+        </td>
+        <td align="right" valign="middle" nowrap>
+            <form name="search" action="http://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-019</div>
+
+        <div class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+            <a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=34019414">
+                <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=34019414">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=34019414">
+                <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=34019414">Add Page</a>
+            &nbsp;
+            <a href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=34019414">
+                <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=34019414">Add News</a>
+        </div>
+    </div>
+
+    <div class="pagecontent">
+        <div class="wiki-content">
+            <div id="ConfluenceContent"><h2><a shape="rect" name="S2-019-Summary"></a>Summary</h2>
+
+
+<p>Dynamic Method Invocation disabled by default</p>
+
+
+<div class="table-wrap">
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Who should read this </th><td colspan="1" rowspan="1" class="confluenceTd"> All Struts 2 developers and users </td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> Impact of vulnerability </th><td colspan="1" rowspan="1" class="confluenceTd"> Dynamic method executions </td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> Maximum security rating </th><td colspan="1" rowspan="1" class="confluenceTd"> Important </td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> Recommendation </th><td colspan="1" rowspan="1" class="confluenceTd"> Developers should immediately upgrade to <a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23152">Struts 2.3.15.2</a> </td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> Affected Software </th><td colspan="1" rowspan="1" class="confluenceTd"> Struts 2.0.0 - Struts 2.3.15.1 </td></tr><tr><
 th colspan="1" rowspan="1" class="confluenceTh"> Reporter </th><td colspan="1" rowspan="1" class="confluenceTd"> Direct mail to security@struts.apache.org </td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"> CVE Identifier </th><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4316" rel="nofollow">CVE-2013-4316</a> </td></tr></tbody></table>
+</div>
+
+
+<h2><a shape="rect" name="S2-019-Problem"></a>Problem</h2>
+
+<p>Dynamic Method Invocation is a mechanism known to impose possible security vulnerabilities, but until now it was enabled by default with warning that users should switch it off if possible.</p>
+
+<h2><a shape="rect" name="S2-019-Solution"></a>Solution</h2>
+
+<p>In Struts 2.3.15.2 the Dynamic Method Invocation is to false by default. Another option is to set <tt>struts.enable.DynamicMethodInvocation</tt> to false in struts.xml</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;constant name="struts.enable.DynamicMethodInvocation" value="false"/&gt;
+]]></script>
+</div></div>
+
+<div class="panelMacro"><table class="noteMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>Backward Compatibility</b><br clear="none">Disabling Dynamic Method Invocation can break your application if it uses DMI heavily. Nevertheless, please consider to refactor your application to avoid DMI.</td></tr></table></div>
+
+<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1"><b>It is strongly recommended to upgrade to</b> <b><a shape="rect" class="external-link" href="http://struts.apache.org/download.cgi#struts23152">Struts 2.3.15.2</a></b><b>, which contains the corrected Struts2-Core library.</b></td></tr></table></div></div>
+        </div>
+
+        
+    </div>
+</div>
+<div class="footer">
+    Generated by CXF SiteExporter
+</div>
+</body>
+</html>
\ No newline at end of file