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 2014/04/26 20:40:46 UTC
svn commit: r906991 [14/17] -
/websites/production/struts/content/release/2.3.x/docs/
Modified: websites/production/struts/content/release/2.3.x/docs/sunone-70.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/sunone-70.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/sunone-70.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.js' type='text/javascript'></script>
<script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
<script type="text/javascript">
Modified: websites/production/struts/content/release/2.3.x/docs/tabbedpanel.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/tabbedpanel.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/tabbedpanel.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/tabular-inputs-with-hashmap.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/tabular-inputs-with-hashmap.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/tabular-inputs-with-hashmap.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.js' type='text/javascript'></script>
<script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
<script type="text/javascript">
Modified: websites/production/struts/content/release/2.3.x/docs/tabular-inputs.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/tabular-inputs.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/tabular-inputs.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.js' type='text/javascript'></script>
<script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
<script type="text/javascript">
Modified: websites/production/struts/content/release/2.3.x/docs/tag-developers-guide.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/tag-developers-guide.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/tag-developers-guide.html Sat Apr 26 18:40:39 2014
@@ -125,24 +125,7 @@ under the License.
<div class="pagecontent">
<div class="wiki-content">
- <div id="ConfluenceContent"><p>
-</p><p>The framework offers a flexible view layer that supports multiple view technologies, including JSP, FreeMaker, and Velocity. </p>
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="struts-tags.html">Struts Tags</a>
- <ul><li><a shape="rect" href="generic-tags.html">Generic Tags</a></li><li><a shape="rect" href="ui-tags.html">UI Tags</a></li><li><a shape="rect" href="themes-and-templates.html">Themes and Templates</a></li><li><a shape="rect" href="tag-reference.html">Tag Reference</a></li><li><a shape="rect" href="ajax-tags.html">Ajax Tags</a>
- <ul><li><a shape="rect" href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a></li></ul>
- </li></ul>
- </li><li><a shape="rect" href="ognl.html">OGNL</a></li><li><a shape="rect" href="tag-syntax.html">Tag Syntax</a></li></ul>
-</td><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="jsp.html">JSP</a>
- <ul><li><a shape="rect" href="jsp-tags.html">specific tags</a></li></ul>
- </li><li><a shape="rect" href="freemarker.html">Freemarker</a>
- <ul><li><a shape="rect" href="freemarker-tags.html">specific tags</a></li></ul>
- </li><li><a shape="rect" href="velocity.html">Velocity</a>
- <ul><li><a shape="rect" href="velocity-tags.html">specific tags</a></li></ul>
- </li></ul>
-</td></tr></tbody></table></div>
-
-
-<h2 id="TagDevelopersGuide-Next:">Next: <a shape="rect" href="plugin-developers-guide.html">Plugin Developers Guide</a></h2></div>
+ <div id="ConfluenceContent"><p>The framework offers a flexible view layer that supports multiple view technologies, including JSP, FreeMaker, and Velocity.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="struts-tags.html">Struts Tags</a><ul><li><a shape="rect" href="generic-tags.html">Generic Tags</a></li><li><a shape="rect" href="ui-tags.html">UI Tags</a></li><li><a shape="rect" href="themes-and-templates.html">Themes and Templates</a></li><li><a shape="rect" href="tag-reference.html">Tag Reference</a></li><li><a shape="rect" href="ajax-tags.html">Ajax Tags</a><ul><li><a shape="rect" href="ajax-and-javascript-recipes.html">Ajax and JavaScript Recipes</a></li></ul></li></ul></li><li><a shape="rect" href="ognl.html">OGNL</a></li><li><a shape="rect" href="tag-syntax.html">Tag Syntax</a></li><li><a shape="rect" href="alt-syntax.html">Alt Syntax</a></li></ul></td><td colspan="
1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="jsp.html">JSP</a><ul><li><a shape="rect" href="jsp-tags.html">specific tags</a></li></ul></li><li><a shape="rect" href="freemarker.html">FreeMarker</a><ul><li><a shape="rect" href="freemarker-tags.html">specific tags</a></li></ul></li><li><a shape="rect" href="velocity.html">Velocity</a><ul><li><a shape="rect" href="velocity-tags.html">specific tags</a></li></ul></li></ul></td></tr></tbody></table></div><h2 id="TagDevelopersGuide-Next:">Next: <a shape="rect" href="plugin-developers-guide.html">Plugin Developers Guide</a></h2></div>
</div>
<div class="tabletitle">
Modified: websites/production/struts/content/release/2.3.x/docs/tag-reference.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/tag-reference.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/tag-reference.html Sat Apr 26 18:40:39 2014
@@ -138,12 +138,7 @@ under the License.
<h3 id="TagReference-UITags">UI Tags</h3>
<div class="panel" style="border-width: 1px;"><div class="panelHeader" style="border-bottom-width: 1px;"><b>UI Tag Reference</b></div><div class="panelContent">
-<p>Struts UI Tags display data in rich and reusable HTML.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Form Tags </p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="checkbox.html">checkbox</a></li><li><a shape="rect" href="checkboxlist.html">checkboxlist</a></li><li><a shape="rect" href="combobox.html">combobox</a></li><li><a shape="rect" href="doubleselect.html">doubleselect</a></li><li><a shape="rect" href="head.html">head</a></li><li><a shape="rect" href="file.html">file</a></li><li><a shape="rect" href="form.html">form</a></li><li><a shape="rect" href="hidden.html">hidden</a></li><li><a shape="rect" href="inputtransferselect.html">inputtransferselect</a></li><li><a shape="rect" href="label.html">label</a></li><li><a shape="rect" href="optiontransferselect.html">optiontransferselect</a></li><li><a shape="rect" href="optgroup.html">optgroup</a></li><li><a shape="rect" href="password.html">password</a></li><li><a shape="rect" href
="radio.html">radio</a></li><li><a shape="rect" href="reset.html">reset</a></li><li><a shape="rect" href="select.html">select</a></li><li><a shape="rect" href="submit.html">submit</a></li><li><a shape="rect" href="textarea.html">textarea</a></li><li><a shape="rect" href="textfield.html">textfield</a></li><li><a shape="rect" href="token.html">token</a></li><li><a shape="rect" href="updownselect.html">updownselect</a></li></ul>
-</td><th colspan="1" rowspan="1" class="confluenceTh"><p> Non-Form UI Tags </p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="actionerror.html">actionerror</a></li><li><a shape="rect" href="actionmessage.html">actionmessage</a></li><li><a shape="rect" href="component.html">component</a></li><li><a shape="rect" href="div.html">div</a></li><li><a shape="rect" href="fielderror.html">fielderror</a></li></ul>
-</td><th colspan="1" rowspan="1" class="confluenceTh"><p> Ajax Tags </p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="dojo-anchor.html">a</a></li><li><a shape="rect" href="autocompleter.html">autocompleter</a></li><li><a shape="rect" href="bind.html">bind</a></li><li><a shape="rect" href="datetimepicker.html">datetimepicker</a></li><li><a shape="rect" href="dojo-div.html">div</a></li><li><a shape="rect" href="dojo-head.html">head</a></li><li><a shape="rect" href="dojo-submit.html">submit</a></li><li><a shape="rect" href="tabbedpanel.html">tabbedpanel</a></li><li><a shape="rect" href="dojo-textarea.html">textarea</a></li><li><a shape="rect" href="tree.html">tree</a></li><li><a shape="rect" href="treenode.html">treenode</a></li></ul>
-</td></tr><tr><td></td></tr></tbody></table></div>
+Struts UI Tags display data in rich and reusable HTML.<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Form Tags</p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="checkbox.html">checkbox</a></li><li><a shape="rect" href="checkboxlist.html">checkboxlist</a></li><li><a shape="rect" href="combobox.html">combobox</a></li><li><a shape="rect" href="datetextfield.html">datetextfield</a></li><li><a shape="rect" href="doubleselect.html">doubleselect</a></li><li><a shape="rect" href="head.html">head</a></li><li><a shape="rect" href="file.html">file</a></li><li><a shape="rect" href="form.html">form</a></li><li><a shape="rect" href="hidden.html">hidden</a></li><li><a shape="rect" href="inputtransferselect.html">inputtransferselect</a></li><li><a shape="rect" href="label.html">label</a></li><li><a shape="rect" href="optiontransferselect.html">optiontransferselect</a></li><li><a shape="rect"
href="optgroup.html">optgroup</a></li><li><a shape="rect" href="password.html">password</a></li><li><a shape="rect" href="radio.html">radio</a></li><li><a shape="rect" href="reset.html">reset</a></li><li><a shape="rect" href="select.html">select</a></li><li><a shape="rect" href="submit.html">submit</a></li><li><a shape="rect" href="textarea.html">textarea</a></li><li><a shape="rect" href="textfield.html">textfield</a></li><li><a shape="rect" href="token.html">token</a></li><li><a shape="rect" href="updownselect.html">updownselect</a></li></ul></td><th colspan="1" rowspan="1" class="confluenceTh"><p>Non-Form UI Tags</p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="actionerror.html">actionerror</a></li><li><a shape="rect" href="actionmessage.html">actionmessage</a></li><li><a shape="rect" href="component.html">component</a></li><li><a shape="rect" href="div.html">div</a></li><li><a shape="rect" href="fielderror.html">fielderror</a></li></ul></td><
th colspan="1" rowspan="1" class="confluenceTh"><p>Ajax Tags</p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="dojo-anchor.html">a</a></li><li><a shape="rect" href="autocompleter.html">autocompleter</a></li><li><a shape="rect" href="bind.html">bind</a></li><li><a shape="rect" href="datetimepicker.html">datetimepicker</a></li><li><a shape="rect" href="dojo-div.html">div</a></li><li><a shape="rect" href="dojo-head.html">head</a></li><li><a shape="rect" href="dojo-submit.html">submit</a></li><li><a shape="rect" href="tabbedpanel.html">tabbedPanel</a></li><li><a shape="rect" href="dojo-textarea.html">textarea</a></li><li><a shape="rect" href="tree.html">tree</a></li><li><a shape="rect" href="treenode.html">treenode</a></li></ul></td></tr></tbody></table></div>
</div></div>
<h2 id="TagReference-Next">Next <a shape="rect" href="ajax-tags.html">Ajax Tags</a></h2></div>
Modified: websites/production/struts/content/release/2.3.x/docs/tag-syntax.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/tag-syntax.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/tag-syntax.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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>
Modified: websites/production/struts/content/release/2.3.x/docs/testing-actions.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/testing-actions.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/testing-actions.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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>
Modified: websites/production/struts/content/release/2.3.x/docs/testng-plugin.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/testng-plugin.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/testng-plugin.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.js' type='text/javascript'></script>
<script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
<script type="text/javascript">
Modified: websites/production/struts/content/release/2.3.x/docs/text.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/text.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/text.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/textarea.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/textarea.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/textarea.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/textfield.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/textfield.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/textfield.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/tiles-2-plugin.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/tiles-2-plugin.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/tiles-2-plugin.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/tiles-3-plugin.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/tiles-3-plugin.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/tiles-3-plugin.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.js' type='text/javascript'></script>
<script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
<script type="text/javascript">
Modified: websites/production/struts/content/release/2.3.x/docs/tiles-use.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/tiles-use.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/tiles-use.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.js' type='text/javascript'></script>
<script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
<script type="text/javascript">
Modified: websites/production/struts/content/release/2.3.x/docs/timer-interceptor.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/timer-interceptor.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/timer-interceptor.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/token-interceptor.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/token-interceptor.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/token-interceptor.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/token-session-interceptor.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/token-session-interceptor.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/token-session-interceptor.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/token.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/token.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/token.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/tree.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/tree.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/tree.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/treenode.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/treenode.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/treenode.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/tutoriallesson06.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/tutoriallesson06.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/tutoriallesson06.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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>
Modified: websites/production/struts/content/release/2.3.x/docs/type-conversion.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/type-conversion.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/type-conversion.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
@@ -140,11 +139,11 @@ under the License.
<div id="ConfluenceContent"><p>Routine type conversion in the framework is transparent. Generally, all you need to do is ensure that HTML inputs have names that can be used in <a shape="rect" href="ognl.html">OGNL</a> expressions. (HTML inputs are form elements and other GET/POST parameters.)</p>
<style type="text/css">/*<![CDATA[*/
-div.rbtoc1394094101206 {padding: 0px;}
-div.rbtoc1394094101206 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1394094101206 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1396727213883 {padding: 0px;}
+div.rbtoc1396727213883 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1396727213883 li {margin-left: 0px;padding-left: 0px;}
-/*]]>*/</style><div class="toc-macro rbtoc1394094101206">
+/*]]>*/</style><div class="toc-macro rbtoc1396727213883">
<ul class="toc-indentation"><li><span class="TOCOutline">1</span> <a shape="rect" href="#TypeConversion-BuiltinTypeConversionSupport">Built in Type Conversion Support</a></li><li><span class="TOCOutline">2</span> <a shape="rect" href="#TypeConversion-RelationshiptoParameterNames">Relationship to Parameter Names</a></li><li><span class="TOCOutline">3</span> <a shape="rect" href="#TypeConversion-CreatingaTypeConverter">Creating a Type Converter</a></li><li><span class="TOCOutline">4</span> <a shape="rect" href="#TypeConversion-ApplyingaTypeConvertertoanAction">Applying a Type Converter to an Action</a></li><li><span class="TOCOutline">5</span> <a shape="rect" href="#TypeConversion-ApplyingaTypeConvertertoabeanormodel">Applying a Type Converter to a bean or model</a></li><li><span class="TOCOutline">6</span> <a shape="rect" href="#TypeConversion-ApplyingaTypeConverterforanapplication">Applying a Type Converter for an application</a></li><li><span class="TOCOutline">7</span> <a shape="r
ect" href="#TypeConversion-ASimpleExample">A Simple Example</a></li><li><span class="TOCOutline">8</span> <a shape="rect" href="#TypeConversion-AdvancedTypeConversion">Advanced Type Conversion</a>
<ul class="toc-indentation"><li><span class="TOCOutline">8.1</span> <a shape="rect" href="#TypeConversion-NullPropertyHandling">Null Property Handling</a></li><li><span class="TOCOutline">8.2</span> <a shape="rect" href="#TypeConversion-CollectionandMapSupport">Collection and Map Support</a>
<ul class="toc-indentation"><li><span class="TOCOutline">8.2.1</span> <a shape="rect" href="#TypeConversion-Indexingacollectionbyapropertyofthatcollection">Indexing a collection by a property of that collection</a></li></ul>
Modified: websites/production/struts/content/release/2.3.x/docs/typeconversion-annotation.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/typeconversion-annotation.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/typeconversion-annotation.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/ui-tag-reference.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/ui-tag-reference.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/ui-tag-reference.html Sat Apr 26 18:40:39 2014
@@ -125,19 +125,7 @@ under the License.
<div class="pagecontent">
<div class="wiki-content">
- <div id="ConfluenceContent"><p>
-</p><p>Struts UI Tags display data in rich and reusable HTML.</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Form Tags </p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="checkbox.html">checkbox</a></li><li><a shape="rect" href="checkboxlist.html">checkboxlist</a></li><li><a shape="rect" href="combobox.html">combobox</a></li><li><a shape="rect" href="doubleselect.html">doubleselect</a></li><li><a shape="rect" href="head.html">head</a></li><li><a shape="rect" href="file.html">file</a></li><li><a shape="rect" href="form.html">form</a></li><li><a shape="rect" href="hidden.html">hidden</a></li><li><a shape="rect" href="inputtransferselect.html">inputtransferselect</a></li><li><a shape="rect" href="label.html">label</a></li><li><a shape="rect" href="optiontransferselect.html">optiontransferselect</a></li><li><a shape="rect" href="optgroup.html">optgroup</a></li><li><a shape="rect" href="password.html">password</a></li><li><a shape="rect" href
="radio.html">radio</a></li><li><a shape="rect" href="reset.html">reset</a></li><li><a shape="rect" href="select.html">select</a></li><li><a shape="rect" href="submit.html">submit</a></li><li><a shape="rect" href="textarea.html">textarea</a></li><li><a shape="rect" href="textfield.html">textfield</a></li><li><a shape="rect" href="token.html">token</a></li><li><a shape="rect" href="updownselect.html">updownselect</a></li></ul>
-</td><th colspan="1" rowspan="1" class="confluenceTh"><p> Non-Form UI Tags </p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="actionerror.html">actionerror</a></li><li><a shape="rect" href="actionmessage.html">actionmessage</a></li><li><a shape="rect" href="component.html">component</a></li><li><a shape="rect" href="div.html">div</a></li><li><a shape="rect" href="fielderror.html">fielderror</a></li></ul>
-</td><th colspan="1" rowspan="1" class="confluenceTh"><p> Ajax Tags </p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="dojo-anchor.html">a</a></li><li><a shape="rect" href="autocompleter.html">autocompleter</a></li><li><a shape="rect" href="bind.html">bind</a></li><li><a shape="rect" href="datetimepicker.html">datetimepicker</a></li><li><a shape="rect" href="dojo-div.html">div</a></li><li><a shape="rect" href="dojo-head.html">head</a></li><li><a shape="rect" href="dojo-submit.html">submit</a></li><li><a shape="rect" href="tabbedpanel.html">tabbedpanel</a></li><li><a shape="rect" href="dojo-textarea.html">textarea</a></li><li><a shape="rect" href="tree.html">tree</a></li><li><a shape="rect" href="treenode.html">treenode</a></li></ul>
-</td></tr><tr><td></td></tr></tbody></table></div>
-
-
-
-<p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9ac.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For detailed descriptions of each tag, including usage examples, see the <a shape="rect" href="tag-reference.html">Tag Reference</a>.</p>
-
-<h2 id="UITagReference-Next:">Next: <a shape="rect" href="ajax-tags.html">Ajax Tags</a></h2></div>
+ <div id="ConfluenceContent"><p>Struts UI Tags display data in rich and reusable HTML.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Form Tags</p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="checkbox.html">checkbox</a></li><li><a shape="rect" href="checkboxlist.html">checkboxlist</a></li><li><a shape="rect" href="combobox.html">combobox</a></li><li><a shape="rect" href="datetextfield.html">datetextfield</a></li><li><a shape="rect" href="doubleselect.html">doubleselect</a></li><li><a shape="rect" href="head.html">head</a></li><li><a shape="rect" href="file.html">file</a></li><li><a shape="rect" href="form.html">form</a></li><li><a shape="rect" href="hidden.html">hidden</a></li><li><a shape="rect" href="inputtransferselect.html">inputtransferselect</a></li><li><a shape="rect" href="label.html">label</a></li><li><a shape="rect" href="optiontransferselect.html">op
tiontransferselect</a></li><li><a shape="rect" href="optgroup.html">optgroup</a></li><li><a shape="rect" href="password.html">password</a></li><li><a shape="rect" href="radio.html">radio</a></li><li><a shape="rect" href="reset.html">reset</a></li><li><a shape="rect" href="select.html">select</a></li><li><a shape="rect" href="submit.html">submit</a></li><li><a shape="rect" href="textarea.html">textarea</a></li><li><a shape="rect" href="textfield.html">textfield</a></li><li><a shape="rect" href="token.html">token</a></li><li><a shape="rect" href="updownselect.html">updownselect</a></li></ul></td><th colspan="1" rowspan="1" class="confluenceTh"><p>Non-Form UI Tags</p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="actionerror.html">actionerror</a></li><li><a shape="rect" href="actionmessage.html">actionmessage</a></li><li><a shape="rect" href="component.html">component</a></li><li><a shape="rect" href="div.html">div</a></li><li><a shape="rect" href="
fielderror.html">fielderror</a></li></ul></td><th colspan="1" rowspan="1" class="confluenceTh"><p>Ajax Tags</p></th><td colspan="1" rowspan="1" class="confluenceTd"><ul><li><a shape="rect" href="dojo-anchor.html">a</a></li><li><a shape="rect" href="autocompleter.html">autocompleter</a></li><li><a shape="rect" href="bind.html">bind</a></li><li><a shape="rect" href="datetimepicker.html">datetimepicker</a></li><li><a shape="rect" href="dojo-div.html">div</a></li><li><a shape="rect" href="dojo-head.html">head</a></li><li><a shape="rect" href="dojo-submit.html">submit</a></li><li><a shape="rect" href="tabbedpanel.html">tabbedPanel</a></li><li><a shape="rect" href="dojo-textarea.html">textarea</a></li><li><a shape="rect" href="tree.html">tree</a></li><li><a shape="rect" href="treenode.html">treenode</a></li></ul></td></tr></tbody></table></div><p><img class="emoticon emoticon-light-on" src="https://cwiki.apache.org/confluence/s/en_GB-1988229788/4109/76e0dbb30bc8580e459c201f3535d84f9283a9a
c.1/_/images/icons/emoticons/lightbulb_on.png" data-emoticon-name="light-on" alt="(lightbulb)"> For detailed descriptions of each tag, including usage examples, see the <a shape="rect" href="tag-reference.html">Tag Reference</a>.</p><h2 id="UITagReference-Next:">Next: <a shape="rect" href="ajax-tags.html">Ajax Tags</a></h2></div>
</div>
<div class="tabletitle">
@@ -256,6 +244,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/release/2.3.x/docs/unit-testing.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/unit-testing.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/unit-testing.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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>
@@ -139,69 +138,30 @@ under the License.
<div id="ConfluenceContent"> <div class="aui-message hint shadowed information-macro">
<span class="aui-icon icon-hint">Icon</span>
<div class="message-content">
- <p>The example code for this tutorial, unit_testing, is available for checkout 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></p>
+ <p>The example code for this tutorial, unit_testing, is available at <a shape="rect" class="external-link" href="https://github.com/apache/struts-examples" rel="nofollow">https://github.com/apache/struts-examples</a></p>
</div>
</div>
-
-
-<h3 id="UnitTesting-Introduction">Introduction</h3>
-
-<p>Struts 2 supports running unit tests of methods in the Struts Action class with the <a shape="rect" class="external-link" href="http://struts.apache.org/2.3.1.2/docs/junit-plugin.html">Struts 2 JUnit plugin</a>. The JUnit plugin allows you to test methods of an Action class from within the Struts 2 framework. The Struts Servlet filter and interceptors fire just as if your application was running on a Servlet container. </p>
-
- <div class="aui-message success shadowed information-macro">
+<h3 id="UnitTesting-Introduction">Introduction</h3><p>Struts 2 supports running unit tests of methods in the Struts Action class with the <a shape="rect" class="external-link" href="http://struts.apache.org/2.3.1.2/docs/junit-plugin.html">Struts 2 JUnit plugin</a>. The JUnit plugin allows you to test methods of an Action class from within the Struts 2 framework. The Struts Servlet filter and interceptors fire just as if your application was running on a Servlet container.</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 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.</p>
</div>
</div>
-
-
-
-<h3 id="UnitTesting-Setup">Setup</h3>
-
-<p>The Struts 2 JUnit plugin jar file must be on your application's class path. In the example application (see info above) the pom.xml includes a dependency for the struts2-junit-plugin. There are numerous transitive dependencies, including to JUnit and the Spring framework.</p>
-
-<h3 id="UnitTesting-WritingAUnitTest">Writing A Unit Test</h3>
-<p>In the example application, the Register Action class includes using the validate method. This method is automatically executed by the Struts 2 framework prior to the execute method. Additionally, this method needs the values from the user's input on the form to already have been provided to the instance fields of the Action class (this work is done by another Struts 2 interceptor). So it would be difficult to test the validate method without the overall Struts 2 framework running.</p>
-
-<p>To use the Struts 2 plugin to ensure the Strut 2 framework runs as part of the test, you need to have your JUnit test class extend StrutsTestCase (see RegisterTest class in the example application). </p>
-
- <div class="aui-message hint shadowed information-macro">
+<h3 id="UnitTesting-Setup">Setup</h3><p>The Struts 2 JUnit plugin jar file must be on your application's class path. In the example application (see info above) the pom.xml includes a dependency for the struts2-junit-plugin. There are numerous transitive dependencies, including to JUnit and the Spring framework.</p><h3 id="UnitTesting-WritingAUnitTest">Writing A Unit Test</h3><p>In the example application, the Register Action class includes using the validate method. This method is automatically executed by the Struts 2 framework prior to the execute method. Additionally, this method needs the values from the user's input on the form to already have been provided to the instance fields of the Action class (this work is done by another Struts 2 interceptor). So it would be difficult to test the validate method without the overall Struts 2 framework running.</p><p>To use the Struts 2 plugin to ensure the Strut 2 framework runs as part of the test, you need to have your JUnit test clas
s extend StrutsTestCase (see RegisterTest class in the example application).</p> <div class="aui-message hint shadowed information-macro">
<span class="aui-icon icon-hint">Icon</span>
<div class="message-content">
- <p>Note that the Struts 2 JUnit plugin can be used to design unit tests of other Action class methods such as the input method and also to test methods of a custom interceptor you add to the interceptor stack. Also in this example, the test is for validation performed in the <a shape="rect" href="form-validation.html">validate method</a>. But the same type of test would work if the validation was done using <a shape="rect" href="form-validation-using-xml.html">XML file validation</a>.</p>
+ <p>Note that the Struts 2 JUnit plugin can be used to design unit tests of other Action class methods such as the input method and also to test methods of a custom interceptor you add to the interceptor stack. Also in this example, the test is for validation performed in the <a shape="rect" href="form-validation.html">validate method</a>. But the same type of test would work if the validation was done using <a shape="rect" href="form-validation-using-xml.html">XML file validation</a>.</p>
</div>
</div>
-
-
-<p>To test the validate method we want Struts to call the Struts action that will cause the Action class's validate and execute methods to be run. In the example application this action is register.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-
-
- <action name="register" class="org.apache.struts.register.action.Register" method="execute">
+<p>To test the validate method we want Struts to call the Struts action that will cause the Action class's validate and execute methods to be run. In the example application this action is register.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>struts.xml</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ <action name="register" class="org.apache.struts.register.action.Register" method="execute">
<result name="success">/thankyou.jsp</result>
<result name="input">/register.jsp</result>
</action>
]]></script>
-</div></div>
-
-<p>Remember the validate method will be called automatically by the framework before calling the execute method. If validation fails the Struts framework will return "input". If there are no validation errors then the framework will call the execute method and return whatever String the execute method returns.</p>
-
-<h3 id="UnitTesting-TestValidationShouldPass">Test Validation Should Pass</h3>
-<p>For our first test we'll test that there should be no validation errors. In the normal flow of this application the user would first enter the form data shown on the register.jsp page.</p>
-
-
-<p><img class="confluence-embedded-image confluence-content-image-border" src="https://cwiki.apache.org/confluence/download/attachments/27838592/Screen%20shot%202012-02-17%20at%202.46.54%20PM.png?version=1&modificationDate=1329493745000&api=v2" data-image-src="/confluence/download/attachments/27838592/Screen%20shot%202012-02-17%20at%202.46.54%20PM.png?version=1&modificationDate=1329493745000&api=v2"></p>
-
-<p>The input fields for the form have the following name values: personBean.firstName, personBean.lastName, personBean.email, and personBean.age. When the user fills out those fields Struts will take the values and provide them to the appropriate set methods of the personBean object. So as part of the test I need to simulate the user filling out these form fields. The StrutsTestCase provides a request object (of type MockHttpServletRequest) that I can use to set these values in the request scope.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>testExecuteValidationPasses method from RegisterTest class</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-
-@Test
+</div></div><p>Remember the validate method will be called automatically by the framework before calling the execute method. If validation fails the Struts framework will return "input". If there are no validation errors then the framework will call the execute method and return whatever String the execute method returns.</p><h3 id="UnitTesting-TestValidationShouldPass">Test Validation Should Pass</h3><p>For our first test we'll test that there should be no validation errors. In the normal flow of this application the user would first enter the form data shown on the register.jsp page.</p><p><img class="confluence-embedded-image confluence-content-image-border" src="https://cwiki.apache.org/confluence/download/attachments/27838592/Screen%20shot%202012-02-17%20at%202.46.54%20PM.png?version=1&modificationDate=1329493745000&api=v2" data-image-src="/confluence/download/attachments/27838592/Screen%20shot%202012-02-17%20at%202.46.54%20PM.png?version=1&modificationDate=13294937
45000&api=v2"></p><p>The input fields for the form have the following name values: personBean.firstName, personBean.lastName, personBean.email, and personBean.age. When the user fills out those fields Struts will take the values and provide them to the appropriate set methods of the personBean object. So as part of the test I need to simulate the user filling out these form fields. The StrutsTestCase provides a request object (of type MockHttpServletRequest) that I can use to set these values in the request scope.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>testExecuteValidationPasses method from RegisterTest class</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[@Test
public void testExecuteValidationPasses() throws Exception() {
request.setParameter("personBean.firstName", "Bruce");
@@ -225,27 +185,8 @@ public void testExecuteValidationPasses(
}
]]></script>
-</div></div>
-
-<p>The first statements in the test method use the request object to set the values of any request parameters. These simulate the values the user would enter into the form fields. Note how the first argument to setParameter is the same as the value of the name attribute in the Struts textfield tag in the register.jsp page.</p>
-
-<p>In this test I'm providing good data for each form field as I want to ensure my validation doesn't register an error if the user provides correct information.</p>
-
-<p>I then call the getActionProxy method with the argument of "/register.action" and then the getAction method to get a reference to the Struts action class for this test. This will ensure that the Struts 2 JUnit plugin will know which Action class should be used--the class associated with the register action in the struts.xml. In this case that class is the Register class.</p>
-
-<p>The assertNotNull test ensures that argument to getActionProxy reference an Action class identified in struts.xml. It's a way of checking that you've correctly setup struts.xml for this action. </p>
-
-<p>After that I can call actionProxy.execute(). This causes the Struts 2 framework to go through its normal process of Servlet fileter and interceptors for the action identified by the actionProxy (in this case that is the register.action). The validate method of class Register will get called and if it doesn't create any field or action errors then Struts 2 will call the execute method. In this example, the execute method should return "success". </p>
-
-<p>So in the next statement, I check that success was returned.</p>
-
-<h3 id="UnitTesting-TestValidationShouldFail">Test Validation Should Fail</h3>
-<p>To test that validation should fail, I just need to have a test method that doesn't provide input for a form field. For example, in the validate method of the Register Action class, is a test to ensure the user has entered some information for the personBean.firstName input field. In the test method I would just not use the request object to set a parameter for that field.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>testExecuteValidationFailsMissingFirstName method from RegisterTest class</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-
-@Test
+</div></div><p>The first statements in the test method use the request object to set the values of any request parameters. These simulate the values the user would enter into the form fields. Note how the first argument to setParameter is the same as the value of the name attribute in the Struts textfield tag in the register.jsp page.</p><p>In this test I'm providing good data for each form field as I want to ensure my validation doesn't register an error if the user provides correct information.</p><p>I then call the getActionProxy method with the argument of "/register.action" and then the getAction method to get a reference to the Struts action class for this test. This will ensure that the Struts 2 JUnit plugin will know which Action class should be used--the class associated with the register action in the struts.xml. In this case that class is the Register class.</p><p>The assertNotNull test ensures that argument to getActionProxy reference an Action class identified in struts
.xml. It's a way of checking that you've correctly setup struts.xml for this action.</p><p>After that I can call actionProxy.execute(). This causes the Struts 2 framework to go through its normal process of Servlet fileter and interceptors for the action identified by the actionProxy (in this case that is the register.action). The validate method of class Register will get called and if it doesn't create any field or action errors then Struts 2 will call the execute method. In this example, the execute method should return "success".</p><p>So in the next statement, I check that success was returned.</p><h3 id="UnitTesting-TestValidationShouldFail">Test Validation Should Fail</h3><p>To test that validation should fail, I just need to have a test method that doesn't provide input for a form field. For example, in the validate method of the Register Action class, is a test to ensure the user has entered some information for the personBean.firstName input field. In the test method I wou
ld just not use the request object to set a parameter for that field.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>testExecuteValidationFailsMissingFirstName method from RegisterTest class</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[@Test
public void testExecuteValidationFailsMissingFirstName() throws Exception() {
//request.setParameter("personBean.firstName", "Bruce");
@@ -269,13 +210,7 @@ public void testExecuteValidationFailsMi
}
]]></script>
-</div></div>
-
-<p>In the last assertEquals statement my test checks that the Struts 2 framework returned "input" as that is what the Struts 2 framework will return if the validation adds a field or action error.</p>
-
-<h3 id="UnitTesting-Summary">Summary</h3>
-
-<p>There is much more you can do with the Struts 2 JUnit plugin to help you test the methods of your Action class in conjunction with the Struts 2 fraemwork. If your Struts 2 application uses Spring to inject dependencies into the Action class then the Struts 2 JUnit Plugin has a StrutsSpringTestCase that your test class should extend. Please read <a shape="rect" class="external-link" href="http://struts.apache.org/2.3.1.2/docs/testing-actions.html">Testing Actions</a> to learn more.</p></div>
+</div></div><p>In the last assertEquals statement my test checks that the Struts 2 framework returned "input" as that is what the Struts 2 framework will return if the validation adds a field or action error.</p><h3 id="UnitTesting-Summary">Summary</h3><p>There is much more you can do with the Struts 2 JUnit plugin to help you test the methods of your Action class in conjunction with the Struts 2 fraemwork. If your Struts 2 application uses Spring to inject dependencies into the Action class then the Struts 2 JUnit Plugin has a StrutsSpringTestCase that your test class should extend. Please read <a shape="rect" class="external-link" href="http://struts.apache.org/2.3.1.2/docs/testing-actions.html">Testing Actions</a> to learn more.</p></div>
</div>
Modified: websites/production/struts/content/release/2.3.x/docs/unknown-handlers.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/unknown-handlers.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/unknown-handlers.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.js' type='text/javascript'></script>
<script src='http://struts.apache.org/highlighter/js/shBrushXml.js' type='text/javascript'></script>
<script type="text/javascript">
Modified: websites/production/struts/content/release/2.3.x/docs/updownselect.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/updownselect.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/updownselect.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/url-validator.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/url-validator.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/url-validator.html Sat Apr 26 18:40:39 2014
@@ -37,10 +37,7 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
<script type="text/javascript">
SyntaxHighlighter.defaults['toolbar'] = false;
@@ -137,37 +134,23 @@ under the License.
<div class="pagecontent">
<div class="wiki-content">
- <div id="ConfluenceContent">
-<h1 id="urlvalidator-Description">Description</h1>
-
-<p>URLValidator checks that a given field is a String and a valid URL</p>
-
-
-<h1 id="urlvalidator-Parameters">Parameters</h1>
-
-<p></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li></ul>
-
-
-
-<h1 id="urlvalidator-Examples">Examples</h1>
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-<validators>
- <!-- Plain Validator Syntax -->
- <validator type="url">
- <param name="fieldName">myHomePage</param>
- <message>Invalid homepage url</message>
- </validator>
-
- <!-- Field Validator Syntax -->
- <field name="myHomepage">
- <field-validator type="url">
- <message>Invalid homepage url</message>
- </field-validator>
- </field>
+ <div id="ConfluenceContent"><h1 id="urlvalidator-Description">Description</h1><p>URLValidator checks that a given field is a String and a valid URL</p><p><span style="font-size: 24.0px;line-height: 1.25;">Parameters</span></p><ul><li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li><li>urlRegexExpression - The regex defined as expression used to validate url. If not defined 'urlRegex' will be used instead</li><li>urlRegex - The regex used to validate url. If not defined default regex will be used</li></ul><h1 id="urlvalidator-Examples">Examples</h1><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[<validators>
+ <!-- Plain Validator Syntax -->
+ <validator type="url">
+ <param name="fieldName">myHomePage</param>
+ <message>Invalid homepage url</message>
+ </validator>
+
+ <!-- Field Validator Syntax -->
+ <field name="myHomepage">
+ <field-validator type="url">
+ <message>Invalid homepage url</message>
+ </field-validator>
+ </field>
</validators>
]]></script>
-</div></div></div>
+</div></div><p>See more details in <a shape="rect" href="urlvalidator-annotation.html">UrlValidator Annotation</a></p></div>
</div>
Modified: websites/production/struts/content/release/2.3.x/docs/url.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/url.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/url.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
Modified: websites/production/struts/content/release/2.3.x/docs/urlvalidator-annotation.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/urlvalidator-annotation.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/urlvalidator-annotation.html Sat Apr 26 18:40:39 2014
@@ -37,10 +37,7 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>
<script type="text/javascript">
SyntaxHighlighter.defaults['toolbar'] = false;
@@ -137,22 +134,37 @@ under the License.
<div class="pagecontent">
<div class="wiki-content">
- <div id="ConfluenceContent"><p>This validator checks that a field is a valid URL.</p>
-
-<h2 id="UrlValidatorAnnotation-Usage">Usage</h2>
-
-<p></p><p></p>The annotation must be applied at method level.
-
-<h2 id="UrlValidatorAnnotation-Parameters">Parameters</h2>
-
-<p><table class="confluenceTable"><tr><th colspan="1" rowspan="1" class="confluenceTh"> Parameter </th><th colspan="1" rowspan="1" class="confluenceTh"> Required </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd">field error message</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">key</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd">i18n key from language specific properties file.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">messageParams</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" cl
ass="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd">Additional params to be used to customize message - will be evaluated against the Value Stack</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">fieldName</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">shortCircuit</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd">false</td><td colspan="1" rowspan="1" class="confluenceTd">If this validator should be used as shortCircuit.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">type</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">ValidatorType.FIELD</td><td colspan="1" rowspan="1" class="confluenceTd">Enum value from ValidatorType. Ei
ther FIELD or SIMPLE can be used here.</td></tr></table></p>
-
-<h2 id="UrlValidatorAnnotation-Examples">Examples</h2>
-
-<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[
-@UrlValidator(message = "Default message", key = "i18n.key", shortCircuit = true)
-]]></script>
+ <div id="ConfluenceContent"><p>This validator checks that a field is a valid URL.</p><p><span style="font-size: 20.0px;line-height: 1.5;">Usage</span></p><p><span style="font-size: 20.0px;line-height: 1.5;"> </span>The annotation must be applied at method level.</p><p><span style="font-size: 20.0px;line-height: 1.5;">Parameters</span></p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh">Parameter</th><th colspan="1" rowspan="1" class="confluenceTh">Required</th><th colspan="1" rowspan="1" class="confluenceTh">Default</th><th colspan="1" rowspan="1" class="confluenceTh">Notes</th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">message</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd">field error message</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">key</td><td
colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd">i18n key from language specific properties file</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">messageParams</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd">additional params to be used to customize message - will be evaluated against the Value Stack</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">fieldName</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd">field name under validation</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">shortCircuit</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenc
eTd">false</td><td colspan="1" rowspan="1" class="confluenceTd">if this validator should be used as shortCircuit</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">urlRegex</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd">defines regex to use to validate url</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">urlRegexExpression</td><td colspan="1" rowspan="1" class="confluenceTd">no</td><td colspan="1" rowspan="1" class="confluenceTd"> </td><td colspan="1" rowspan="1" class="confluenceTd">defines regex as expression to validate url, expression will be evaluated against current stack to get proper regex</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">type</td><td colspan="1" rowspan="1" class="confluenceTd">yes</td><td colspan="1" rowspan="1" class="confluenceTd">ValidatorType.FIELD</td><td colspan="1" rowspan="1" class="confl
uenceTd">Enum value from ValidatorType. Either FIELD or SIMPLE can be used here</td></tr></tbody></table></div><p><span style="font-size: 20.0px;line-height: 1.5;">Examples</span></p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>UrlValidator usage example</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[@UrlValidator(message = "Default message", key = "i18n.key", shortCircuit = true)]]></script>
+</div></div><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>UrlValidator usage example</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[@UrlValidator(message = "Default message", key = "i18n.key", urlRegexExpression = "${urlRegex}")]]></script>
+</div></div> <div class="aui-message warning shadowed information-macro">
+ <span class="aui-icon icon-warning">Icon</span>
+ <div class="message-content">
+ <p><code><code>urlRegex</code></code><span> neither <code>urlRegexExpression</code></span><code> are only used on client side to validate URLs - this will be changed with next major release!</code></p>
+ </div>
+ </div>
+ <div class="aui-message warning shadowed information-macro">
+ <span class="aui-icon icon-warning">Icon</span>
+ <div class="message-content">
+ <p>If no <code>urlRegex</code> neither <code>urlRegexExpression</code> is defined, default regex will be used instead, based on <a shape="rect" class="external-link" href="http://stackoverflow.com/questions/161738/what-is-the-best-regular-expression-to-check-if-a-string-is-a-valid-url" rel="nofollow">StackOverflow answer</a></p>
+ </div>
+ </div>
+<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Default URL regex</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[return "^(https?|ftp):\/\/" +
+ "(([a-z0-9$_\\.\\+!\\*\\'\\(\\),;\\?&=-]|%[0-9a-f]{2})+" +
+ "(:([a-z0-9$_\\.\\+!\\*\\'\\(\\),;\\?&=-]|%[0-9a-f]{2})+)?" +
+ "@)?(#?" +
+ ")((([a-z0-9]\\.|[a-z0-9][a-z0-9-]*[a-z0-9]\\.)*" +
+ "[a-z][a-z0-9-]*[a-z0-9]" +
+ "|((\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5])\\.){3}" +
+ "(\\d|[1-9]\\d|1\\d{2}|2[0-4][0-9]|25[0-5])" +
+ ")(:\\d+)?" +
+ ")(((\\/+([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&=-]|%[0-9a-f]{2})*)*" +
+ "(\\?([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&=-]|%[0-9a-f]{2})*)" +
+ "?)?)?" +
+ "(#([a-z0-9$_\\.\\+!\\*\\'\\(\\),;:@&=-]|%[0-9a-f]{2})*)?" +
+ "$";]]></script>
</div></div></div>
</div>
Modified: websites/production/struts/content/release/2.3.x/docs/using-checkboxes-editactionjava.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/using-checkboxes-editactionjava.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/using-checkboxes-editactionjava.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.js' type='text/javascript'></script>
<script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
<script type="text/javascript">
Modified: websites/production/struts/content/release/2.3.x/docs/using-checkboxes-userjava.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/using-checkboxes-userjava.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/using-checkboxes-userjava.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.js' type='text/javascript'></script>
<script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
<script type="text/javascript">
Modified: websites/production/struts/content/release/2.3.x/docs/using-checkboxes-velocity-and-html.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/using-checkboxes-velocity-and-html.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/using-checkboxes-velocity-and-html.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.js' type='text/javascript'></script>
<script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
<script type="text/javascript">
Modified: websites/production/struts/content/release/2.3.x/docs/using-checkboxes.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/using-checkboxes.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/using-checkboxes.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.js' type='text/javascript'></script>
<script src='http://struts.apache.org/highlighter/js/shBrushJava.js' type='text/javascript'></script>
<script type="text/javascript">
Modified: websites/production/struts/content/release/2.3.x/docs/using-field-validators.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/using-field-validators.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/using-field-validators.html Sat Apr 26 18:40:39 2014
@@ -37,7 +37,6 @@ under the License.
<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/shBrushPlain.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 src='http://struts.apache.org/highlighter/js/shBrushPlain.js' type='text/javascript'></script>