struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject svn commit: r900210 [1/2] - /websites/production/struts/content/release/2.3.x/docs/
Date Thu, 06 Mar 2014 08:09:27 GMT
Author: lukaszlenart
Date: Thu Mar  6 08:09:26 2014
New Revision: 900210

Log:
Adds missing pages

Added:
    websites/production/struts/content/release/2.3.x/docs/s2-020.html
    websites/production/struts/content/release/2.3.x/docs/version-notes-23161.html
Modified:
    websites/production/struts/content/release/2.3.x/docs/action-configuration.html
    websites/production/struts/content/release/2.3.x/docs/actionmapper.html
    websites/production/struts/content/release/2.3.x/docs/ajax-and-javascript-recipes.html
    websites/production/struts/content/release/2.3.x/docs/building-struts-2-fast-track-release.html
    websites/production/struts/content/release/2.3.x/docs/building-struts-2-normal-release.html
    websites/production/struts/content/release/2.3.x/docs/building-struts-annotations.html
    websites/production/struts/content/release/2.3.x/docs/building-struts-master.html
    websites/production/struts/content/release/2.3.x/docs/cdi-plugin.html
    websites/production/struts/content/release/2.3.x/docs/convention-plugin.html
    websites/production/struts/content/release/2.3.x/docs/file-upload.html
    websites/production/struts/content/release/2.3.x/docs/guides.html
    websites/production/struts/content/release/2.3.x/docs/hello-world-using-struts-2.html
    websites/production/struts/content/release/2.3.x/docs/interceptors.html
    websites/production/struts/content/release/2.3.x/docs/migration-guide.html
    websites/production/struts/content/release/2.3.x/docs/one-time-steps.html
    websites/production/struts/content/release/2.3.x/docs/rest-plugin.html
    websites/production/struts/content/release/2.3.x/docs/sample-announcements.html
    websites/production/struts/content/release/2.3.x/docs/security-bulletins.html
    websites/production/struts/content/release/2.3.x/docs/struts-2-blank-archetype.html
    websites/production/struts/content/release/2.3.x/docs/struts-2-maven-archetypes.html
    websites/production/struts/content/release/2.3.x/docs/struts-2-spring-2-jpa-ajax.html
    websites/production/struts/content/release/2.3.x/docs/type-conversion.html
    websites/production/struts/content/release/2.3.x/docs/using-freemarker-templates.html
    websites/production/struts/content/release/2.3.x/docs/validation.html

Modified: websites/production/struts/content/release/2.3.x/docs/action-configuration.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/action-configuration.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/action-configuration.html Thu Mar  6 08:09:26 2014
@@ -138,11 +138,11 @@ under the License. 
             <div id="ConfluenceContent"><p>The action mappings are the basic "unit-of-work" in the framework. Essentially, the action maps an identifier to a handler class. When a request matches the action's name, the framework uses the mapping to determine how to process the request.</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1393705478121 {padding: 0px;}
-div.rbtoc1393705478121 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1393705478121 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1394091979328 {padding: 0px;}
+div.rbtoc1394091979328 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1394091979328 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1393705478121">
+/*]]>*/</style><div class="toc-macro rbtoc1394091979328">
 <ul class="toc-indentation"><li><a shape="rect" href="#ActionConfiguration-ActionMappings">Action Mappings</a></li><li><a shape="rect" href="#ActionConfiguration-ActionNames">Action Names</a></li><li><a shape="rect" href="#ActionConfiguration-ActionMethods">Action Methods</a></li><li><a shape="rect" href="#ActionConfiguration-WildcardMethod">Wildcard Method</a></li><li><a shape="rect" href="#ActionConfiguration-DynamicMethodInvocation">Dynamic Method Invocation</a></li><li><a shape="rect" href="#ActionConfiguration-ActionSupportDefault">ActionSupport Default</a></li><li><a shape="rect" href="#ActionConfiguration-Post-BackDefault">Post-Back Default</a></li><li><a shape="rect" href="#ActionConfiguration-ActionDefault">Action Default</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#ActionConfiguration-WildcardDefault">Wildcard Default</a></li></ul>
 </li><li><a shape="rect" href="#ActionConfiguration-Next:">Next: Wildcard Mappings</a></li></ul>

Modified: websites/production/struts/content/release/2.3.x/docs/actionmapper.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/actionmapper.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/actionmapper.html Thu Mar  6 08:09:26 2014
@@ -137,11 +137,11 @@ under the License. 
     <div class="pagecontent">
         <div class="wiki-content">
             <div id="ConfluenceContent"><style type="text/css">/*<![CDATA[*/
-div.rbtoc1393705484699 {padding: 0px;}
-div.rbtoc1393705484699 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1393705484699 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1394091987296 {padding: 0px;}
+div.rbtoc1394091987296 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1394091987296 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1393705484699">
+/*]]>*/</style><div class="toc-macro rbtoc1394091987296">
 <ul class="toc-indentation"><li><a shape="rect" href="#ActionMapper-Description">Description</a></li><li><a shape="rect" href="#ActionMapper-DefaultActionMapper">DefaultActionMapper</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#ActionMapper-Methodprefix">Method prefix</a></li><li><a shape="rect" href="#ActionMapper-Actionprefix">Action prefix</a></li></ul>
 </li><li><a shape="rect" href="#ActionMapper-CustomActionMapper">Custom ActionMapper</a></li><li><a shape="rect" href="#ActionMapper-CompositeActionMapper">CompositeActionMapper</a></li><li><a shape="rect" href="#ActionMapper-PrefixBasedActionMapper">PrefixBasedActionMapper</a></li><li><a shape="rect" href="#ActionMapper-ActionMapperandActionMappingobjects">ActionMapper and ActionMapping objects</a>

Modified: websites/production/struts/content/release/2.3.x/docs/ajax-and-javascript-recipes.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/ajax-and-javascript-recipes.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/ajax-and-javascript-recipes.html Thu Mar  6 08:09:26 2014
@@ -145,11 +145,11 @@ under the License. 
 
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1393705703493 {padding: 0px;}
-div.rbtoc1393705703493 ul {list-style: none;margin-left: 0px;padding-left: 20px;}
-div.rbtoc1393705703493 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1394092213082 {padding: 0px;}
+div.rbtoc1394092213082 ul {list-style: none;margin-left: 0px;padding-left: 20px;}
+div.rbtoc1394092213082 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1393705703493">
+/*]]>*/</style><div class="toc-macro rbtoc1394092213082">
 <ul class="toc-indentation"><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Common">Common</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Requests">Requests</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Requestistriggeredbyatopic">Request is triggered by a topic</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Attachedtoanevent">Attached to an event</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Attachedtoaneventonmultiplesources">Attached to an event on multiple sources</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Attachedtomultipleeventsonmultiplesources">Attached to multiple events on multiple sources</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Updatetargetelementwithcontentreturnedfromurl">Update target element with content returned from url</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Updatemultipletargetelementswithcontentreturnedfromurl">Update multiple target elements with content returned from url</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Showindicatorwhilerequestisinprogress">Show indicator while request is
  in progress</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Highlightcontentoftargetwithbluecolor,for2seconds">Highlight content of target with blue color, for 2 seconds</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-ExecuteJavaScriptinthereturnedcontent">Execute JavaScript in the returned content</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Publishatopicbeforetherequest">Publish a topic before the request</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Publishatopicaftertherequest">Publish a topic after the request</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Publishatopiconerror">Publish a topic on error</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Showafixederrormessageonerror">Show a fixed error message on error</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Preventarequest">Prevent a request</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Submitaform(plainform)">Submit a 
 form (plain form)</a></li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Submitaform(usings:formtag)">Submit a form (using s:form tag)</a></li></ul>
 </li><li><a shape="rect" href="#AjaxandJavaScriptRecipes-Div">Div</a>

Modified: websites/production/struts/content/release/2.3.x/docs/building-struts-2-fast-track-release.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/building-struts-2-fast-track-release.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/building-struts-2-fast-track-release.html Thu Mar  6 08:09:26 2014
@@ -141,13 +141,13 @@ under the License. 
                     </div>
     </div>
 <h1 id="BuildingStruts2-Fasttrackrelease-Content">Content</h1><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1393705827788 {padding: 0px;}
-div.rbtoc1393705827788 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1393705827788 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1394092330179 {padding: 0px;}
+div.rbtoc1394092330179 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1394092330179 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1393705827788">
+/*]]>*/</style></p><div class="toc-macro rbtoc1394092330179">
 <ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-BuildingSteps(Struts)">Building Steps (Struts)</a>
-<ul class="toc-indentation"><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="#Build
 ingStruts2-Fasttrackrelease-Movetheassembliestothe/www/people.apache.org/builds/struts/$VERSIONdir">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-(Optional)-UpdateSecurityBulletins">(Optional) - Update Security Bulletins</a></li><li><span class="TOCOutline">1.15</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Updatesite(Strutstoplevelsite)">Update site (Struts top level site)</a></li><li><span class="TOCOutline">1.16</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Updatesite(Struts2site)">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 class="toc-indentation"><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-Updateversionofarchetypes">Update version of archetypes</a></li><li><span class="TOCOutline">1.3</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Applysecuritypatch">Apply security patch</a></li><li><span class="TOCOutline">1.4</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Preparerelease">Prepare release</a></li><li><span class="TOCOutline">1.5</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Performtherelease">Perform the release</a></li><li><span class="TOCOutline">1.6</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Movetheassembliestothe/www/people.apache.org/builds/struts/$VERSIONdir">Move the assemblies to the /www/people.apache.org/builds/struts/$VERSION dir</a></li>
 <li><span class="TOCOutline">1.7</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Jirastuff">Jira stuff</a></li><li><span class="TOCOutline">1.8</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Voteonit">Vote on it</a></li><li><span class="TOCOutline">1.9</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Copyfiles">Copy files</a></li><li><span class="TOCOutline">1.10</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Promoterelease">Promote release</a></li><li><span class="TOCOutline">1.11</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Cleanupoldreleases">Clean up old releases</a></li><li><span class="TOCOutline">1.12</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Waitforrsync">Wait for rsync</a></li><li><span class="TOCOutline">1.13</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-(Optional)-UpdateSecurityBulletins">(Optional) - Update Security Bulletins</a></li><li><span class="TOCOu
 tline">1.14</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Updatesite(Strutstoplevelsite)">Update site (Struts top level site)</a></li><li><span class="TOCOutline">1.15</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Updatesite(Struts2site)">Update site (Struts 2 site)</a></li><li><span class="TOCOutline">1.16</span> <a shape="rect" href="#BuildingStruts2-Fasttrackrelease-Postannouncements">Post announcements</a></li></ul>
 </li></ul>
 </div><h2 id="BuildingStruts2-Fasttrackrelease-BuildingSteps(Struts)">Building Steps (Struts)</h2><h3 id="BuildingStruts2-Fasttrackrelease-Gettingready">Getting ready</h3><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">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><p>When a serious security issue arises, we should try to create a <code>STRUTS_#_#_#_X</code> branch from the last GA release (from tag - check it out and use <code>mvn release:branch</code> as below).</p><div class="preformatted panel" style="border-width: 1
 px;"><div class="preformattedContent panelContent">
 <pre>svn co https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_#_#_#
@@ -165,30 +165,13 @@ mvn release:branch -DbranchName=STRUTS_#
 </div></div>
                     </div>
     </div>
-<p>&#160;</p><h3 id="BuildingStruts2-Fasttrackrelease-Obtainafreshcheckoutofcreatedbranch.">Obtain a fresh checkout of created branch.</h3><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[svn co https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_#_#_#_X STRUTS_#_#_#_X
-]]></script>
-</div></div><h3 id="BuildingStruts2-Fasttrackrelease-Updateversionofarchetypes">Update version of archetypes</h3><p>Edit <code>src/site/resources/archetype-catalog.xml</code> and change version of archetypes to current $VERSION, save and commit.</p><h3 id="BuildingStruts2-Fasttrackrelease-Applysecuritypatch">Apply security patch</h3><p>Apply and commit security patch.</p><h3 id="BuildingStruts2-Fasttrackrelease-Preparerelease">Prepare release</h3><p>Tag the release by using the "release:prepare" goal of Maven:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[mvn release:prepare -Dusername=yourSvnUsername -Dpassword=yourSvnPassword -DautoVersionSubmodules=true
+<h3 id="BuildingStruts2-Fasttrackrelease-Updateversionofarchetypes"><span style="line-height: 1.5625;">Update version of archetypes</span></h3><p>Edit <code>src/site/resources/archetype-catalog.xml</code> and change version of archetypes to current $VERSION, save and commit.</p><h3 id="BuildingStruts2-Fasttrackrelease-Applysecuritypatch">Apply security patch</h3><p>Apply and commit security patch.</p><h3 id="BuildingStruts2-Fasttrackrelease-Preparerelease">Prepare release</h3><p>Tag the release by using the {{release:prepare}}&#160;goal of Maven:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[mvn release:prepare -DautoVersionSubmodules=true
 ]]></script>
 </div></div><p>For a <a shape="rect" class="external-link" href="http://maven.apache.org/plugins/maven-release-plugin/usage.html">dry run</a>, add '-DdryRun=true'. If you do a dry run, use 'mvn release:clean' to clean up after you have looked at the output.</p><p>When prompted for the SCM tag name, follow this pattern: STRUTS_2_3_[PATCH_VERSION]</p>    <div class="aui-message warning shadowed information-macro">
                             <span class="aui-icon icon-warning">Icon</span>
                 <div class="message-content">
-                            <p>For some reason, when using svn client 1.5, the release plugin might fail to tag the release, if it fails, run:<br clear="none"> svn up -r head<br clear="none"> mvn release:prepare -Dresume</p>
-                    </div>
-    </div>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[[ERROR] Failed to execute goal org.apache.maven.plugins:maven-release-plugin:2.0-beta-7:prepare (default-cli) on project struts2-parent: Unable to tag SCM
-[ERROR] Provider message:
-[ERROR] The svn tag command failed.
-[ERROR] Command output:
-[ERROR] svn: Commit failed (details follow):
-[ERROR] svn: No such revision 1223030
-]]></script>
-</div></div>    <div class="aui-message warning shadowed information-macro">
-                            <span class="aui-icon icon-warning">Icon</span>
-                <div class="message-content">
-                            <p>If you get the error message above, try to re-run mvn release:prepare -Dusername=yourSvnUsername -Dpassword=yourSvnPassword -DautoVersionSubmodules=true command again, -Dresume flag is set to true by default and the plugin will resume the release process from where it failed before.</p>
+                            <p>If you get the error message above, try to re-run mvn release:prepare -DautoVersionSubmodules=true command again, -Dresume flag is set to true by default and the plugin will resume the release process from where it failed before.</p>
                     </div>
     </div>
 <p>This step will (<a shape="rect" class="external-link" href="http://maven.apache.org/plugins/maven-release-plugin/examples/prepare-release.html">more information</a>):</p><ul><li>Check that there are no uncommitted changes in the sources</li><li>Check that there are no SNAPSHOT dependencies</li><li>Change the version in the poms from x-SNAPSHOT to a new version (you will be prompted for the versions to use)</li><li>Transform the SCM information in the POM to include the final destination of the tag</li><li>Run the project tests against the modified POMs to confirm everything is in working order</li><li>Commit the modified POMs</li><li>Tag the code in the SCM with a version name (this will be prompted for)</li><li>Bump the version in the POMs to a new value y-SNAPSHOT (these values will also be prompted for)</li><li>Commit the modified POMs</li></ul><h3 id="BuildingStruts2-Fasttrackrelease-Performtherelease">Perform the release</h3><div class="code panel pdl" style="border-width: 1
 px;"><div class="codeContent panelContent pdl">
@@ -201,9 +184,10 @@ mvn release:branch -DbranchName=STRUTS_#
                     </div>
     </div>
 <p>After this step the artifacts will be hosted by <a shape="rect" class="external-link" href="http://repository.apache.org/">Nexus </a></p><p>If you need to run perform again, (or in a different box), do:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[svn co http://svn.apache.org/repos/asf/struts/struts2/tags/$VERSION
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[git clone https://git-wip-us.apache.org/repos/asf/struts.git
+git checkout $VERSION
 cd $VERSION
-mvn deploy site-deploy --no-plugin-updates -DperformRelease=true 
+mvn deploy --no-plugin-updates -DperformRelease=true 
 ]]></script>
 </div></div><p>Next, log in to <a shape="rect" class="external-link" href="http://repository.apache.org/">Nexus </a> and <strong>close</strong> staging repository.</p><h3 id="BuildingStruts2-Fasttrackrelease-Movetheassembliestothe/www/people.apache.org/builds/struts/$VERSIONdir">Move the assemblies to the /www/people.apache.org/builds/struts/$VERSION dir</h3><p>After closing repository in Nexus, check if the version is available from staging repository as below:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[https://repository.apache.org/content/groups/staging/org/apache/struts/struts2-assembly/$VERSION/

Modified: websites/production/struts/content/release/2.3.x/docs/building-struts-2-normal-release.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/building-struts-2-normal-release.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/building-struts-2-normal-release.html Thu Mar  6 08:09:26 2014
@@ -137,11 +137,11 @@ under the License. 
         <div class="wiki-content">
             <div id="ConfluenceContent"><h1 id="BuildingStruts2-Normalrelease-Content">Content</h1>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1393705826441 {padding: 0px;}
-div.rbtoc1393705826441 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1393705826441 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1394092329286 {padding: 0px;}
+div.rbtoc1394092329286 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1394092329286 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1393705826441">
+/*]]>*/</style><div class="toc-macro rbtoc1394092329286">
 <ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-BuildingSteps(Struts)">Building Steps (Struts)</a>
 <ul class="toc-indentation"><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>
 <ul class="toc-indentation"><li><span class="TOCOutline">1.3.1</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-Before:">Before:</a></li><li><span class="TOCOutline">1.3.2</span> <a shape="rect" href="#BuildingStruts2-Normalrelease-After:">After:</a></li></ul>

Modified: websites/production/struts/content/release/2.3.x/docs/building-struts-annotations.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/building-struts-annotations.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/building-struts-annotations.html Thu Mar  6 08:09:26 2014
@@ -136,11 +136,11 @@ under the License. 
         <div class="wiki-content">
             <div id="ConfluenceContent"><h1 id="BuildingStrutsAnnotations-Content">Content</h1>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1393705825882 {padding: 0px;}
-div.rbtoc1393705825882 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1393705825882 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1394092327471 {padding: 0px;}
+div.rbtoc1394092327471 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1394092327471 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1393705825882">
+/*]]>*/</style><div class="toc-macro rbtoc1394092327471">
 <ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#BuildingStrutsAnnotations-Content">Content</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#BuildingStrutsAnnotations-BuildingSteps(StrutsAnnotations)">Building Steps (Struts Annotations)</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">1.1.1</span> <a shape="rect" href="#BuildingStrutsAnnotations-Obtainafreshcheckoutofstrutsannotations">Obtain a fresh check out of struts annotations</a></li><li><span class="TOCOutline">1.1.2</span> <a shape="rect" href="#BuildingStrutsAnnotations-Preparerelease">Prepare release</a></li><li><span class="TOCOutline">1.1.3</span> <a shape="rect" href="#BuildingStrutsAnnotations-Performrelease">Perform release</a></li><li><span class="TOCOutline">1.1.4</span> <a shape="rect" href="#BuildingStrutsAnnotations-SendaVOTEemail">Send a VOTE email</a></li><li><span class="TOCOutline">1.1.5</span> <a shape="rect" href="#BuildingStrutsAnnotations-Promoterelease">Promote release</a></li></ul>

Modified: websites/production/struts/content/release/2.3.x/docs/building-struts-master.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/building-struts-master.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/building-struts-master.html Thu Mar  6 08:09:26 2014
@@ -136,11 +136,11 @@ under the License. 
         <div class="wiki-content">
             <div id="ConfluenceContent"><h1 id="BuildingStrutsMaster-Content">Content</h1>
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1393705833262 {padding: 0px;}
-div.rbtoc1393705833262 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1393705833262 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1394092335494 {padding: 0px;}
+div.rbtoc1394092335494 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1394092335494 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1393705833262">
+/*]]>*/</style><div class="toc-macro rbtoc1394092335494">
 <ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#BuildingStrutsMaster-BuildingSteps(Struts)">Building Steps (Struts)</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">1.1</span> <a shape="rect" href="#BuildingStrutsMaster-Obtainafreshcheckout.">Obtain a fresh checkout.</a></li><li><span class="TOCOutline">1.2</span> <a shape="rect" href="#BuildingStrutsMaster-Changesitetarget">Change site target</a></li><li><span class="TOCOutline">1.3</span> <a shape="rect" href="#BuildingStrutsMaster-Preparerelease">Prepare release</a></li><li><span class="TOCOutline">1.4</span> <a shape="rect" href="#BuildingStrutsMaster-Performtherelease">Perform the release</a></li><li><span class="TOCOutline">1.5</span> <a shape="rect" href="#BuildingStrutsMaster-Announceavailability">Announce availability</a></li><li><span class="TOCOutline">1.6</span> <a shape="rect" href="#BuildingStrutsMaster-Voteonit">Vote on it</a></li><li><span class="TOCOutline">1.7</span> <a shape="rect" href="#BuildingStrutsMaster-Promoterelease">Promote release</a></li><li><span class="TOCOutline">1.8</span> <a shape="rect" href="#BuildingS
 trutsMaster-Waitforrsync">Wait for rsync</a></li><li><span class="TOCOutline">1.9</span> <a shape="rect" href="#BuildingStrutsMaster-Postannouncements">Post announcements</a></li></ul>
 </li></ul>

Modified: websites/production/struts/content/release/2.3.x/docs/cdi-plugin.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/cdi-plugin.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/cdi-plugin.html Thu Mar  6 08:09:26 2014
@@ -136,11 +136,11 @@ under the License. 
     <div class="pagecontent">
         <div class="wiki-content">
             <div id="ConfluenceContent"><style type="text/css">/*<![CDATA[*/
-div.rbtoc1393705835207 {padding: 0px;}
-div.rbtoc1393705835207 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1393705835207 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1394092338475 {padding: 0px;}
+div.rbtoc1394092338475 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1394092338475 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1393705835207">
+/*]]>*/</style><div class="toc-macro rbtoc1394092338475">
 <ul class="toc-indentation"><li><a shape="rect" href="#CDIPlugin-Overview">Overview</a></li><li><a shape="rect" href="#CDIPlugin-Setup">Setup</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#CDIPlugin-MavenSetup">Maven Setup</a></li><li><a shape="rect" href="#CDIPlugin-ManualIntegration">Manual Integration</a></li><li><a shape="rect" href="#CDIPlugin-Configuration">Configuration</a></li></ul>
 </li><li><a shape="rect" href="#CDIPlugin-Usage">Usage</a>

Modified: websites/production/struts/content/release/2.3.x/docs/convention-plugin.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/convention-plugin.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/convention-plugin.html Thu Mar  6 08:09:26 2014
@@ -136,11 +136,11 @@ under the License. 
     <div class="pagecontent">
         <div class="wiki-content">
             <div id="ConfluenceContent"><style type="text/css">/*<![CDATA[*/
-div.rbtoc1393705753787 {padding: 0px;}
-div.rbtoc1393705753787 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1393705753787 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1394092259329 {padding: 0px;}
+div.rbtoc1394092259329 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1394092259329 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1393705753787">
+/*]]>*/</style><div class="toc-macro rbtoc1394092259329">
 <ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#ConventionPlugin-Introduction">Introduction</a></li><li><span class="TOCOutline">2</span> <a shape="rect" href="#ConventionPlugin-Setup">Setup</a></li><li><span class="TOCOutline">3</span> <a shape="rect" href="#ConventionPlugin-ConvertingaCodebehindbasedapplicationtoConvention">Converting a Codebehind based application to Convention</a></li><li><span class="TOCOutline">4</span> <a shape="rect" href="#ConventionPlugin-Helloworld">Hello world</a></li><li><span class="TOCOutline">5</span> <a shape="rect" href="#ConventionPlugin-Codebehindhelloworld">Code behind hello world</a></li><li><span class="TOCOutline">6</span> <a shape="rect" href="#ConventionPlugin-Resultsandresultcodes">Results and result codes</a></li><li><span class="TOCOutline">7</span> <a shape="rect" href="#ConventionPlugin-Chaining">Chaining</a></li><li><span class="TOCOutline">8</span> <a shape="rect" href="#ConventionPlugin-XWork
 packages">XWork packages</a></li><li><span class="TOCOutline">9</span> <a shape="rect" href="#ConventionPlugin-Annotationreference">Annotation reference</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">9.1</span> <a shape="rect" href="#ConventionPlugin-Actionannotation">Action annotation</a>
 <ul class="toc-indentation"><li><span class="TOCOutline">9.1.1</span> <a shape="rect" href="#ConventionPlugin-Applying@Actionand@Actionsattheclasslevel">Applying @Action and @Actions at the class level</a></li></ul>

Modified: websites/production/struts/content/release/2.3.x/docs/file-upload.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/file-upload.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/file-upload.html Thu Mar  6 08:09:26 2014
@@ -139,11 +139,11 @@ under the License. 
             <div id="ConfluenceContent"><p>The Struts 2 framework provides built-in support for processing file uploads that conform to <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc1867.txt" rel="nofollow">RFC 1867</a>, "Form-based File Upload in HTML". When correctly configured the framework will pass uploaded file(s) into your Action class. Support for individual and multiple file uploads are provided. When a file is uploaded it will typically be stored in a temporary directory. Uploaded files should be processed or moved by your Action class to ensure the data is not lost. Be aware that servers may have a security policy in place that prohibits you from writing to directories other than the temporary directory and the directories that belong to your web application.</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1393705741494 {padding: 0px;}
-div.rbtoc1393705741494 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1393705741494 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1394092249066 {padding: 0px;}
+div.rbtoc1394092249066 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1394092249066 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1393705741494">
+/*]]>*/</style><div class="toc-macro rbtoc1394092249066">
 <ul class="toc-indentation"><li><a shape="rect" href="#FileUpload-Dependencies">Dependencies</a></li><li><a shape="rect" href="#FileUpload-BasicUsage">Basic Usage</a></li><li><a shape="rect" href="#FileUpload-UploadingMultipleFiles">Uploading Multiple Files</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#FileUpload-UploadingMultipleFilesusingArrays">Uploading Multiple Files using Arrays</a></li><li><a shape="rect" href="#FileUpload-UploadingMultipleFilesusingLists">Uploading Multiple Files using Lists</a></li></ul>
 </li><li><a shape="rect" href="#FileUpload-AdvancedConfiguration">Advanced Configuration</a>

Modified: websites/production/struts/content/release/2.3.x/docs/guides.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/guides.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/guides.html Thu Mar  6 08:09:26 2014
@@ -184,49 +184,7 @@ Struts 2 processes requests using three 
 
 <h2 id="Guides-MigrationGuide"><a shape="rect" href="migration-guide.html">Migration Guide</a></h2>
 
-
-<p>Getting here from there.</p>
-
-<h3 id="Guides-VersionNotes2.3.x">Version Notes 2.3.x</h3>
-
-<ul><li><a shape="rect" href="version-notes-2316.html">Version Notes 2.3.16</a></li><li><a shape="rect" href="version-notes-23153.html">Version Notes 2.3.15.3</a></li><li><a shape="rect" href="version-notes-23152.html">Version Notes 2.3.15.2</a></li><li><a shape="rect" href="version-notes-23151.html">Version Notes 2.3.15.1</a></li><li><a shape="rect" href="version-notes-2315.html">Version Notes 2.3.15</a></li><li><a shape="rect" href="version-notes-23143.html">Version Notes 2.3.14.3</a></li><li><a shape="rect" href="version-notes-23142.html">Version Notes 2.3.14.2</a></li><li><a shape="rect" href="version-notes-23141.html">Version Notes 2.3.14.1</a></li><li><a shape="rect" href="version-notes-2314.html">Version Notes 2.3.14</a></li><li><a shape="rect" href="version-notes-23120.html">Version Notes 2.3.12.0</a></li><li><a shape="rect" href="version-notes-238.html">Version Notes 2.3.8</a></li><li><a shape="rect" href="version-notes-237.html">Version Notes 2.3.7</a></li><li><a shape="re
 ct" href="version-notes-2341.html">Version Notes 2.3.4.1</a></li><li><a shape="rect" href="version-notes-234.html">Version Notes 2.3.4</a></li><li><a shape="rect" href="version-notes-233.html">Version Notes 2.3.3</a></li><li><a shape="rect" href="version-notes-2312.html">Version Notes 2.3.1.2</a></li><li><a shape="rect" href="version-notes-2311.html">Version Notes 2.3.1.1</a></li><li><a shape="rect" href="version-notes-231.html">Version Notes 2.3.1</a></li></ul>
-
-
-<h3 id="Guides-VersionNotes2.2.x">Version Notes 2.2.x</h3>
-
-<ul><li><a shape="rect" href="version-notes-2231.html">Version Notes 2.2.3.1</a></li><li><a shape="rect" href="version-notes-223.html">Version Notes 2.2.3</a></li><li><a shape="rect" href="version-notes-2211.html">Version Notes 2.2.1.1</a></li><li><a shape="rect" href="version-notes-221.html">Version Notes 2.2.1</a></li></ul>
-
-
-<h3 id="Guides-VersionNotes2.1.x">Version Notes 2.1.x</h3>
-
-<ul><li><a shape="rect" href="version-notes-2181.html">Version Notes 2.1.8.1</a></li><li><a shape="rect" href="version-notes-218.html">Version Notes 2.1.8</a></li><li><a shape="rect" href="version-notes-216.html">Version Notes 2.1.6</a></li><li><a shape="rect" href="version-notes-215.html">Version Notes 2.1.5</a></li><li><a shape="rect" href="version-notes-214.html">Version Notes 2.1.4</a></li><li><a shape="rect" href="version-notes-213.html">Version Notes 2.1.3</a></li><li><a shape="rect" href="version-notes-212.html">Version Notes 2.1.2</a></li><li><a shape="rect" href="version-notes-211.html">Version Notes 2.1.1</a></li><li><a shape="rect" href="version-notes-210.html">Version Notes 2.1.0</a></li></ul>
-
-
-<h3 id="Guides-ReleaseNotes2.0.x">Release Notes 2.0.x</h3>
-
-<ul><li><a shape="rect" href="release-notes-2014.html">Release Notes 2.0.14</a></li><li><a shape="rect" href="release-notes-2013.html">Release Notes 2.0.13</a></li><li><a shape="rect" href="release-notes-2012.html">Release Notes 2.0.12</a></li><li><a shape="rect" href="release-notes-20112.html">Release Notes 2.0.11.2</a></li><li><a shape="rect" href="release-notes-20111.html">Release Notes 2.0.11.1</a></li><li><a shape="rect" href="release-notes-2011.html">Release Notes 2.0.11</a></li><li><a shape="rect" href="release-notes-2010.html">Release Notes 2.0.10</a></li><li><a shape="rect" href="release-notes-209.html">Release Notes 2.0.9</a></li><li><a shape="rect" href="release-notes-208.html">Release Notes 2.0.8</a></li><li><a shape="rect" href="release-notes-207.html">Release Notes 2.0.7</a></li><li><a shape="rect" href="release-notes-206.html">Release Notes 2.0.6</a></li><li><a shape="rect" href="release-notes-205.html">Release Notes 2.0.5</a></li><li><a shape="rect" href="release-not
 es-204.html">Release Notes 2.0.4</a></li><li><a shape="rect" href="release-notes-203.html">Release Notes 2.0.3</a></li><li><a shape="rect" href="release-notes-202.html">Release Notes 2.0.2</a></li><li><a shape="rect" href="release-notes-201.html">Release Notes 2.0.1</a></li><li><a shape="rect" href="release-notes-200.html">Release Notes 2.0.0</a></li></ul>
-
-
-<h3 id="Guides-Struts1toStruts2">Struts 1 to Struts 2</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="comparing-struts-1-and-2.html">Comparing Struts 1 and 2</a> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> How are Struts 1 and Struts 2 alike? How are they different? </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="struts-1-solutions.html">Struts 1 Solutions</a>   </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Various issues (and hopefully their solutions!) encountered during migrations to Struts 2. </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="migration-strategies.html">Migration Strategies</a> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Steps and overall strategies for migrating Struts 1 applications to Struts 2. </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="mig
 ration-tools.html">Migration Tools</a>      </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>  Development tools to help aid the migration process. </p></td></tr></tbody></table></div>
-
-
-<h4 id="Guides-Tutorials">Tutorials </h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" class="external-link" href="http://www.infoq.com/news/migrating-struts2" rel="nofollow">Migrating Applications to Struts 2 </a> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> A three-part series by Ian Roughley (Sep 2006) </p></td></tr></tbody></table></div>
-
-
-<h4 id="Guides-Roadmap">Roadmap</h4>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" class="external-link" href="http://struts.apache.org/roadmap.html#new">Roadmap FAQ</a> </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> What's in store for Struts 2? </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" class="external-link" href="http://www.oreillynet.com/onjava/blog/2006/10/my_history_of_struts_2.html" rel="nofollow">A History of Struts 2</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Don Brown's summary of events </p></td></tr></tbody></table></div>
-
-
-
-<h3 id="Guides-Webwork2.2toStruts2">Webwork 2.2 to Struts 2</h3>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="key-changes-from-webwork-2.html">Key Changes From WebWork 2</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> What has been removed or changed from WebWork 2.2 to Struts 2 </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="webwork-2-migration-strategies.html">WebWork 2 Migration Strategies</a>   </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Steps and overall strategies for migrating WebWork 2 applications to Struts 2. </p></td></tr></tbody></table></div>
-
+Getting here from there.<h3 id="Guides-VersionNotes2.3.x">Version Notes 2.3.x</h3><ul><li><a shape="rect" href="version-notes-2316.html">Version Notes 2.3.16.1</a></li><li><a shape="rect" href="version-notes-2316.html">Version Notes 2.3.16</a></li><li><a shape="rect" href="version-notes-23153.html">Version Notes 2.3.15.3</a></li><li><a shape="rect" href="version-notes-23152.html">Version Notes 2.3.15.2</a></li><li><a shape="rect" href="version-notes-23151.html">Version Notes 2.3.15.1</a></li><li><a shape="rect" href="version-notes-2315.html">Version Notes 2.3.15</a></li><li><a shape="rect" href="version-notes-23143.html">Version Notes 2.3.14.3</a></li><li><a shape="rect" href="version-notes-23142.html">Version Notes 2.3.14.2</a></li><li><a shape="rect" href="version-notes-23141.html">Version Notes 2.3.14.1</a></li><li><a shape="rect" href="version-notes-2314.html">Version Notes 2.3.14</a></li><li><a shape="rect" href="version-notes-23120.html">Version Notes 2.3.12.0</a></li><li><a s
 hape="rect" href="version-notes-238.html">Version Notes 2.3.8</a></li><li><a shape="rect" href="version-notes-237.html">Version Notes 2.3.7</a></li><li><a shape="rect" href="version-notes-2341.html">Version Notes 2.3.4.1</a></li><li><a shape="rect" href="version-notes-234.html">Version Notes 2.3.4</a></li><li><a shape="rect" href="version-notes-233.html">Version Notes 2.3.3</a></li><li><a shape="rect" href="version-notes-2312.html">Version Notes 2.3.1.2</a></li><li><a shape="rect" href="version-notes-2311.html">Version Notes 2.3.1.1</a></li><li><a shape="rect" href="version-notes-231.html">Version Notes 2.3.1</a></li></ul><h3 id="Guides-VersionNotes2.2.x">Version Notes 2.2.x</h3><ul><li><a shape="rect" href="version-notes-2231.html">Version Notes 2.2.3.1</a></li><li><a shape="rect" href="version-notes-223.html">Version Notes 2.2.3</a></li><li><a shape="rect" href="version-notes-2211.html">Version Notes 2.2.1.1</a></li><li><a shape="rect" href="version-notes-221.html">Version Notes 2
 .2.1</a></li></ul><h3 id="Guides-VersionNotes2.1.x">Version Notes 2.1.x</h3><ul><li><a shape="rect" href="version-notes-2181.html">Version Notes 2.1.8.1</a></li><li><a shape="rect" href="version-notes-218.html">Version Notes 2.1.8</a></li><li><a shape="rect" href="version-notes-216.html">Version Notes 2.1.6</a></li><li><a shape="rect" href="version-notes-215.html">Version Notes 2.1.5</a></li><li><a shape="rect" href="version-notes-214.html">Version Notes 2.1.4</a></li><li><a shape="rect" href="version-notes-213.html">Version Notes 2.1.3</a></li><li><a shape="rect" href="version-notes-212.html">Version Notes 2.1.2</a></li><li><a shape="rect" href="version-notes-211.html">Version Notes 2.1.1</a></li><li><a shape="rect" href="version-notes-210.html">Version Notes 2.1.0</a></li></ul><h3 id="Guides-ReleaseNotes2.0.x">Release Notes 2.0.x</h3><ul><li><a shape="rect" href="release-notes-2014.html">Release Notes 2.0.14</a></li><li><a shape="rect" href="release-notes-2013.html">Release Notes 
 2.0.13</a></li><li><a shape="rect" href="release-notes-2012.html">Release Notes 2.0.12</a></li><li><a shape="rect" href="release-notes-20112.html">Release Notes 2.0.11.2</a></li><li><a shape="rect" href="release-notes-20111.html">Release Notes 2.0.11.1</a></li><li><a shape="rect" href="release-notes-2011.html">Release Notes 2.0.11</a></li><li><a shape="rect" href="release-notes-2010.html">Release Notes 2.0.10</a></li><li><a shape="rect" href="release-notes-209.html">Release Notes 2.0.9</a></li><li><a shape="rect" href="release-notes-208.html">Release Notes 2.0.8</a></li><li><a shape="rect" href="release-notes-207.html">Release Notes 2.0.7</a></li><li><a shape="rect" href="release-notes-206.html">Release Notes 2.0.6</a></li><li><a shape="rect" href="release-notes-205.html">Release Notes 2.0.5</a></li><li><a shape="rect" href="release-notes-204.html">Release Notes 2.0.4</a></li><li><a shape="rect" href="release-notes-203.html">Release Notes 2.0.3</a></li><li><a shape="rect" href="rele
 ase-notes-202.html">Release Notes 2.0.2</a></li><li><a shape="rect" href="release-notes-201.html">Release Notes 2.0.1</a></li><li><a shape="rect" href="release-notes-200.html">Release Notes 2.0.0</a></li></ul><h3 id="Guides-Struts1toStruts2">Struts 1 to Struts 2</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="comparing-struts-1-and-2.html">Comparing Struts 1 and 2</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>How are Struts 1 and Struts 2 alike? How are they different?</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="struts-1-solutions.html">Struts 1 Solutions</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Various issues (and hopefully their solutions!) encountered during migrations to Struts 2.</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="migration-strategies.html">M
 igration Strategies</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Steps and overall strategies for migrating Struts 1 applications to Struts 2.</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="migration-tools.html">Migration Tools</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Development tools to help aid the migration process.</p></td></tr></tbody></table></div><h4 id="Guides-Tutorials">Tutorials</h4><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" class="external-link" href="http://www.infoq.com/news/migrating-struts2" rel="nofollow">Migrating Applications to Struts 2 </a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>A three-part series by Ian Roughley (Sep 2006)</p></td></tr></tbody></table></div><h4 id="Guides-Roadmap">Roadmap</h4><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th cols
 pan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" class="external-link" href="http://struts.apache.org/roadmap.html#new">Roadmap FAQ</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>What's in store for Struts 2?</p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" class="external-link" href="http://www.oreillynet.com/onjava/blog/2006/10/my_history_of_struts_2.html" rel="nofollow">A History of Struts 2</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Don Brown's summary of events</p></td></tr></tbody></table></div><h3 id="Guides-Webwork2.2toStruts2">Webwork 2.2 to Struts 2</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="key-changes-from-webwork-2.html">Key Changes From WebWork 2</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>What has been removed or changed from WebWork 2.2 to Struts 2</p></td></tr><tr
 ><th colspan="1" rowspan="1" class="confluenceTh"><p><a shape="rect" href="webwork-2-migration-strategies.html">WebWork 2 Migration Strategies</a></p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Steps and overall strategies for migrating WebWork 2 applications to Struts 2.</p></td></tr></tbody></table></div>
 
 <h2 id="Guides-ContributorsGuide"><a shape="rect" href="contributors-guide.html">Contributors Guide</a></h2>
 

Modified: websites/production/struts/content/release/2.3.x/docs/hello-world-using-struts-2.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/hello-world-using-struts-2.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/hello-world-using-struts-2.html Thu Mar  6 08:09:26 2014
@@ -135,55 +135,32 @@ under the License. 
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><p>When you click on a hyperlink or submit an HTML form in a Struts 2 web application, the input is not sent to another server page, but to a Java class that you provide. These classes are called Actions. After the Action fires, a Result selects a resource to render the response. The resource is generally a server page, but it can also be a PDF file, an Excel spreadsheet, or a Java applet window.</p>
-
-<p>Suppose you want to create a simple "Hello World" example that displays a welcome message. After setting up an empty basic Struts 2 web application (see <a shape="rect" href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a>), to create a "Hello World" example, you need to do four things:</p>
-<ol><li>Create a class to store the welcome message (the model)</li><li>Create a server page to present the message (the view)</li><li>Create an Action class to control the interaction between the user, the model, and the view (the controller)</li><li>Create a mapping (struts.xml) to couple the Action class and view
-    <div class="aui-message success shadowed information-macro">
+            <div id="ConfluenceContent"><p>When you click on a hyperlink or submit an HTML form in a Struts 2 web application, the input is not sent to another server page, but to a Java class that you provide. These classes are called Actions. After the Action fires, a Result selects a resource to render the response. The resource is generally a server page, but it can also be a PDF file, an Excel spreadsheet, or a Java applet window.</p><p>Suppose you want to create a simple "Hello World" example that displays a welcome message. After setting up an empty basic Struts 2 web application (see <a shape="rect" href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a>), to create a "Hello World" example, you need to do four things:</p><ol><li>Create a class to store the welcome message (the model)</li><li>Create a server page to present the message (the view)</li><li>Create an Action class to control the interaction between the user, the model, an
 d the view (the controller)</li><li><p>Create a mapping (struts.xml) to couple the Action class and view</p>    <div class="aui-message success shadowed information-macro">
                             <span class="aui-icon icon-success">Icon</span>
                 <div class="message-content">
                             <p>By creating these components, we are separating the work flow into three well-known concerns: the View, the Model, and the Controller. Separating concerns makes it easier to manage applications as they become more complex.</p>
                     </div>
     </div>
-
-Let's look at an example model class, Action, server page, and mapping. If you like, fire up your Java IDE, and enter the code as we go.
-    <div class="aui-message hint shadowed information-macro">
+<p>Let's look at an example model class, Action, server page, and mapping. If you like, fire up your Java IDE, and enter the code as we go.</p>    <div class="aui-message hint shadowed information-macro">
                             <span class="aui-icon icon-hint">Icon</span>
                 <div class="message-content">
-                            <p>This tutorial assumes you've completed the <a shape="rect" href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a> tutorial and have a working basic Struts project.  The example code for this tutorial, helloworld, is 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>
+                            <p>This tutorial assumes you've completed the <a shape="rect" href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a> tutorial and have a working basic Struts project. The example code for this tutorial, helloworld, is 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>
     </div>
-</li></ol>
-
-
-<h2 id="HelloWorldUsingStruts2-TheCode">The Code</h2>
-<p>Let's modify either the basic_struts project to add a model class to store our message, a view that displays our message, an Action class to act as the controller, and a configuration that ties everything together.</p>
-
-    <div class="aui-message success shadowed information-macro">
+</li></ol><h2 id="HelloWorldUsingStruts2-TheCode">The Code</h2><p>Let's modify either the basic_struts project to add a model class to store our message, a view that displays our message, an Action class to act as the controller, and a configuration that ties everything together.</p>    <div class="aui-message success shadowed information-macro">
                             <span class="aui-icon icon-success">Icon</span>
                 <div class="message-content">
-                            <p>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 this application 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.</p>
+                            <p>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 this application 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.</p>
                     </div>
     </div>
-
-
-<h3 id="HelloWorldUsingStruts2-Step1-CreateTheModelClassMessageStore.java">Step 1 - Create The Model Class MessageStore.java</h3>
-
-<p>If you're using the Basic_Struts2_Ant project to start with create the MessageStore class in the src folder and if you're using the Basic_Struts2_Mvn class create the MessageStore class in src/main/java.  Be sure to note the package statement below.</p>
-
-    <div class="aui-message hint shadowed information-macro">
+<h3 id="HelloWorldUsingStruts2-Step1-CreateTheModelClassMessageStore.java">Step 1 - Create The Model Class MessageStore.java</h3><p>If you're using the Basic_Struts2_Ant project to start with create the MessageStore class in the src folder and if you're using the Basic_Struts2_Mvn class create the MessageStore class in src/main/java. Be sure to note the package statement below.</p>    <div class="aui-message hint shadowed information-macro">
                             <span class="aui-icon icon-hint">Icon</span>
                 <div class="message-content">
-                            <p>Note that in the code shown below the JavaDoc comments are omitted.  In the download example, JavaDoc comments are included.</p>
+                            <p>Note that in the code shown below the JavaDoc comments are omitted. In the download example, JavaDoc comments are included.</p>
                     </div>
     </div>
-
-
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>MessageStore.java</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-package org.apache.struts.helloworld.model;
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[package org.apache.struts.helloworld.model;
 
 public class MessageStore {
 	
@@ -206,17 +183,8 @@ public class MessageStore {
 
 }
 ]]></script>
-</div></div>
-<p>In the model class above note the use of public set and get methods to allow access to the private message String attribute.  The Struts 2 framework requires that objects you want to expose to the view (HelloWorld.jsp) follow the <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/JavaBean#JavaBean_conventions" rel="nofollow">JavaBean-style conventions</a>.</p>
-
-
-<h3 id="HelloWorldUsingStruts2-Step2-CreateTheActionClassHelloWorldAction.java">Step 2 - Create The Action Class HelloWorldAction.java</h3>
-<p>We need an Action class to act as the Controller.  The Action class responds to a user action (in this example that action will be clicking an HTML hyperlink and sending a specific URL to the Servlet container).  One or more of the Action class's methods are executed and a String result is returned.  Based on the value of the result, a specific view page (in this example that view page is HelloWorld.jsp) is rendered.</p>
-
-<p>Note the package and import statements below.</p>
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>HelloWorld.java</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-package org.apache.struts.helloworld.action;
+</div></div><p>In the model class above note the use of public set and get methods to allow access to the private message String attribute. The Struts 2 framework requires that objects you want to expose to the view (HelloWorld.jsp) follow the <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/JavaBean#JavaBean_conventions" rel="nofollow">JavaBean-style conventions</a>.</p><h3 id="HelloWorldUsingStruts2-Step2-CreateTheActionClassHelloWorldAction.java">Step 2 - Create The Action Class HelloWorldAction.java</h3><p>We need an Action class to act as the Controller. The Action class responds to a user action (in this example that action will be clicking an HTML hyperlink and sending a specific URL to the Servlet container). One or more of the Action class's methods are executed and a String result is returned. Based on the value of the result, a specific view page (in this example that view page is HelloWorld.jsp) is rendered.</p><p>Note the package and import state
 ments below.</p><div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>HelloWorldAction.java</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[package org.apache.struts.helloworld.action;
 
 import org.apache.struts.helloworld.model.MessageStore;
 import com.opensymphony.xwork2.ActionSupport;
@@ -243,47 +211,23 @@ public class HelloWorldAction extends Ac
 
 }
 ]]></script>
-</div></div>
-<p>The Struts 2 framework will create an object of the HelloWorldAction class and call the execute method in response to a user's action (clicking on a hyperlink that sends a specific URL to the Servlet container).</p>
-
-<p>In this example, the execute method creates an object of class MessageStore and then returns the String constant SUCCESS.</p>
-
-<p>Note also the public set and get methods for the private MessageStore object.  Since we want to make the MessageStore object available to the view page (HelloWorld.jsp) we need to follow the <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/JavaBean#JavaBean_conventions" rel="nofollow">JavaBean-style</a> of providing get and set methods.</p>
-
-<h3 id="HelloWorldUsingStruts2-Step3-CreateTheViewHelloWorld.jsp">Step 3 - Create The View HelloWorld.jsp</h3>
-<p>We need a server page to present the message that is stored in the model class MessageStore. Create the below jsp in the WebContent folder (for the Ant project) and in src/main/webapp for the Mvn project).</p>
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>HelloWorld.jsp</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;%@ page language=&quot;java&quot; contentType=&quot;text/html; charset=ISO-8859-1&quot;
-    pageEncoding=&quot;ISO-8859-1&quot;%&gt;
+</div></div><p>The Struts 2 framework will create an object of the <code>HelloWorldAction</code>&#160;class and call the execute method in response to a user's action (clicking on a hyperlink that sends a specific URL to the Servlet container).</p><p>In this example, the execute method creates an object of class <code>MessageStore</code>&#160;and then returns the String constant <code>SUCCESS</code>.</p><p>Note also the public getter and setter methods for the private <code>MessageStore</code>&#160;object. Since we want to make the <code>MessageStore</code>&#160;object available to the view page, <code>HelloWorld.jsp</code>&#160;we need to follow the <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/JavaBean#JavaBean_conventions" rel="nofollow">JavaBean-style</a> of providing get and set methods.</p><h3 id="HelloWorldUsingStruts2-Step3-CreateTheViewHelloWorld.jsp">Step 3 - Create The View HelloWorld.jsp</h3><p>We need a server page to present the message that 
 is stored in the model class <code>MessageStore</code>. Create the below JSP in the <code>WebContent</code>&#160;folder (if using Ant) or in <code>src/main/webapp</code> (if using Maven).</p><div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>HelloWorld.jsp</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;%@ page language=&quot;java&quot; contentType=&quot;text/html; charset=ISO-8859-1&quot; pageEncoding=&quot;ISO-8859-1&quot;%&gt;
 &lt;%@ taglib prefix=&quot;s&quot; uri=&quot;/struts-tags&quot; %&gt;
 &lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot; &quot;http://www.w3.org/TR/html4/loose.dtd&quot;&gt;
 &lt;html&gt;
-&lt;head&gt;
-&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=ISO-8859-1&quot;&gt;
-&lt;title&gt;Hello World!&lt;/title&gt;
-&lt;/head&gt;
-&lt;body&gt;
+  &lt;head&gt;
+    &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=ISO-8859-1&quot;&gt;
+    &lt;title&gt;Hello World!&lt;/title&gt;
+  &lt;/head&gt;
+
+  &lt;body&gt;
     &lt;h2&gt;&lt;s:property value=&quot;messageStore.message&quot; /&gt;&lt;/h2&gt;
-&lt;/body&gt;
+  &lt;/body&gt;
 &lt;/html&gt;
 ]]></script>
-</div></div>
-<p>The taglib directive tells the Servlet container that this page will be using the Struts 2 tags and that these tags will be preceded by s.  </p>
-
-<p>The s:property tag displays the value returned by calling the method getMessageStore of the HelloWorldAction controller  class.  That method returns a MessageStore object. By adding the .message onto the messageStore part of the value attribute we are telling the Struts 2 framework to then call the getMessage method of that MessageStore object.  The getMessage method of class MessageStore returns a String.  It is that String that will be displayed by the s:property tag.</p>
-
-<p>We'll learn more about tags in the next tutorial.  See the <a shape="rect" href="struts-tags.html">Struts Tags</a> for more information about tags.</p>
-
-<h3 id="HelloWorldUsingStruts2-Step4-AddTheStrutsConfigurationInstruts.xml">Step 4 - Add The Struts Configuration In struts.xml</h3>
-<p>We need a mapping to tie the URL, the HelloWorldAction class (controller), and <br clear="none">
-the HelloWorld.jsp (the view)  together.  The mapping tells the Struts 2 framework which class will respond to the user's action (the URL), which method of that class will be executed, and what view to render based on the String result that method returns.</p>
-
-<p>Edit the <code>struts.xml</code> file (in the Mvn project that file is in the src/main/resources folder) to add the action mapping.  Place the action node (action name="hello") between the opening and closing package node, just after the action mapping with the name="index".  Your complete struts.xml should look like:</p>
-
-<div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+</div></div><p>The taglib directive tells the Servlet container that this page will be using the Struts 2 tags and that these tags will be preceded by an <code>s</code>.</p><p>The <code>&lt;s:property&gt;</code>&#160;tag displays the value returned by calling the method <code>getMessageStore</code>&#160;of the <code>HelloWorldAction</code>&#160;controller class. That method returns a <code>MessageStore</code>&#160;object. By adding the <code>.message</code>&#160;onto the messageStore part of the value attribute we are telling the Struts 2 framework to call the <code>getMessage</code>&#160;method of that <code>MessageStore</code>&#160;object. The <code>getMessage</code>&#160;method of class <code>MessageStore</code>&#160;returns a String. It is that String that will be displayed by the <code>&lt;s:property&gt;</code>&#160;tag.</p><p>We'll learn more about tags in the next tutorial. See the <a shape="rect" href="struts-tags.html">Struts Tags</a> for more information about tags.</p><h3
  id="HelloWorldUsingStruts2-Step4-AddTheStrutsConfigurationInstruts.xml">Step 4 - Add The Struts Configuration In struts.xml</h3><p>We need a mapping to tie the URL, the <code>HelloWorldAction</code>&#160;class (controller), and <br clear="none"> the <code>HelloWorld.jsp</code>&#160;(the view) together. The mapping tells the Struts 2 framework which class will respond to the user's action (the URL), which method of that class will be executed, and what view to render based on the String result that method returns.</p><p>Edit the <code>struts.xml</code> file (in the Mvn project that file is in the src/main/resources folder) to add the action mapping. Place the action node (action name="hello") between the opening and closing package node, just after the action mapping with the name="index". Your complete struts.xml should look like:</p><div class="code panel pdl" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;bor
 der-bottom-style: solid;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;!DOCTYPE struts PUBLIC
     &quot;-//Apache Software Foundation//DTD Struts Configuration 2.0//EN&quot;
     &quot;http://struts.apache.org/dtds/struts-2.0.dtd&quot;&gt;
@@ -293,28 +237,18 @@ the HelloWorld.jsp (the view)  together.
   &lt;constant name=&quot;struts.devMode&quot; value=&quot;true&quot; /&gt;
 
   &lt;package name=&quot;basicstruts2&quot; extends=&quot;struts-default&quot;&gt;
-
-  &lt;action name=&quot;index&quot;&gt;
-    &lt;result&gt;/index.jsp&lt;/result&gt;
-  &lt;/action&gt;
+    &lt;action name=&quot;index&quot;&gt;
+      &lt;result&gt;/index.jsp&lt;/result&gt;
+    &lt;/action&gt;
 		
-  &lt;action name=&quot;hello&quot; class=&quot;org.apache.struts.helloworld.action.HelloWorldAction&quot; method=&quot;execute&quot;&gt;
-    &lt;result name=&quot;success&quot;&gt;/HelloWorld.jsp&lt;/result&gt;
-  &lt;/action&gt;
-
-&lt;/package&gt;
-
+    &lt;action name=&quot;hello&quot; class=&quot;org.apache.struts.helloworld.action.HelloWorldAction&quot; method=&quot;execute&quot;&gt;
+      &lt;result name=&quot;success&quot;&gt;/HelloWorld.jsp&lt;/result&gt;
+    &lt;/action&gt;
+  &lt;/package&gt;
 &lt;/struts&gt;
 ]]></script>
-</div></div>
-
-<h3 id="HelloWorldUsingStruts2-Step5-CreateTheURLAction">Step 5 - Create The URL Action</h3>
-<p>In index.jsp (see WebContent folder for Ant project and src/main/webapp for Mvn project) let's add an Action URL the user can click on to tell the Struts 2 framework to run the execute method of the HelloWorldAction class and render the HelloWorld.jsp view.  </p>
-
-<p>First add the taglib directive at the top of the jsp <code>&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;</code>.  Next add this p tag <code>&lt;p&gt;&lt;a href="&lt;s:url action='hello'/&gt;"&gt;Hello World&lt;/a&gt;&lt;/p&gt;</code> after the h1 tag.  Your new index.jsp should look like:</p>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>index.jsp</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[
-&lt;%@ page language=&quot;java&quot; contentType=&quot;text/html; charset=ISO-8859-1&quot;
+</div></div><h3 id="HelloWorldUsingStruts2-Step5-CreateTheURLAction">Step 5 - Create The URL Action</h3><p>In index.jsp (see WebContent folder for Ant project and src/main/webapp for Mvn project) let's add an Action URL the user can click on to tell the Struts 2 framework to run the execute method of the HelloWorldAction class and render the HelloWorld.jsp view.</p><p>First add the taglib directive at the top of the jsp <code>&lt;%@ taglib prefix="s" uri="/struts-tags" %&gt;</code>. Next add this p tag <code>&lt;p&gt;&lt;a href="&lt;s:url action='hello'/&gt;"&gt;Hello World&lt;/a&gt;&lt;/p&gt;</code> after the h1 tag. Your new index.jsp should look like:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>index.jsp</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: html; gutter: false" type="syntaxhighlighter"><![CDATA[&lt;%@ page language=&quot;java&quot; contentType=&quot;text/html; charset=ISO-8859-1&quot;
     pageEncoding=&quot;ISO-8859-1&quot;%&gt;
 &lt;%@ taglib prefix=&quot;s&quot; uri=&quot;/struts-tags&quot; %&gt;
 &lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot; &quot;http://www.w3.org/TR/html4/loose.dtd&quot;&gt;
@@ -330,39 +264,7 @@ the HelloWorld.jsp (the view)  together.
 &lt;/html&gt;
 
 ]]></script>
-</div></div>
-<p>The Struts url tag creates the URL with an action of hello.  The hello action was mapped to the HelloWorldAction class and its execute method.  When the user clicks on the above URL it will cause the Struts 2 framework to run the execute method of the HelloWorldAction class.  After that method returns the String success, the view page HelloWorld.jsp will be rendered.</p>
-
-<h3 id="HelloWorldUsingStruts2-Step6-BuildtheWARFileandRunTheApplication">Step 6 - Build the WAR File and Run The Application</h3>
-<p>Execute mvn clean package to create the war file.</p>
-
-<p>Copy the war file to your Servlet container.  After your Servlet container successfully deploys the war file go to this URL <a shape="rect" class="external-link" href="http://localhost:8080/helloworld/index.action" rel="nofollow">http://localhost:8080/helloworld/index.action</a> where you should see the following:<br clear="none">
-<img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811871/Struts2HelloWorld.png?version=1&amp;modificationDate=1267883315000&amp;api=v2" data-image-src="/confluence/download/attachments/14811871/Struts2HelloWorld.png?version=1&amp;modificationDate=1267883315000&amp;api=v2"></p>
-
-<p>Click on the Hello World link and you should get the HelloWorld.jsp page:</p>
-
-<p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811871/Hello.png?version=1&amp;modificationDate=1267883315000&amp;api=v2" data-image-src="/confluence/download/attachments/14811871/Hello.png?version=1&amp;modificationDate=1267883315000&amp;api=v2"></p>
-
-<h3 id="HelloWorldUsingStruts2-GettingHelp">Getting Help</h3>
-<p>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 this application 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.</p>
-
-
-<h2 id="HelloWorldUsingStruts2-HowtheCodeWorks">How the Code Works</h2>
-
-<p>Your browser sends to the web server a request for the URL <a shape="rect" class="external-link" href="http://localhost:8080/Hello_World_Struts2_Ant/hello.action" rel="nofollow">http://localhost:8080/Hello_World_Struts2_Ant/hello.action</a>.</p>
-<ol><li>The container receives from the web server a request for the resource <code>hello.action</code>. According to the settings loaded from the <a shape="rect" href="webxml.html">web.xml</a>, the container finds that all requests are being routed to <code>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</code>, including the <code>*.action</code> requests. The StrutsPrepareAndExecuteFilter is the entry point into the framework.</li><li>The framework looks for an action mapping named "hello", and it finds that this mapping corresponds to the class "HelloWorldAction". The framework instantiates the Action and calls the Action's <code>execute</code> method.</li><li>The <code>execute</code> method creates the MessageStore object and returns <code>SUCCESS</code>. The framework checks the action mapping to see what page to load if <code>SUCCESS</code> is returned. The framework tells the container to render as the response to the request, the resource <code>HelloWo
 rld.jsp</code>.</li><li>As the page <code>HelloWorld.jsp</code> is being processed, the <code>&lt;s:property value="messageStore.message" /&gt;</code> tag calls the getter <code>getMessageStore</code> of the <code>HelloWorld</code> Action and then calls the <code>getMessage</code> of the MessageStore object returned by <code>getMessageStore</code>, and the tag merges into the response the value of the message attribute.</li><li>A pure HTML response is sent back to the browser.</li></ol>
-
-
-
-
-
-<h2 id="HelloWorldUsingStruts2-WhattoRemember">What to Remember</h2>
-
-<p>The framework uses Actions to process HTML forms and other requests. The <code>Action</code> class returns a result-name such as <code>SUCCESS</code>, <code>ERROR</code>, or <code>INPUT</code>. Based on the mappings loaded from the <code>struts.xml</code>, a given result-name may select a page (as in this example), another action, or some other web resource (image, PDF). </p>
-
-<p>When a server page is rendered, most often it will include dynamic data provided by the Action. To make it easy to display dynamic data, the framework provides a set of tags that can be used along with HTML markup to create a server page.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Next </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Onward to <a shape="rect" href="using-struts-2-tags.html">Using Struts 2 Tags</a> </p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Prev </p></th><td colspan="1" rowspan="1" class="confluenceTd"><p> Return to <a shape="rect" href="how-to-create-a-struts-2-web-application.html">How To Create A Struts 2 Web Application</a> </p></td></tr></tbody></table></div></div>
+</div></div><p>The Struts url tag creates the URL with an action of hello. The hello action was mapped to the HelloWorldAction class and its execute method. When the user clicks on the above URL it will cause the Struts 2 framework to run the execute method of the HelloWorldAction class. After that method returns the String success, the view page HelloWorld.jsp will be rendered.</p><h3 id="HelloWorldUsingStruts2-Step6-BuildtheWARFileandRunTheApplication">Step 6 - Build the WAR File and Run The Application</h3><p>Execute mvn clean package to create the war file.</p><p>Copy the war file to your Servlet container. After your Servlet container successfully deploys the war file go to this URL <a shape="rect" class="external-link" href="http://localhost:8080/helloworld/index.action" rel="nofollow">http://localhost:8080/helloworld/index.action</a> where you should see the following:<br clear="none"> <img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/at
 tachments/14811871/Struts2HelloWorld.png?version=1&amp;modificationDate=1267883315000&amp;api=v2" data-image-src="/confluence/download/attachments/14811871/Struts2HelloWorld.png?version=1&amp;modificationDate=1267883315000&amp;api=v2"></p><p>Click on the Hello World link and you should get the HelloWorld.jsp page:</p><p><img class="confluence-embedded-image" src="https://cwiki.apache.org/confluence/download/attachments/14811871/Hello.png?version=1&amp;modificationDate=1267883315000&amp;api=v2" data-image-src="/confluence/download/attachments/14811871/Hello.png?version=1&amp;modificationDate=1267883315000&amp;api=v2"></p><h3 id="HelloWorldUsingStruts2-GettingHelp">Getting Help</h3><p>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 this application 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.</p><h2 id="HelloWorldUsingStruts2-HowtheCodeWorks">How the Code Works</h2><p>Your browser sends to the web server a request for the URL <a shape="rect" class="external-link" href="http://localhost:8080/Hello_World_Struts2_Ant/hello.action" rel="nofollow">http://localhost:8080/Hello_World_Struts2_Ant/hello.action</a>.</p><ol><li>The container receives from the web server a request for the resource <code>hello.action</code>. According to the settings loaded from the <a shape="rect" href="webxml.html">web.xml</a>, the container finds that all requests are being routed to <code>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</code>, including the <code>*.action</code> requests. The StrutsPrepareAndExecuteFilter is the entry point into the framework.</li><li>The framework looks for an action mapping named "hello", and it finds that this mapping corresponds to the class "HelloWorldAction". The framework instantiates the Action and calls the Acti
 on's <code>execute</code> method.</li><li>The <code>execute</code> method creates the MessageStore object and returns <code>SUCCESS</code>. The framework checks the action mapping to see what page to load if <code>SUCCESS</code> is returned. The framework tells the container to render as the response to the request, the resource <code>HelloWorld.jsp</code>.</li><li>As the page <code>HelloWorld.jsp</code> is being processed, the <code>&lt;s:property value="messageStore.message" /&gt;</code> tag calls the getter <code>getMessageStore</code> of the <code>HelloWorld</code> Action and then calls the <code>getMessage</code> of the MessageStore object returned by <code>getMessageStore</code>, and the tag merges into the response the value of the message attribute.</li><li>A pure HTML response is sent back to the browser.</li></ol><h2 id="HelloWorldUsingStruts2-WhattoRemember">What to Remember</h2><p>The framework uses Actions to process HTML forms and other requests. The <code>Action</code
 > class returns a result-name such as <code>SUCCESS</code>, <code>ERROR</code>, or <code>INPUT</code>. Based on the mappings loaded from the <code>struts.xml</code>, a given result-name may select a page (as in this example), another action, or some other web resource (image, PDF).</p><p>When a server page is rendered, most often it will include dynamic data provided by the Action. To make it easy to display dynamic data, the framework provides a set of tags that can be used along with HTML markup to create a server page.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Next</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Onward to <a shape="rect" href="using-struts-2-tags.html">Using Struts 2 Tags</a></p></td></tr><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Prev</p></th><td colspan="1" rowspan="1" class="confluenceTd"><p>Return to <a shape="rect" href="how-to-create-a-struts-2-web-applic
 ation.html">How To Create A Struts 2 Web Application</a></p></td></tr></tbody></table></div></div>
         </div>
 
                     <div class="tabletitle">

Modified: websites/production/struts/content/release/2.3.x/docs/interceptors.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/interceptors.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/interceptors.html Thu Mar  6 08:09:26 2014
@@ -143,11 +143,11 @@ under the License. 
                     </div>
     </div>
 <p>Many Actions share common concerns. Some Actions need input validated. Other Actions may need a file upload to be pre-processed. Another Action might need protection from a double submit. Many Actions need drop-down lists and other controls pre-populated before the page displays.</p><p>The framework makes it easy to share solutions to these concerns using an "Interceptor" strategy. When you request a resource that maps to an "action", the framework invokes the Action object. But, before the Action is executed, the invocation can be intercepted by another object. After the Action executes, the invocation could be intercepted again. Unsurprisingly, we call these objects "Interceptors."</p><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1393705360626 {padding: 0px;}
-div.rbtoc1393705360626 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1393705360626 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1394091863304 {padding: 0px;}
+div.rbtoc1394091863304 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1394091863304 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1393705360626">
+/*]]>*/</style></p><div class="toc-macro rbtoc1394091863304">
 <ul class="toc-indentation"><li><a shape="rect" href="#Interceptors-UnderstandingInterceptors">Understanding Interceptors</a></li><li><a shape="rect" href="#Interceptors-ConfiguringInterceptors">Configuring Interceptors</a></li><li><a shape="rect" href="#Interceptors-StackingInterceptors">Stacking Interceptors</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#Interceptors-TheDefaultConfiguration">The Default Configuration</a></li></ul>
 </li><li><a shape="rect" href="#Interceptors-FrameworkInterceptors">Framework Interceptors</a>



Mime
View raw message