svn commit: r21281 - /dev/struts/2.5.13/

[lukaszlenart]

Author: lukaszlenart
Date: Wed Aug 23 12:56:43 2017
New Revision: 21281

Log:
Updates test release 2.5.13

Added:
dev/struts/2.5.13/
dev/struts/2.5.13/struts-2.5.13-all.zip   (with props)
dev/struts/2.5.13/struts-2.5.13-all.zip.asc   (with props)
dev/struts/2.5.13/struts-2.5.13-all.zip.md5
dev/struts/2.5.13/struts-2.5.13-all.zip.sha1
dev/struts/2.5.13/struts-2.5.13-apps.zip   (with props)
dev/struts/2.5.13/struts-2.5.13-apps.zip.asc   (with props)
dev/struts/2.5.13/struts-2.5.13-apps.zip.md5
dev/struts/2.5.13/struts-2.5.13-apps.zip.sha1
dev/struts/2.5.13/struts-2.5.13-docs.zip   (with props)
dev/struts/2.5.13/struts-2.5.13-docs.zip.asc   (with props)
dev/struts/2.5.13/struts-2.5.13-docs.zip.md5
dev/struts/2.5.13/struts-2.5.13-docs.zip.sha1
dev/struts/2.5.13/struts-2.5.13-lib.zip   (with props)
dev/struts/2.5.13/struts-2.5.13-lib.zip.asc   (with props)
dev/struts/2.5.13/struts-2.5.13-lib.zip.md5
dev/struts/2.5.13/struts-2.5.13-lib.zip.sha1
dev/struts/2.5.13/struts-2.5.13-min-lib.zip   (with props)
dev/struts/2.5.13/struts-2.5.13-min-lib.zip.asc   (with props)
dev/struts/2.5.13/struts-2.5.13-min-lib.zip.md5
dev/struts/2.5.13/struts-2.5.13-min-lib.zip.sha1
dev/struts/2.5.13/struts-2.5.13-src.zip   (with props)
dev/struts/2.5.13/struts-2.5.13-src.zip.asc   (with props)
dev/struts/2.5.13/struts-2.5.13-src.zip.md5
dev/struts/2.5.13/struts-2.5.13-src.zip.sha1

Added: dev/struts/2.5.13/struts-2.5.13-all.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5.13/struts-2.5.13-all.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5.13/struts-2.5.13-all.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5.13/struts-2.5.13-all.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.5.13/struts-2.5.13-all.zip.md5
==
--- dev/struts/2.5.13/struts-2.5.13-all.zip.md5 (added)
+++ dev/struts/2.5.13/struts-2.5.13-all.zip.md5 Wed Aug 23 12:56:43 2017
@@ -0,0 +1 @@
+17c2a88aa18d3575641f2c20419af7bb
\ No newline at end of file

Added: dev/struts/2.5.13/struts-2.5.13-all.zip.sha1
==
--- dev/struts/2.5.13/struts-2.5.13-all.zip.sha1 (added)
+++ dev/struts/2.5.13/struts-2.5.13-all.zip.sha1 Wed Aug 23 12:56:43 2017
@@ -0,0 +1 @@
+305242d47d1ed3bc72e55ff596c0974a1f9b058d
\ No newline at end of file

Added: dev/struts/2.5.13/struts-2.5.13-apps.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5.13/struts-2.5.13-apps.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5.13/struts-2.5.13-apps.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5.13/struts-2.5.13-apps.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.5.13/struts-2.5.13-apps.zip.md5
==
--- dev/struts/2.5.13/struts-2.5.13-apps.zip.md5 (added)
+++ dev/struts/2.5.13/struts-2.5.13-apps.zip.md5 Wed Aug 23 12:56:43 2017
@@ -0,0 +1 @@
+af77c87a6749d4aca1b291b36d52ebfa
\ No newline at end of file

Added: dev/struts/2.5.13/struts-2.5.13-apps.zip.sha1
==
--- dev/struts/2.5.13/struts-2.5.13-apps.zip.sha1 (added)
+++ dev/struts/2.5.13/struts-2.5.13-apps.zip.sha1 Wed Aug 23 12:56:43 2017
@@ -0,0 +1 @@
+e8ec0dbb413157c3c8e962b16ae92011ffbc3391
\ No newline at end of file

Added: dev/struts/2.5.13/struts-2.5.13-docs.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5.13/struts-2.5.13-docs.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5.13/struts-2.5.13-docs.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5.13/struts-2.5.13-docs.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.5.13/struts-2.5.13-docs.zip.md5

[3/3] struts-site git commit: Updates production by Jenkins

[git-site-role]

Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/68ba32a9
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/68ba32a9
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/68ba32a9

Branch: refs/heads/asf-site
Commit: 68ba32a9e22191eac851b062e661f55013d6cb40
Parents: 732b46f
Author: jenkins 
Authored: Wed Aug 23 12:09:27 2017 +
Committer: jenkins 
Committed: Wed Aug 23 12:09:27 2017 +

--
 content/core-developers/default-properties.html |  84 +--
 content/core-developers/interceptors.html   | 102 +--
 content/core-developers/struts-default-xml.html |  87 ++--
 3 files changed, 82 insertions(+), 191 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/68ba32a9/content/core-developers/default-properties.html
--
diff --git a/content/core-developers/default-properties.html 
b/content/core-developers/default-properties.html
index c93b890..93c972d 100644
--- a/content/core-developers/default-properties.html
+++ b/content/core-developers/default-properties.html
@@ -139,89 +139,7 @@ on the classpath, but it is typically found under !DOCTYPE html
-!--
-
-Hello future GitHubber! I bet you're here to remove those nasty inline styles,
-DRY up these templates and make 'em nice and re-usable, right?
-
-Please, don't. https://github.com/styleguide/templates/2.0
-
---
-html
-  head
-meta http-equiv="Content-type" content="text/html; charset=utf-8"
-titleUnicorn! middot; GitHub/title
-style type="text/css" media="screen"
-  body {
-background-color: #f1f1f1;
-margin: 0;
-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  }
-
-  .container { margin: 50px auto 40px auto; width: 600px; text-align: 
center; }
-
-  a { color: #4183c4; text-decoration: none; }
-  a:hover { text-decoration: underline; }
-
-  h1 { letter-spacing: -1px; line-height: 60px; font-size: 60px; 
font-weight: 100; margin: 0px; text-shadow: 0 1px 0 #fff; }
-  p { color: rgba(0, 0, 0, 0.5); margin: 10px 0 10px; font-size: 18px; 
font-weight: 200; line-height: 1.6em;}
-
-  ul { list-style: none; margin: 25px 0; padding: 0; }
-  li { display: table-cell; font-weight: bold; width: 1%; }
-
-  .logo { display: inline-block; margin-top: 35px; }
-  .logo-img-2x { display: none; }
-  @media
-  only screen and (-webkit-min-device-pixel-ratio: 2),
-  only screen and (   min--moz-device-pixel-ratio: 2),
-  only screen and ( -o-min-device-pixel-ratio: 2/1),
-  only screen and (min-device-pixel-ratio: 2),
-  only screen and (min-resolution: 192dpi),
-  only screen and (min-resolution: 2dppx) {
-.logo-img-1x { display: none; }
-.logo-img-2x { display: inline-block; }
-  }
-
-  #suggestions {
-margin-top: 35px;
-color: #ccc;
-  }
-  #suggestions a {
-color: #66;
-font-weight: 200;
-font-size: 14px;
-margin: 0 10px;
-  }
-
-/style
-  /head
-  body
-
-div class="container"
-  p
-img width="200" src="data:image/png;base64,
-iVBORw0KGgoNSUhEUgAAAZGZCAMAAACQbpc2AAADAFBMVEWEBz6FAD6FAD6GAD+MAEGOAEOKAEGOAEOGAD+IAECOAEOOAUOOAEOOAEOOAEOOAEOOAEOOAEOCACyOAEQAAACKAEJpoJ2KADqu0eSKAD2BAD+KAD6AxCNqwoX1Ziawo9LYnGuwhL7aiwaIyYudst6DlrnhcWvCcVvlbE9PvsL2u3uYmdCZum9Rns7clUYsreOYp2nuj37kiZLUfqhvxafqfmrNWEjA22uz1Vu6lsiRAArWhLfgdoONnF36rWrzpz/ajy/LbqR8pdWDVXx8faN6m0+6hE3+1pmHP2mTy1b4k1p/ueFlj7vMfzyBs1v/2GfLpFL5rQD+7teQABj4n0/rpCz6r1Z8apP+4rrfw1iV0JyLUkqQACTDnah5AACtaEt9zcGNhleJbU5lsOFRvE5FuOPS4WLSt7+8ajvXcJpcyNvhztSwUkTGgZz9uDSxRnPZwsnTkqy7jpsPt/AxyvnAeJMAxPnMiqPJYIyzf4/KqrPedaK5bIsQwfTo2t72hUepPWvn6mO8VoXrgbDRaJXle6r75FzZm7S2TnyTNUXv5eiDAA6j0WmKyWv51liRAACjP0OZNVuwa4L+uQAcw/SiNGH57mIxxPKmU3DgpL2sX3rutc3/vh9gu1D3tNEAtvOSKVAmxfagRmbnrcWZJVaTJET2qsv84eyk04PzcEb71OX0u9OUzHD1nsR+1PhtwFUBvfQ5x/RizvdQy/VZzPWaz3b8uST+wFWDABqKAC6m03uGx2X+xGKBxmL2iWDQjb777/Nt0Pf+xmlCyPT+v032hVv+yXD3lGx2wlr99/hJyvX1gFV20vf1e1DCaqr6xdz+wlzJe7T2jmWFACT3i7v+0IP9u0R8xF7Oh7r+zHn/+WLHc7CQGUP3vtePEUT0i7qHADORIUyEAC2BAACf0Hr3j73zhLX7x96RGkrMgbePFEiRD
 

[1/3] struts-site git commit: Updates production by Jenkins

[git-site-role]

Repository: struts-site
Updated Branches:
  refs/heads/asf-site 732b46ff4 -> 68ba32a9e


http://git-wip-us.apache.org/repos/asf/struts-site/blob/68ba32a9/content/core-developers/struts-default-xml.html
--
diff --git a/content/core-developers/struts-default-xml.html 
b/content/core-developers/struts-default-xml.html
index 84ce408..15f0950 100644
--- a/content/core-developers/struts-default-xml.html
+++ b/content/core-developers/struts-default-xml.html
@@ -138,20 +138,87 @@ setting in struts.properties.
 
 The content of struts-default.xml is 
here:
 
-?xml version="1.0" 
encoding="utf-8"?
-!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";
+!DOCTYPE html
+!--
+
+Hello future GitHubber! I bet you're here to remove those nasty inline styles,
+DRY up these templates and make 'em nice and re-usable, right?
+
+Please, don't. https://github.com/styleguide/templates/2.0
+
+--
 html
   head
-title503 first byte timeout/title
+meta http-equiv="Content-type" content="text/html; charset=utf-8"
+titleUnicorn! middot; GitHub/title
+style type="text/css" media="screen"
+  body {
+background-color: #f1f1f1;
+margin: 0;
+font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  }
+
+  .container { margin: 50px auto 40px auto; width: 600px; text-align: 
center; }
+
+  a { color: #4183c4; text-decoration: none; }
+  a:hover { text-decoration: underline; }
+
+  h1 { letter-spacing: -1px; line-height: 60px; font-size: 60px; 
font-weight: 100; margin: 0px; text-shadow: 0 1px 0 #fff; }
+  p { color: rgba(0, 0, 0, 0.5); margin: 10px 0 10px; font-size: 18px; 
font-weight: 200; line-height: 1.6em;}
+
+  ul { list-style: none; margin: 25px 0; padding: 0; }
+  li { display: table-cell; font-weight: bold; width: 1%; }
+
+  .logo { display: inline-block; margin-top: 35px; }
+  .logo-img-2x { display: none; }
+  @media
+  only screen and (-webkit-min-device-pixel-ratio: 2),
+  only screen and (   min--moz-device-pixel-ratio: 2),
+  only screen and ( -o-min-device-pixel-ratio: 2/1),
+  only screen and (min-device-pixel-ratio: 2),
+  only screen and (min-resolution: 192dpi),
+  only screen and (min-resolution: 2dppx) {
+.logo-img-1x { display: none; }
+.logo-img-2x { display: inline-block; }
+  }
+
+  #suggestions {
+margin-top: 35px;
+color: #ccc;
+  }
+  #suggestions a {
+color: #66;
+font-weight: 200;
+font-size: 14px;
+margin: 0 10px;
+  }
+
+/style
   /head
   body
-h1Error 503 first byte timeout/h1
-pfirst byte timeout/p
-h3Guru Mediation:/h3
-pDetails: cache-sea1035-SEA 1503489851 
3487996858/p
-hr
-pVarnish cache server/p
+
+div class="container"
+  p
+img width="200" src="data:image/png;base64,
+iVBORw0KGgoNSUhEUgAAAZGZCAMAAACQbpc2AAADAFBMVEWEBz6FAD6FAD6GAD+MAEGOAEOKAEGOAEOGAD+IAECOAEOOAUOOAEOOAEOOAEOOAEOOAEOOAEOCACyOAEQAAACKAEJpoJ2KADqu0eSKAD2BAD+KAD6AxCNqwoX1Ziawo9LYnGuwhL7aiwaIyYudst6DlrnhcWvCcVvlbE9PvsL2u3uYmdCZum9Rns7clUYsreOYp2nuj37kiZLUfqhvxafqfmrNWEjA22uz1Vu6lsiRAArWhLfgdoONnF36rWrzpz/ajy/LbqR8pdWDVXx8faN6m0+6hE3+1pmHP2mTy1b4k1p/ueFlj7vMfzyBs1v/2GfLpFL5rQD+7teQABj4n0/rpCz6r1Z8apP+4rrfw1iV0JyLUkqQACTDnah5AACtaEt9zcGNhleJbU5lsOFRvE5FuOPS4WLSt7+8ajvXcJpcyNvhztSwUkTGgZz9uDSxRnPZwsnTkqy7jpsPt/AxyvnAeJMAxPnMiqPJYIyzf4/KqrPedaK5bIsQwfTo2t72hUepPWvn6mO8VoXrgbDRaJXle6r75FzZm7S2TnyTNUXv5eiDAA6j0WmKyWv51liRAACjP0OZNVuwa4L+uQAcw/SiNGH57mIxxPKmU3DgpL2sX3rutc3/vh9gu1D3tNEAtvOSKVAmxfagRmbnrcWZJVaTJET2qsv84eyk04PzcEb71OX0u9OUzHD1nsR+1PhtwFUBvfQ5x/RizvdQy/VZzPWaz3b8uST+wFWDABqKAC6m03uGx2X+xGKBxmL2iWDQjb777/Nt0Pf+xmlCyPT+v032hVv+yXD3lGx2wlr99/hJyvX1gFV20vf1e1DCaqr6xdz+wlzJe7T2jmWFACT3i7v+0IP9u0R8xF7Oh7r+zHn/+WLHc7CQGUP3vtePEUT0i7qHADORIUyEAC2BAACf0Hr3j73zhLX
 

[2/3] struts-site git commit: Updates production by Jenkins

[git-site-role]

http://git-wip-us.apache.org/repos/asf/struts-site/blob/68ba32a9/content/core-developers/interceptors.html
--
diff --git a/content/core-developers/interceptors.html 
b/content/core-developers/interceptors.html
index ee04394..5cf3a14 100644
--- a/content/core-developers/interceptors.html
+++ b/content/core-developers/interceptors.html
@@ -163,21 +163,9 @@ is pluggable, so you can decide exactly which features an 
Action needs to suppor
 the Interceptors bundled with the framework. Interceptors “set the stage” 
for the Action classes, doing much of 
 the “heavy lifting” before the Action executes.
 
-
-  
-
-  Action Lifecyle
-
-  
-  
-
-  
-
-
-   
-
-  
-
+Action Lifecyle
+
+
 
 In some cases, an Interceptor might keep an Action from firing, because of 
a double-submit or because validation failed. 
 Interceptors can also change the state of an Action before it executes.
@@ -235,89 +223,7 @@ than reiterate the same list of Interceptors, we can 
bundle these Interceptors t
 
 The Default Configuration
 
-!DOCTYPE html
-!--
-
-Hello future GitHubber! I bet you're here to remove those nasty inline styles,
-DRY up these templates and make 'em nice and re-usable, right?
-
-Please, don't. https://github.com/styleguide/templates/2.0
-
---
-html
-  head
-meta http-equiv="Content-type" content="text/html; charset=utf-8"
-titleUnicorn! middot; GitHub/title
-style type="text/css" media="screen"
-  body {
-background-color: #f1f1f1;
-margin: 0;
-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  }
-
-  .container { margin: 50px auto 40px auto; width: 600px; text-align: 
center; }
-
-  a { color: #4183c4; text-decoration: none; }
-  a:hover { text-decoration: underline; }
-
-  h1 { letter-spacing: -1px; line-height: 60px; font-size: 60px; 
font-weight: 100; margin: 0px; text-shadow: 0 1px 0 #fff; }
-  p { color: rgba(0, 0, 0, 0.5); margin: 10px 0 10px; font-size: 18px; 
font-weight: 200; line-height: 1.6em;}
-
-  ul { list-style: none; margin: 25px 0; padding: 0; }
-  li { display: table-cell; font-weight: bold; width: 1%; }
-
-  .logo { display: inline-block; margin-top: 35px; }
-  .logo-img-2x { display: none; }
-  @media
-  only screen and (-webkit-min-device-pixel-ratio: 2),
-  only screen and (   min--moz-device-pixel-ratio: 2),
-  only screen and ( -o-min-device-pixel-ratio: 2/1),
-  only screen and (min-device-pixel-ratio: 2),
-  only screen and (min-resolution: 192dpi),
-  only screen and (min-resolution: 2dppx) {
-.logo-img-1x { display: none; }
-.logo-img-2x { display: inline-block; }
-  }
-
-  #suggestions {
-margin-top: 35px;
-color: #ccc;
-  }
-  #suggestions a {
-color: #66;
-font-weight: 200;
-font-size: 14px;
-margin: 0 10px;
-  }
-
-/style
-  /head
-  body
-
-div class="container"
-  p
-img width="200" src="data:image/png;base64,
-iVBORw0KGgoNSUhEUgAAAZGZCAMAAACQbpc2AAADAFBMVEWEBz6FAD6FAD6GAD+MAEGOAEOKAEGOAEOGAD+IAECOAEOOAUOOAEOOAEOOAEOOAEOOAEOOAEOCACyOAEQAAACKAEJpoJ2KADqu0eSKAD2BAD+KAD6AxCNqwoX1Ziawo9LYnGuwhL7aiwaIyYudst6DlrnhcWvCcVvlbE9PvsL2u3uYmdCZum9Rns7clUYsreOYp2nuj37kiZLUfqhvxafqfmrNWEjA22uz1Vu6lsiRAArWhLfgdoONnF36rWrzpz/ajy/LbqR8pdWDVXx8faN6m0+6hE3+1pmHP2mTy1b4k1p/ueFlj7vMfzyBs1v/2GfLpFL5rQD+7teQABj4n0/rpCz6r1Z8apP+4rrfw1iV0JyLUkqQACTDnah5AACtaEt9zcGNhleJbU5lsOFRvE5FuOPS4WLSt7+8ajvXcJpcyNvhztSwUkTGgZz9uDSxRnPZwsnTkqy7jpsPt/AxyvnAeJMAxPnMiqPJYIyzf4/KqrPedaK5bIsQwfTo2t72hUepPWvn6mO8VoXrgbDRaJXle6r75FzZm7S2TnyTNUXv5eiDAA6j0WmKyWv51liRAACjP0OZNVuwa4L+uQAcw/SiNGH57mIxxPKmU3DgpL2sX3rutc3/vh9gu1D3tNEAtvOSKVAmxfagRmbnrcWZJVaTJET2qsv84eyk04PzcEb71OX0u9OUzHD1nsR+1PhtwFUBvfQ5x/RizvdQy/VZzPWaz3b8uST+wFWDABqKAC6m03uGx2X+xGKBxmL2iWDQjb777/Nt0Pf+xmlCyPT+v032hVv+yXD3lGx2wlr99/hJyvX1gFV20vf1e1DCaqr6xdz+wlzJe7T2jmWFACT3i7v+0IP9u0R8xF7Oh7r+zHn/+WLHc7CQGUP3vtePEUT0i7qHADORIUyEAC2BAACf0Hr3j73zhLX
 

struts-site git commit: Edits to kick redeploy

[lukaszlenart]

Repository: struts-site
Updated Branches:
  refs/heads/master 56dec0034 -> 116c7b012


Edits to kick redeploy


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/116c7b01
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/116c7b01
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/116c7b01

Branch: refs/heads/master
Commit: 116c7b012f573321bfe376df5e2b402bd40c32fd
Parents: 56dec00
Author: Lukasz Lenart 
Authored: Wed Aug 23 14:08:00 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 14:08:00 2017 +0200

--
 source/core-developers/interceptors.md | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/116c7b01/source/core-developers/interceptors.md
--
diff --git a/source/core-developers/interceptors.md 
b/source/core-developers/interceptors.md
index aaf5c64..64810c0 100644
--- a/source/core-developers/interceptors.md
+++ b/source/core-developers/interceptors.md
@@ -32,10 +32,9 @@ Interceptors can be configured on a per-action basis. Your 
own custom Intercepto
 the Interceptors bundled with the framework. Interceptors "set the stage" for 
the Action classes, doing much of 
 the "heavy lifting" before the Action executes.
 
-|Action Lifecyle|
-|---|
-|![overview.png](attachments/att1607_overview.png)
-|
+**Action Lifecyle**
+
+![overview.png](attachments/att1607_overview.png)
 
 In some cases, an Interceptor might keep an Action from firing, because of a 
double-submit or because validation failed. 
 Interceptors can also change the state of an Action before it executes.

[3/3] struts-site git commit: Updates production by Jenkins

[git-site-role]

Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/732b46ff
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/732b46ff
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/732b46ff

Branch: refs/heads/asf-site
Commit: 732b46ff46078c227813438ccf6da42a118bd955
Parents: 9476ddf
Author: jenkins 
Authored: Wed Aug 23 12:04:14 2017 +
Committer: jenkins 
Committed: Wed Aug 23 12:04:14 2017 +

--
 content/core-developers/default-properties.html | 307 +++
 content/core-developers/interceptors.html   | 506 +++
 content/core-developers/struts-default-xml.html | 413 +--
 3 files changed, 383 insertions(+), 843 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/732b46ff/content/core-developers/default-properties.html
--
diff --git a/content/core-developers/default-properties.html 
b/content/core-developers/default-properties.html
index ad14a3c..c93b890 100644
--- a/content/core-developers/default-properties.html
+++ b/content/core-developers/default-properties.html
@@ -139,230 +139,89 @@ on the classpath, but it is typically found under #
-# $Id$
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-### START SNIPPET: complete_file
-
-### Struts default properties
-###(can be overridden by a struts.properties file in the root of the classpath)
-###
-
-### This can be used to set your default locale and encoding scheme
-# struts.locale=en_US
-struts.i18n.encoding=UTF-8
-
-### if specified, the default object factory can be overridden here
-### Note: short-hand notation is supported in some cases, such as "spring"
-###   Alternatively, you can provide a 
com.opensymphony.xwork2.ObjectFactory subclass name here
-# struts.objectFactory = spring
-
-### specifies the autoWiring logic when using the SpringObjectFactory.
-### valid values are: name, type, auto, and constructor (name is the default)
-struts.objectFactory.spring.autoWire = name
-
-### indicates to the struts-spring integration if Class instances should be 
cached
-### this should, until a future Spring release makes it possible, be left as 
true
-### unless you know exactly what you are doing!
-### valid values are: true, false (true is the default)
-struts.objectFactory.spring.useClassCache = true
-
-### ensures the autowire strategy is always respected.
-### valid values are: true, false (false is the default)
-struts.objectFactory.spring.autoWire.alwaysRespect = false
-
-### By default SpringObjectFactory doesn't support AOP
-### This flag was added just temporally to check if nothing is broken
-### See https://issues.apache.org/jira/browse/WW-4110
-struts.objectFactory.spring.enableAopSupport = false
-
-### if specified, the default object type determiner can be overridden here
-### Note: short-hand notation is supported in some cases, such as "tiger" or 
"notiger"
-###   Alternatively, you can provide a 
com.opensymphony.xwork2.util.ObjectTypeDeterminer implementation name here
-### Note: By default, com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer 
is used which handles type detection
-###   using generics. 
com.opensymphony.xwork2.util.GenericsObjectTypeDeterminer was deprecated since 
XWork 2, it's
-###   functions are integrated in DefaultObjectTypeDeterminer now.
-###   To disable tiger support use the "notiger" property value here.
-#struts.objectTypeDeterminer = tiger
-#struts.objectTypeDeterminer = notiger
-
-### Parser to handle HTTP POST requests, encoded using the MIME-type 
multipart/form-data
-# struts.multipart.parser=cos
-# struts.multipart.parser=pell
-# struts.multipart.parser=jakarta-stream
-struts.multipart.parser=jakarta
-# uses javax.servlet.context.tempdir by default
-struts.multipart.saveDir=
-struts.multipart.maxSize=2097152
-
-### Load custom property files (does not override struts.properties!)
-# 

[1/3] struts-site git commit: Updates production by Jenkins

[git-site-role]

Repository: struts-site
Updated Branches:
  refs/heads/asf-site 9476ddfa1 -> 732b46ff4


http://git-wip-us.apache.org/repos/asf/struts-site/blob/732b46ff/content/core-developers/struts-default-xml.html
--
diff --git a/content/core-developers/struts-default-xml.html 
b/content/core-developers/struts-default-xml.html
index 30ad6c1..84ce408 100644
--- a/content/core-developers/struts-default-xml.html
+++ b/content/core-developers/struts-default-xml.html
@@ -138,403 +138,22 @@ setting in struts.properties.
 
 The content of struts-default.xml is 
here:
 
-?xml version="1.0" encoding="UTF-8" 
?
-!--
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
---
-
-!--
-When declaring beans in this file you must either use name="struts" or 
don't name the bean at all.
-
-The name="struts" must be used when alias was defined in {@link 
org.apache.struts2.config.DefaultBeanSelectionProvider} -
-it is then the default bean's name and {@link 
org.apache.struts2.config.DefaultBeanSelectionProvider} links name "struts"
-with "default" (aliasing it)
-
-If name won't be defined then the "default" value will be used {@link 
com.opensymphony.xwork2.inject.Container#DEFAULT_NAME}
-and {@link com.opensymphony.xwork2.inject.Inject}
---
-!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-"http://struts.apache.org/dtds/struts-2.5.dtd";
-
-struts
-
-constant name="struts.excludedClasses"
-  value="
-java.lang.Object,
-java.lang.Runtime,
-java.lang.System,
-java.lang.Class,
-java.lang.ClassLoader,
-java.lang.Shutdown,
-java.lang.ProcessBuilder,
-ognl.OgnlContext,
-ognl.ClassResolver,
-ognl.TypeConverter,
-ognl.MemberAccess,
-ognl.DefaultMemberAccess,
-com.opensymphony.xwork2.ognl.SecurityMemberAccess,
-com.opensymphony.xwork2.ActionContext" /
-
-!-- this must be valid regex, each '.' in package name 
must be escaped! --
-!-- it's more flexible but slower than simple string 
comparison --
-!-- constant name="struts.excludedPackageNamePatterns" 
value="^java\.lang\..*,^ognl.*,^(?!javax\.servlet\..+)(javax\..+)" / 
--
-
-!-- this is simpler version of the above used with 
string comparison --
-constant name="struts.excludedPackageNames"
-  value="
-java.lang.,
-ognl.,
-javax,
-freemarker.core.,
-freemarker.template.,
-freemarker.ext.rhino.,
-freemarker.ext.beans.,
-sun.reflect.,
-javassist." /
-
-bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/
-bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts" class="org.apache.struts2.factory.StrutsResultFactory" /
-bean type="com.opensymphony.xwork2.factory.ActionFactory" name="struts" class="com.opensymphony.xwork2.factory.DefaultActionFactory" /
-bean type="com.opensymphony.xwork2.factory.ConverterFactory" name="struts" class="com.opensymphony.xwork2.factory.DefaultConverterFactory" 
/
-bean type="com.opensymphony.xwork2.factory.InterceptorFactory" name="struts" class="com.opensymphony.xwork2.factory.DefaultInterceptorFactory" 
/
-bean type="com.opensymphony.xwork2.factory.ValidatorFactory" name="struts" class="com.opensymphony.xwork2.factory.DefaultValidatorFactory" 
/
-bean type="com.opensymphony.xwork2.factory.UnknownHandlerFactory" name="struts" class="com.opensymphony.xwork2.factory.DefaultUnknownHandlerFactory" 
/
-
-bean type="com.opensymphony.xwork2.FileManager" class="com.opensymphony.xwork2.util.fs.DefaultFileManager" name="system" scope="singleton"/
-bean type="com.opensymphony.xwork2.FileManagerFactory" class="com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory" 
name="struts" scope="singleton"/
-
-bean type="com.opensymphony.xwork2.ActionProxyFactory" name="struts" 

struts-site git commit: Updates production by Jenkins

[git-site-role]

Repository: struts-site
Updated Branches:
  refs/heads/asf-site 64baebde5 -> 9476ddfa1


Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/9476ddfa
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/9476ddfa
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/9476ddfa

Branch: refs/heads/asf-site
Commit: 9476ddfa1c63c74e4a64bf261e070a8b3732ecff
Parents: 64baebd
Author: jenkins 
Authored: Wed Aug 23 11:50:37 2017 +
Committer: jenkins 
Committed: Wed Aug 23 11:50:37 2017 +

--
 content/plugins/junit/index.html | 228 +-
 1 file changed, 143 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/9476ddfa/content/plugins/junit/index.html
--
diff --git a/content/plugins/junit/index.html b/content/plugins/junit/index.html
index 3e9d003..0ce6844 100644
--- a/content/plugins/junit/index.html
+++ b/content/plugins/junit/index.html
@@ -143,82 +143,89 @@ be tested.
 an action:
 
 
-  Mapping:
-```xml
+  Mapping:
 
-
-
-
-
-/template.ftl
-
-
-
-- Action:
-```java  
-public class TestAction extends ActionSupport {
-private String name;
-
-public String getName() {
-return name;
-}
 
-public void setName(String name) {
-this.name = name;
-}
-}
+struts
+constant name="struts.objectFactory" value="spring"/
+package name="test" namespace="/test" extends="struts-default"
+action name="testAction" class="org.apache.struts2.TestAction"
+result type="freemarker"/template.ftl/result
+/action
+/package
+/struts
+
+
+
+
+  Action:
+
+
+public class TestAction extends ActionSupport {
+private String name;
+
+public String getName() {
+return name;
+}
+
+public void setName(String 
name) {
+this.name = name;
+}
+}
 
 
+
 
-  JUnit:
-```java
-package org.apache.struts2;
+  JUnit:
 
 
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-
-import java.util.HashMap;
-import java.io.UnsupportedEncodingException;
-
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.Action;
-
-import javax.servlet.ServletException;
-
-public class StrutsTestCaseTest extends StrutsTestCase {
-public void testGetActionMapping() {
-ActionMapping mapping = 
getActionMapping(“/test/testAction.action”);
-assertNotNull(mapping);
-assertEquals(“/test”, mapping.getNamespace());
-assertEquals(“testAction”, mapping.getName());
-}
-
-public void 
testGetActionProxy() throws Exception {
-//set parameters before calling getActionProxy
-request.setParameter("name", "FD");
-
-ActionProxy proxy = getActionProxy("/test/testAction.action");
-assertNotNull(proxy);
-
-TestAction action = (TestAction) proxy.getAction();
-assertNotNull(action);
-
-String result = proxy.execute();
-assertEquals(Action.SUCCESS, result);
-assertEquals("FD", action.getName());
-}
-
-public void testExecuteAction() throws ServletException, 
UnsupportedEncodingException {
-String output = executeAction("/test/testAction.action");
-assertEquals("Hello", output);
-}
-
-public void testGetValueFromStack() throws ServletException, 
UnsupportedEncodingException {
-request.setParameter("name", "FD");
-executeAction("/test/testAction.action");
-String name = (String) findValueAfterExecute("name");
-assertEquals("FD", name);
-} } ```
+package org.apache.struts2;
+
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+
+import java.util.HashMap;
+import java.io.UnsupportedEncodingException;
+
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.Action;
+
+import javax.servlet.ServletException;
+
+public class StrutsTestCaseTest extends StrutsTestCase {
+public void testGetActionMapping() {
+ActionMapping mapping 
= getActionMapping("/test/testAction.action");
+assertNotNull(mapping);
+assertEquals("/test", mapping.getNamespace());
+assertEquals("testAction", mapping.getName());
+}
+
+public void testGetActionProxy() throws Exception {
+//set parameters before calling getActionProxy
+request.setParameter("name", "FD");
+
+ActionProxy proxy = getActionProxy("/test/testAction.action");
+assertNotNull(proxy);
+
+TestAction action = (TestAction) proxy.getAction();
+assertNotNull(action);
+
+String result = proxy.execute();
+assertEquals(Action.SUCCESS, result);
+assertEquals("FD", action.getName());
+}
+
+public 

struts-site git commit: Adds empty lines to fix formatting

[lukaszlenart]

Repository: struts-site
Updated Branches:
  refs/heads/master 0a61c9a60 -> 87fffce30


Adds empty lines to fix formatting


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/87fffce3
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/87fffce3
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/87fffce3

Branch: refs/heads/master
Commit: 87fffce30859e2abc94f64882e930a989d151617
Parents: 0a61c9a
Author: Lukasz Lenart 
Authored: Wed Aug 23 13:50:09 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 13:50:09 2017 +0200

--
 source/plugins/junit/index.md | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/87fffce3/source/plugins/junit/index.md
--
diff --git a/source/plugins/junit/index.md b/source/plugins/junit/index.md
index fdf388d..e115609 100644
--- a/source/plugins/junit/index.md
+++ b/source/plugins/junit/index.md
@@ -19,6 +19,7 @@ To test actions that do not use Spring, extend 
`StrutsTestCase`. The following e
 an action:
  
 - Mapping:
+
 ```xml
 
 
@@ -29,7 +30,9 @@ an action:
 
 
 ```
+
 - Action:
+
 ```java  
 public class TestAction extends ActionSupport {
 private String name;
@@ -43,7 +46,9 @@ public class TestAction extends ActionSupport {
 }
 }
 ```
+
 - JUnit:
+
 ```java
 package org.apache.struts2;
 
@@ -103,6 +108,7 @@ the classpath and outside the container.
 There are several utility methods and mock objects defined in StrutsTestCase 
which can be used to facilitate the testing:
 
 - Methods:
+
 |Method Name|Description|
 |---|---|
 |executeAction(String)|Pass the url for the action, and it will return the 
output of the action. This output **is not** the action result, like "success", 
but what would be written to the result stream. To use this the actions must be 
using a result type that can be read from the classpath, like FreeMarker, 
velocity, etc (if you are using the experimental Embedded JSP Plugin, you can 
use JSPs also)|
@@ -112,7 +118,9 @@ There are several utility methods and mock objects defined 
in StrutsTestCase whi
 |findValueAfterExecute(String)|Finds an object in the value stack, after an 
action has been executed|
 |applyAdditionalParams(ActionContext)|Can be overwritten in subclass to 
provide additional params and settings used during action invocation|
 |createAction(Class)|Can be used to instantiate an action which requires 
framework's dependencies to be injected (e.g. extending ActionSupport requires 
inject some internal dependencies)|
+
 - Fields:
+
 |Field|Description|
 |-|---|
 |MockHttpServletRequest request|The request that will be passed to Struts. 
Make sure to set parameters in this object before calling methods like 
getActionProxy|

struts-site git commit: Updates production by Jenkins

[git-site-role]

Repository: struts-site
Updated Branches:
  refs/heads/asf-site 6775f9c62 -> 64baebde5


Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/64baebde
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/64baebde
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/64baebde

Branch: refs/heads/asf-site
Commit: 64baebde56594db4273c0892eb2385f196f8ecdb
Parents: 6775f9c
Author: jenkins 
Authored: Wed Aug 23 11:48:36 2017 +
Committer: jenkins 
Committed: Wed Aug 23 11:48:36 2017 +

--
 content/plugins/junit/index.html | 63 +--
 1 file changed, 30 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/64baebde/content/plugins/junit/index.html
--
diff --git a/content/plugins/junit/index.html b/content/plugins/junit/index.html
index 2e350c0..3e9d003 100644
--- a/content/plugins/junit/index.html
+++ b/content/plugins/junit/index.html
@@ -144,8 +144,9 @@ an action:
 
 
   Mapping:
-```xml
-
+```xml
+
+
 
 
 
@@ -153,40 +154,38 @@ an action:
 
 
 
-```
-  
-  
-Action:
-```java
+- Action:
+```java  
 public class TestAction extends ActionSupport {
-private String name;
+private String name;
+
+public String getName() {
+return name;
+}
 
-public String 
getName() {
-return name;
+public void setName(String name) {
+this.name = name;
+}
 }
-  
-public void setName(String name) {
-this.name = name;
-} } ```
 
-
-  
-  
-JUnit:
+
+
+  JUnit:
 ```java
-package org.apache.struts2;
+package org.apache.struts2;
+
 
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
 
-import java.util.HashMap;
+import java.util.HashMap;
 import java.io.UnsupportedEncodingException;
 
-import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ActionProxy;
 import com.opensymphony.xwork2.Action;
 
-import javax.servlet.ServletException;
+import javax.servlet.ServletException;
 
-public class StrutsTestCaseTest extends StrutsTestCase {
+public class StrutsTestCaseTest extends StrutsTestCase {
 public void testGetActionMapping() {
 ActionMapping mapping = 
getActionMapping(“/test/testAction.action”);
 assertNotNull(mapping);
@@ -194,26 +193,26 @@ import com.opensymphony.xwork2.Action;
 assertEquals(“testAction”, mapping.getName());
 }
 
-public void 
testGetActionProxy() throws Exception {
+public void 
testGetActionProxy() throws Exception {
 //set parameters before calling getActionProxy
 request.setParameter("name", "FD");
-  
+
 ActionProxy proxy = getActionProxy("/test/testAction.action");
 assertNotNull(proxy);
-  
+
 TestAction action = (TestAction) proxy.getAction();
 assertNotNull(action);
-  
+
 String result = proxy.execute();
 assertEquals(Action.SUCCESS, result);
 assertEquals("FD", action.getName());
 }
-  
+
 public void testExecuteAction() throws ServletException, 
UnsupportedEncodingException {
 String output = executeAction("/test/testAction.action");
 assertEquals("Hello", output);
 }
-  
+
 public void testGetValueFromStack() throws ServletException, 
UnsupportedEncodingException {
 request.setParameter("name", "FD");
 executeAction("/test/testAction.action");
@@ -221,9 +220,7 @@ public void testGetValueFromStack() throws 
ServletException, UnsupportedEncoding
 assertEquals("FD", name);
 } } ```
 
-
-  
-
+
 
 The template
 

struts-site git commit: Fixes section formatting

[lukaszlenart]

Repository: struts-site
Updated Branches:
  refs/heads/master a350d0800 -> 0a61c9a60


Fixes section formatting


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/0a61c9a6
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/0a61c9a6
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/0a61c9a6

Branch: refs/heads/master
Commit: 0a61c9a6092ed3acae0fce3a236f7e707bbb9f1e
Parents: a350d08
Author: Lukasz Lenart 
Authored: Wed Aug 23 13:47:53 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 13:47:53 2017 +0200

--
 source/plugins/junit/index.md | 172 ++---
 1 file changed, 86 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/0a61c9a6/source/plugins/junit/index.md
--
diff --git a/source/plugins/junit/index.md b/source/plugins/junit/index.md
index d3841b6..fdf388d 100644
--- a/source/plugins/junit/index.md
+++ b/source/plugins/junit/index.md
@@ -19,80 +19,80 @@ To test actions that do not use Spring, extend 
`StrutsTestCase`. The following e
 an action:
  
 - Mapping:
-  ```xml
-  
-  
-  
-  
-  /template.ftl
-  
-  
-  
-  ```
+```xml
+
+
+
+
+/template.ftl
+
+
+
+```
 - Action:
-  ```java  
-  public class TestAction extends ActionSupport {
-  private String name;
-  
-  public String getName() {
-  return name;
-  }
-  
-  public void setName(String name) {
-  this.name = name;
-  }
-  }
-  ```
+```java  
+public class TestAction extends ActionSupport {
+private String name;
+
+public String getName() {
+return name;
+}
+
+public void setName(String name) {
+this.name = name;
+}
+}
+```
 - JUnit:
-  ```java
-  package org.apache.struts2;
-  
-  import org.apache.struts2.dispatcher.mapper.ActionMapping;
-  
-  import java.util.HashMap;
-  import java.io.UnsupportedEncodingException;
-  
-  import com.opensymphony.xwork2.ActionProxy;
-  import com.opensymphony.xwork2.Action;
-  
-  import javax.servlet.ServletException;
-  
-  public class StrutsTestCaseTest extends StrutsTestCase {
-  public void testGetActionMapping() {
-  ActionMapping mapping = getActionMapping("/test/testAction.action");
-  assertNotNull(mapping);
-  assertEquals("/test", mapping.getNamespace());
-  assertEquals("testAction", mapping.getName());
-  }
-  
-  public void testGetActionProxy() throws Exception {
-  //set parameters before calling getActionProxy
-  request.setParameter("name", "FD");
-  
-  ActionProxy proxy = getActionProxy("/test/testAction.action");
-  assertNotNull(proxy);
-  
-  TestAction action = (TestAction) proxy.getAction();
-  assertNotNull(action);
-  
-  String result = proxy.execute();
-  assertEquals(Action.SUCCESS, result);
-  assertEquals("FD", action.getName());
-  }
-  
-  public void testExecuteAction() throws ServletException, 
UnsupportedEncodingException {
-  String output = executeAction("/test/testAction.action");
-  assertEquals("Hello", output);
-  }
-  
-  public void testGetValueFromStack() throws ServletException, 
UnsupportedEncodingException {
-  request.setParameter("name", "FD");
-  executeAction("/test/testAction.action");
-  String name = (String) findValueAfterExecute("name");
-  assertEquals("FD", name);
-  }
-  }
-  ```
+```java
+package org.apache.struts2;
+
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+
+import java.util.HashMap;
+import java.io.UnsupportedEncodingException;
+
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.Action;
+
+import javax.servlet.ServletException;
+
+public class StrutsTestCaseTest extends StrutsTestCase {
+public void testGetActionMapping() {
+ActionMapping mapping = getActionMapping("/test/testAction.action");
+assertNotNull(mapping);
+assertEquals("/test", mapping.getNamespace());
+assertEquals("testAction", mapping.getName());
+}
+
+public void testGetActionProxy() throws Exception {
+//set parameters before calling getActionProxy
+request.setParameter("name", "FD");
+
+ActionProxy proxy = getActionProxy("/test/testAction.action");
+assertNotNull(proxy);
+
+TestAction action = (TestAction) proxy.getAction();
+assertNotNull(action);
+
+String result = proxy.execute();
+assertEquals(Action.SUCCESS, result);
+assertEquals("FD", 

struts-site git commit: Updates production by Jenkins

[git-site-role]

Repository: struts-site
Updated Branches:
  refs/heads/asf-site e8baeb931 -> 6775f9c62


Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/6775f9c6
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/6775f9c6
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/6775f9c6

Branch: refs/heads/asf-site
Commit: 6775f9c6231b9f5af19337b7ab084a7dfbf4fec7
Parents: e8baeb9
Author: jenkins 
Authored: Wed Aug 23 11:46:12 2017 +
Committer: jenkins 
Committed: Wed Aug 23 11:46:12 2017 +

--
 content/plugins/convention/index.html | 2 +-
 content/plugins/junit/index.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/6775f9c6/content/plugins/convention/index.html
--
diff --git a/content/plugins/convention/index.html 
b/content/plugins/convention/index.html
index e1c7631..0d1bf0b 100644
--- a/content/plugins/convention/index.html
+++ b/content/plugins/convention/index.html
@@ -124,7 +124,7 @@
 
   
 << back to Plugins
-[Edit on 
GitHub](https://github.com/apache/struts-site/edit/master/source/plugins/convention/index.md){:
 .edit-on-gh title="Edit this page on GitHub"}
+https://github.com/apache/struts-site/edit/master/source/plugins/convention/index.md;
 title="Edit this page on GitHub">Edit on GitHub
 Convention Plugin
 
 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/6775f9c6/content/plugins/junit/index.html
--
diff --git a/content/plugins/junit/index.html b/content/plugins/junit/index.html
index b0fd087..2e350c0 100644
--- a/content/plugins/junit/index.html
+++ b/content/plugins/junit/index.html
@@ -124,7 +124,7 @@
 
   
 << back to Plugins
-[Edit on 
GitHub](https://github.com/apache/struts-site/edit/master/source/plugins/junit/index.md){:
 .edit-on-gh title="Edit this page on GitHub"}
+https://github.com/apache/struts-site/edit/master/source/plugins/junit/index.md;
 title="Edit this page on GitHub">Edit on GitHub
 JUnit plugin
 
 

struts-site git commit: Fixes wrong link to edit page on GH

[lukaszlenart]

Repository: struts-site
Updated Branches:
  refs/heads/master 5041eb302 -> a350d0800


Fixes wrong link to edit page on GH


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/a350d080
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/a350d080
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/a350d080

Branch: refs/heads/master
Commit: a350d08005fc17d80b20c6f52d10fef380987142
Parents: 5041eb3
Author: Lukasz Lenart 
Authored: Wed Aug 23 13:45:43 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 13:45:43 2017 +0200

--
 source/_layouts/plugin.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/a350d080/source/_layouts/plugin.html
--
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
index 1c15ec6..c9b3e60 100644
--- a/source/_layouts/plugin.html
+++ b/source/_layouts/plugin.html
@@ -26,7 +26,7 @@
 
   
 << back to Plugins
-[Edit on GitHub]({{ site.repository_url }}/edit/master/source/{{ page.path 
}}){: .edit-on-gh title="Edit this page on GitHub"}
+Edit on 
GitHub
 {{ content }}
   
 

[2/4] struts-site git commit: Updates production by Jenkins

[git-site-role]

Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/d572a9ef
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/d572a9ef
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/d572a9ef

Branch: refs/heads/asf-site
Commit: d572a9efb2bfecf432c32c7496900c5c52fba9d3
Parents: 339b701
Author: jenkins 
Authored: Mon Jul 31 11:41:14 2017 +
Committer: jenkins 
Committed: Mon Jul 31 11:41:14 2017 +

--
 content/announce-2008.html|  320 +++
 content/announce-2009.html|  114 +--
 content/announce-2010.html|  202 ++---
 content/announce-2012.html|  562 ++--
 content/css/maven-base.css|  284 +++---
 content/css/maven-classic.css | 1732 ++--
 content/css/maven-theme.css   |  164 ++--
 content/css/print.css |   14 +-
 content/dtds/struts-2.1.7.dtd |  298 +++
 content/dtds/struts-2.1.dtd   |  292 +++---
 content/img/download-icon.svg |   20 +-
 content/img/primer-icon.svg   |   24 +-
 content/img/struts-logo.svg   |   70 +-
 content/planetstruts.txt  |   60 +-
 content/robots.txt|2 +-
 15 files changed, 2079 insertions(+), 2079 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/d572a9ef/content/announce-2008.html
--
diff --git a/content/announce-2008.html b/content/announce-2008.html
index 0392452..d3a770e 100644
--- a/content/announce-2008.html
+++ b/content/announce-2008.html
@@ -123,166 +123,166 @@
 
 
   
-Announcements - 2008
-
-
-  Skip to: Announcements - 2007
-
-
-04 December 2008 - Struts 1.3.10 General Availability 
Release
-
-  The Apache Struts group is pleased to announce that Struts 1.3.10
-  is available as a "General Availability" release. The GA designation is
-  our highest quality grade.
-
-
-  Struts 1.3.10 is available in a full distribution, or as separate
-  library, source, example and documentation distributions.
-
-
-  http://struts.apache.org/download.cgi#struts1310;>
-http://struts.apache.org/download.cgi#struts1310
-
-
-  It is also available in the central Maven repository under Group ID
-  "org.apache.struts".
-
-
-24 November 2008 - Struts 2.0.14 General Availability 
Release
-
-  The Apache Struts group is pleased to announce that Struts 2.0.14 is
-  available as a "General Availability" release. The GA designation is
-  our highest quality grade.
-
-
-  Apache Struts 2 is an elegant, extensible framework for creating
-  enterprise-ready Java web applications. The framework is designed to
-  streamline the full development cycle, from building, to deploying, to
-  maintaining applications over time.
-
-
-  This release is a bugfix release for version 2.0.12, which provided important
-  security fixes.
-  Struts 2.0.14 addresses two major bugs introduced with these security fixes,
-  keeping the FilterDispatcher from serving built in static resources,
-  and keeping conversion error messages from being displayed.
-
-
-  All developers are strongly encouraged to update existing Struts 2 
applications
-  to Struts 2.0.14.
-
-
-  Struts 2.0.14 is available in a full distribution,
-  or as separate library, source, example and documentation
-  distributions, from the
-  http://struts.apache.org/download.cgi#struts2014;>releases page.
-  The release is also available through the central Maven repository under 
Group ID
-  "org.apache.struts". The
-  http://struts.apache.org/2.0.14/docs/release-notes-2014.html;>release 
notes
-  are available online.
-
-
-  The 2.0.x series of the Apache Struts framework has a minimum
-  requirement of the following specification versions: Servlet API 2.4,
-  JSP API 2.0, Java 5, Backported Java 4 JARs are also available.
-
-
-  Should any issues arise with your use of any version of the Struts
-  framework, please post your comments to the user list, and, if
-  appropriate, file a
-  https://issues.apache.org/struts/secure/Dashboard.jspa;>tracking 
ticket.
-
-
-
-20 October 2008 - Struts 2.0.12 General Availability 
Release
-
-  The Apache Struts group is pleased to announce that Struts 2.0.12 is
-  available as a "General Availability" release. The GA designation is
-  our highest quality grade.
-
-
-  Apache Struts 2 is an elegant, extensible framework for creating
-  enterprise-ready Java web applications. The framework is designed to
-  streamline the full development cycle, from building, to deploying, to
-  maintaining applications over time.
-
-
-  This release includes a number of bug fixes since the
-  2.0.11.2 GA release, including important security fixes regarding remote
-  server context manipulation by injecting OGNL expressions in request 
parameters

[4/4] struts-site git commit: Updates production by Jenkins

[git-site-role]

Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/e8baeb93
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/e8baeb93
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/e8baeb93

Branch: refs/heads/asf-site
Commit: e8baeb931e48f7cd360160b6923af48d534886f4
Parents: c4f3bdc
Author: jenkins 
Authored: Wed Aug 23 11:43:40 2017 +
Committer: jenkins 
Committed: Wed Aug 23 11:43:40 2017 +

--
 content/core-developers/index.html|   2 +-
 content/plugins/convention/index.html |   3 +-
 content/plugins/index.html|   1 +
 content/plugins/junit/index.html  | 327 +
 4 files changed, 330 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/e8baeb93/content/core-developers/index.html
--
diff --git a/content/core-developers/index.html 
b/content/core-developers/index.html
index f8a2c41..20ab91c 100644
--- a/content/core-developers/index.html
+++ b/content/core-developers/index.html
@@ -164,7 +164,7 @@ Each may be configured via XML or annotations.
   Application Servers
   Performance Tuning
   Security
-  [Testing Actions] - export 
https://cwiki.apache.org/confluence/display/WW/Testing+Actions
+  Testing Actions
 
   https://depressedprogrammer.wordpress.com/2007/06/18/unit-testing-struts-2-actions-spring-junit/;>(arsenalist)
   http://fassisrosa.blogspot.com/2006/11/unit-testing-struts-20\.html;>(rosa)

http://git-wip-us.apache.org/repos/asf/struts-site/blob/e8baeb93/content/plugins/convention/index.html
--
diff --git a/content/plugins/convention/index.html 
b/content/plugins/convention/index.html
index d3dff08..e1c7631 100644
--- a/content/plugins/convention/index.html
+++ b/content/plugins/convention/index.html
@@ -124,10 +124,9 @@
 
   
 << back to Plugins
+[Edit on 
GitHub](https://github.com/apache/struts-site/edit/master/source/plugins/convention/index.md){:
 .edit-on-gh title="Edit this page on GitHub"}
 Convention Plugin
 
-https://github.com/apache/struts-site/edit/master/source/plugins/convention/index.md;
 class="edit-on-gh" title="Edit this page on GitHub">Edit on GitHub
-
 
   Introduction
   Setup

http://git-wip-us.apache.org/repos/asf/struts-site/blob/e8baeb93/content/plugins/index.html
--
diff --git a/content/plugins/index.html b/content/plugins/index.html
index e7e8d1d..4872474 100644
--- a/content/plugins/index.html
+++ b/content/plugins/index.html
@@ -127,6 +127,7 @@
 
 
   Convention plugin
+  JUnit plugin
 
 
 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/e8baeb93/content/plugins/junit/index.html
--
diff --git a/content/plugins/junit/index.html b/content/plugins/junit/index.html
new file mode 100644
index 000..b0fd087
--- /dev/null
+++ b/content/plugins/junit/index.html
@@ -0,0 +1,327 @@
+
+
+
+  
+  
+  
+  
+  
+
+  Convention plugin
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+
+
+
+http://github.com/apache/struts; class="github-ribbon">
+  https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa.png; 
alt="Fork me on GitHub">
+
+
+
+  
+
+  
+
+  
+Menu
+Toggle navigation
+
+
+
+  
+  
+
+
+  
+
+  
+Home
+  
+  
+Welcome
+Downloads
+Announcements
+http://www.apache.org/licenses/;>License
+http://apache.org/foundation/thanks.html;>Thanks!
+http://apache.org/foundation/sponsorship.html;>Sponsorship
+  
+
+
+  
+Support
+  
+  
+User Mailing List
+https://issues.apache.org/jira/browse/WW;>Issue 
Tracker
+Reporting Security Issues
+
+Project info
+Struts 
Core dependencies
+Plugin 
dependencies
+  
+
+
+  
+Documentation
+  
+  
+Birds Eye
+Key Technologies
+Kickstart FAQ
+https://cwiki.apache.org/confluence/display/WW/Home;>Wiki
+
+Getting Started
+Security Guide
+Tutorials
+FAQs
+   

[3/4] struts-site git commit: Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/struts-site into asf-site

[git-site-role]

Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/struts-site 
into asf-site


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/c4f3bdcf
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/c4f3bdcf
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/c4f3bdcf

Branch: refs/heads/asf-site
Commit: c4f3bdcfa9d19003da0b7e01dbc2235b8148b981
Parents: d572a9e 4a447d6
Author: jenkins 
Authored: Wed Aug 23 11:43:39 2017 +
Committer: jenkins 
Committed: Wed Aug 23 11:43:39 2017 +

--
 .gitignore  |   1 +
 content/announce.html   |  11 +
 ...ing-application-session-request-objects.html |   1 +
 content/core-developers/action-chaining.html|   1 +
 .../core-developers/action-configuration.html   |   1 +
 .../core-developers/action-event-listener.html  |   1 +
 .../action-mapper-and-action-mapping.html   |   1 +
 content/core-developers/action-mapper.html  |   1 +
 .../action-proxy-and-actionproxy-factory.html   |   1 +
 content/core-developers/after-annotation.html   |   1 +
 .../ajax-client-side-validation.html|   1 +
 content/core-developers/ajax.html   |   1 +
 content/core-developers/alias-interceptor.html  |   1 +
 .../annotation-workflow-interceptor.html|   1 +
 content/core-developers/annotations.html|   1 +
 .../core-developers/application-servers.html|  48 +-
 content/core-developers/basic-validation.html   |   1 +
 content/core-developers/bean-configuration.html |   1 +
 content/core-developers/before-annotation.html  |   1 +
 .../before-result-annotation.html   |   1 +
 content/core-developers/chain-result.html   |   1 +
 .../core-developers/chaining-interceptor.html   |   1 +
 .../core-developers/checkbox-interceptor.html   |   1 +
 .../core-developers/client-side-validation.html |   1 +
 content/core-developers/client-validation.html  |   1 +
 .../conditionalvisitor-validator.html   |   1 +
 .../core-developers/configuration-elements.html |   1 +
 .../core-developers/configuration-files.html|  52 +--
 ...onfiguration-provider-and-configuration.html |   1 +
 .../core-developers/constant-configuration.html |   1 +
 .../core-developers/conversion-annotation.html  |   1 +
 ...ersion-error-field-validator-annotation.html |   1 +
 .../conversion-error-interceptor.html   |   1 +
 .../core-developers/conversion-validator.html   |   1 +
 content/core-developers/cookie-interceptor.html |   1 +
 .../cookie-provider-interceptor.html|   1 +
 .../create-if-null-annotation.html  |   1 +
 .../create-session-interceptor.html |   1 +
 .../custom-validator-annotation.html|   1 +
 .../date-range-field-validator-annotation.html  |   1 +
 content/core-developers/date-validator.html |   1 +
 .../core-developers/debugging-interceptor.html  |   1 +
 content/core-developers/debugging.html  |   1 +
 content/core-developers/default-properties.html | 422 +
 .../default-workflow-interceptor.html   |   1 +
 .../core-developers/dependency-injection.html   |   1 +
 content/core-developers/development-mode.html   |   1 +
 .../core-developers/dispatcher-listener.html|   1 +
 content/core-developers/dispatcher-result.html  |   1 +
 content/core-developers/dispatcher.html |  36 +-
 ...double-range-field-validator-annotation.html |   1 +
 content/core-developers/double-validator.html   |   1 +
 content/core-developers/element-annotation.html |   1 +
 .../email-validator-annotation.html |   1 +
 content/core-developers/email-validator.html|   1 +
 .../exception-configuration.html| 322 +
 .../core-developers/exception-interceptor.html  |   1 +
 .../execute-and-wait-interceptor.html   |   1 +
 .../expression-validator-annotation.html|   1 +
 .../core-developers/expression-validator.html   |   1 +
 .../field-expression-validator-annotation.html  |   1 +
 .../fieldexpression-validator.html  |   1 +
 .../file-upload-interceptor.html|   1 +
 content/core-developers/file-upload.html|   1 +
 .../formatting-dates-and-numbers.html   |   1 +
 content/core-developers/freemarker-result.html  |   1 +
 content/core-developers/freemarker-support.html |   1 +
 content/core-developers/glassfish-2-x.html  |   1 +
 content/core-developers/httpheader-result.html  |   1 +
 .../core-developers/https-and-ie-issues.html|   1 +
 content/core-developers/i18n-interceptor.html   |   1 +
 .../core-developers/include-configuration.html  |  30 +-
 content/core-developers/index.html  |   4 +-
 .../input-config-annotation.html|   1 +
 

[1/4] struts-site git commit: Updates production by Jenkins

[git-site-role]

Repository: struts-site
Updated Branches:
  refs/heads/asf-site 4a447d6de -> e8baeb931


http://git-wip-us.apache.org/repos/asf/struts-site/blob/d572a9ef/content/css/print.css
--
diff --git a/content/css/print.css b/content/css/print.css
index 2ab336b..2b11058 100644
--- a/content/css/print.css
+++ b/content/css/print.css
@@ -1,7 +1,7 @@
-#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, 
#leftColumn, #navColumn {
-   display: none;
-}
-#bodyColumn, body.docs div.docs {
-   margin: 0 !important;
-   border: none !important
-}
+#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, 
#leftColumn, #navColumn {
+   display: none;
+}
+#bodyColumn, body.docs div.docs {
+   margin: 0 !important;
+   border: none !important
+}

http://git-wip-us.apache.org/repos/asf/struts-site/blob/d572a9ef/content/dtds/struts-2.1.7.dtd
--
diff --git a/content/dtds/struts-2.1.7.dtd b/content/dtds/struts-2.1.7.dtd
index 239b4db..94ce3c9 100644
--- a/content/dtds/struts-2.1.7.dtd
+++ b/content/dtds/struts-2.1.7.dtd
@@ -1,149 +1,149 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/struts-site/blob/d572a9ef/content/dtds/struts-2.1.dtd
--
diff --git a/content/dtds/struts-2.1.dtd b/content/dtds/struts-2.1.dtd
index c4a5c95..2a9e818 100644
--- a/content/dtds/struts-2.1.dtd
+++ b/content/dtds/struts-2.1.dtd
@@ -1,146 +1,146 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/struts-site/blob/d572a9ef/content/img/download-icon.svg
--
diff --git a/content/img/download-icon.svg b/content/img/download-icon.svg
index 298b099..3a056e0 100755
--- a/content/img/download-icon.svg
+++ b/content/img/download-icon.svg
@@ -1,10 +1,10 @@
-
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
-width="17px" height="19px" viewBox="0 0 17 19" enable-background="new 
0 0 17 19" xml:space="preserve">
-
-   
-   
-
-
+
+
+http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
+width="17px" height="19px" viewBox="0 0 17 19" enable-background="new 
0 0 17 19" xml:space="preserve">
+
+   
+   
+
+

http://git-wip-us.apache.org/repos/asf/struts-site/blob/d572a9ef/content/img/primer-icon.svg
--
diff --git a/content/img/primer-icon.svg b/content/img/primer-icon.svg
index e72a4bf..24d262f 100755
--- a/content/img/primer-icon.svg
+++ b/content/img/primer-icon.svg
@@ -1,12 +1,12 @@
-
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
-width="28.991px" height="20px" viewBox="2.009 3.5 28.991 20" 
enable-background="new 2.009 3.5 28.991 20" xml:space="preserve">
-
-
-
+
+
+http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
+width="28.991px" height="20px" viewBox="2.009 3.5 28.991 20" 
enable-background="new 2.009 3.5 28.991 20" xml:space="preserve">
+
+
+

http://git-wip-us.apache.org/repos/asf/struts-site/blob/d572a9ef/content/img/struts-logo.svg
--
diff --git a/content/img/struts-logo.svg b/content/img/struts-logo.svg
index 23971b7..3c37644 100755
--- a/content/img/struts-logo.svg
+++ b/content/img/struts-logo.svg
@@ -1,35 +1,35 @@
-
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
-viewBox="0 0 210 60" enable-background="new 0 0 210 60" 
xml:space="preserve">
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-
+
+
+http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
+http://www.w3.org/2000/svg; 

struts-site git commit: Exports and cleans up JUnit plugin

[lukaszlenart]

Repository: struts-site
Updated Branches:
  refs/heads/master ad42b41cc -> 5041eb302


Exports and cleans up JUnit plugin


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/5041eb30
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/5041eb30
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/5041eb30

Branch: refs/heads/master
Commit: 5041eb3024e7f31b501aec9ad9f938fe80b7be78
Parents: ad42b41
Author: Lukasz Lenart 
Authored: Wed Aug 23 13:42:50 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 13:42:50 2017 +0200

--
 pom.xml|   4 +-
 source/_layouts/plugin.html|   1 +
 source/core-developers/index.md|   2 +-
 source/plugins/convention/index.md |   2 -
 source/plugins/index.md|   1 +
 source/plugins/junit/index.md  | 138 
 6 files changed, 143 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/5041eb30/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e5fbb97..420bb63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,14 +94,14 @@
 -a
 
${project.build.directory}/md/attachments
 -o
-
${project.build.directory}/md/convention-plugin.md
+
${project.build.directory}/md/junit-plugin.md
 -u
 
${confluence.user}:${confluence.password}
 -server
 
https://cwiki.apache.org/confluence
 +gfm
 true
-105613
+2330106
 
 
 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/5041eb30/source/_layouts/plugin.html
--
diff --git a/source/_layouts/plugin.html b/source/_layouts/plugin.html
index 88d96db..1c15ec6 100644
--- a/source/_layouts/plugin.html
+++ b/source/_layouts/plugin.html
@@ -26,6 +26,7 @@
 
   
 << back to Plugins
+[Edit on GitHub]({{ site.repository_url }}/edit/master/source/{{ page.path 
}}){: .edit-on-gh title="Edit this page on GitHub"}
 {{ content }}
   
 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/5041eb30/source/core-developers/index.md
--
diff --git a/source/core-developers/index.md b/source/core-developers/index.md
index 1f28710..87c2d36 100644
--- a/source/core-developers/index.md
+++ b/source/core-developers/index.md
@@ -35,7 +35,7 @@ Each may be configured via XML or annotations.
 - [Application Servers](application-servers.html)
 - [Performance Tuning](performance-tuning.html)
 - [Security](../security/)
-- [Testing Actions] - export 
https://cwiki.apache.org/confluence/display/WW/Testing+Actions
+- [Testing Actions](../plugins/junit/)
   - 
[(arsenalist)](https://depressedprogrammer.wordpress.com/2007/06/18/unit-testing-struts-2-actions-spring-junit/)
   - 
[(rosa)](http://fassisrosa.blogspot.com/2006/11/unit-testing-struts-20\.html)
 - [Interceptors](interceptors.html)

http://git-wip-us.apache.org/repos/asf/struts-site/blob/5041eb30/source/plugins/convention/index.md
--
diff --git a/source/plugins/convention/index.md 
b/source/plugins/convention/index.md
index 424b428..4506147 100644
--- a/source/plugins/convention/index.md
+++ b/source/plugins/convention/index.md
@@ -6,8 +6,6 @@ title: Convention plugin
 # Convention Plugin
 {:.no_toc}
 
-[Edit on GitHub]({{ site.repository_url }}/edit/master/source/{{ page.path 
}}){: .edit-on-gh title="Edit this page on GitHub"}
-
 * Will be replaced with the ToC, excluding a header
 {:toc}
 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/5041eb30/source/plugins/index.md
--
diff --git a/source/plugins/index.md b/source/plugins/index.md
index 98ff721..653e591 100644
--- a/source/plugins/index.md
+++ b/source/plugins/index.md
@@ -6,4 +6,5 @@ title: Plugins (WIP)
 # Plugins
 
  - [Convention plugin](convention/)
+ - [JUnit plugin](junit/)
  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts-site/blob/5041eb30/source/plugins/junit/index.md

struts-site git commit: Updates production by Jenkins

[git-site-role]

Repository: struts-site
Updated Branches:
  refs/heads/asf-site 2a2db903d -> 4a447d6de


Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/4a447d6d
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/4a447d6d
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/4a447d6d

Branch: refs/heads/asf-site
Commit: 4a447d6ded353daca2b46f13d6f5e6deec276c27
Parents: 2a2db90
Author: jenkins 
Authored: Wed Aug 23 11:28:53 2017 +
Committer: jenkins 
Committed: Wed Aug 23 11:28:53 2017 +

--
 content/core-developers/configuration-files.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/4a447d6d/content/core-developers/configuration-files.html
--
diff --git a/content/core-developers/configuration-files.html 
b/content/core-developers/configuration-files.html
index 2b6d14e..ef1c2fc 100644
--- a/content/core-developers/configuration-files.html
+++ b/content/core-developers/configuration-files.html
@@ -165,7 +165,7 @@ See Reloading 
configuration for more.
    
 
 
-  struts.properties
+  default.properties
   yes
   /WEB-INF/classes/
   Framework properties

struts-site git commit: Uses proper link

[lukaszlenart]

Repository: struts-site
Updated Branches:
  refs/heads/master 5941b7eda -> ad42b41cc


Uses proper link


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/ad42b41c
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/ad42b41c
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/ad42b41c

Branch: refs/heads/master
Commit: ad42b41ccbe76a3962d8c9efc9d993cf03df7b9e
Parents: 5941b7e
Author: Lukasz Lenart 
Authored: Wed Aug 23 13:28:23 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 13:28:23 2017 +0200

--
 source/core-developers/configuration-files.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/ad42b41c/source/core-developers/configuration-files.md
--
diff --git a/source/core-developers/configuration-files.md 
b/source/core-developers/configuration-files.md
index df655a0..5ff67bc 100644
--- a/source/core-developers/configuration-files.md
+++ b/source/core-developers/configuration-files.md
@@ -19,7 +19,7 @@ See [Reloading configuration](reloading-configuration.html) 
for more.
 |[web.xml](web-xml.html)| no | /WEB-INF/ | Web deployment descriptor to 
include all necessary framework components |
 |[struts.xml](struts-xml.html)| yes | /WEB-INF/classes/ | Main configuration, 
contains result/view types, action mappings, interceptors, and so forth \
 |
-|[struts.properties](struts-properties.html)| yes | /WEB-INF/classes/ | 
Framework properties |
+|[default.properties](default-properties.html)| yes | /WEB-INF/classes/ | 
Framework properties |
 |[struts-default.xml](struts-default-xml.html)| yes | 
/WEB-INF/lib/struts2-core.jar | Default configuration provided by Struts |
 |[struts-default.vm](struts-default-vm.html)| yes | /WEB-INF/classes/ | 
Default macros referenced by velocity.properties|
 | struts-plugin.xml | yes | At the root of a plugin JAR| Optional 
configuration files for [Plugins](../plugins-developer-guide/)  in the same 
format as struts.xml. |

struts-site git commit: Updates production by Jenkins

[git-site-role]

Repository: struts-site
Updated Branches:
  refs/heads/asf-site 1b9b67fae -> 2a2db903d


Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/2a2db903
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/2a2db903
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/2a2db903

Branch: refs/heads/asf-site
Commit: 2a2db903d573fd53cd557bc17cfb12b7c558ce3a
Parents: 1b9b67f
Author: jenkins 
Authored: Wed Aug 23 11:26:54 2017 +
Committer: jenkins 
Committed: Wed Aug 23 11:26:54 2017 +

--
 .../core-developers/application-servers.html| 47 +++---
 content/core-developers/index.html  |  2 +-
 content/core-developers/performance-tuning.html | 91 +++-
 content/core-developers/struts-default-vm.html  | 11 +--
 .../core-developers/velocity-properties.html| 21 ++---
 5 files changed, 72 insertions(+), 100 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/2a2db903/content/core-developers/application-servers.html
--
diff --git a/content/core-developers/application-servers.html 
b/content/core-developers/application-servers.html
index 2c1209b..e48db85 100644
--- a/content/core-developers/application-servers.html
+++ b/content/core-developers/application-servers.html
@@ -127,42 +127,21 @@
 https://github.com/apache/struts-site/edit/master/source/core-developers/application-servers.md;
 title="Edit this page on GitHub">Edit on GitHub
 Application Servers
 
-The framework is known to work well with most application servers. If a 
server’s name is linked,  then there may be some extra steps to obtain full 
functionality.
+The framework is known to work well with most application servers. If a 
server’s name is linked, then there may 
+be some extra steps to obtain full functionality.
 
 
-  
-Jetty
-  
-  
-JRun
-  
-  
-OC4J
-  
-  
-Orion
-  
-  
-Resin
-  
-  
-SunOne 7.0
-  
-  
-JBoss 5
-  
-  
-WebLogic
-  
-  
-WebLogic 6.1
-  
-  
-WebSphere
-  
-  
-Glassfish 2.x
-  
+  Jetty
+  JRun
+  OC4J
+  Orion
+  Resin
+  SunOne 7.0
+  JBoss 5
+  WebLogic
+  WebLogic 6.1
+  WebSphere
+  Glassfish 2.x
 
 
   

http://git-wip-us.apache.org/repos/asf/struts-site/blob/2a2db903/content/core-developers/index.html
--
diff --git a/content/core-developers/index.html 
b/content/core-developers/index.html
index efa90c8..f8a2c41 100644
--- a/content/core-developers/index.html
+++ b/content/core-developers/index.html
@@ -155,7 +155,7 @@ Each may be configured via XML or annotations.
 
   web.xml
   struts.xml
-  struts.properties
+  default.properties
   struts-default.xml
   velocity.properties
   struts-default.vm

http://git-wip-us.apache.org/repos/asf/struts-site/blob/2a2db903/content/core-developers/performance-tuning.html
--
diff --git a/content/core-developers/performance-tuning.html 
b/content/core-developers/performance-tuning.html
index 20a6461..eb40a5d 100644
--- a/content/core-developers/performance-tuning.html
+++ b/content/core-developers/performance-tuning.html
@@ -127,80 +127,91 @@
 https://github.com/apache/struts-site/edit/master/source/core-developers/performance-tuning.md;
 title="Edit this page on GitHub">Edit on GitHub
 Performance Tuning
 
-Performance tuning
+Performance tuning
 
 The following are some tips and tricks to squeeze the most performance out 
of Struts 2.
 
-
-  
-
-  For Struts 2 versions before 2.3: the OGNL version 3.0.3 library is 
a drop-in replacement for older OGNL jars, and provides much 
better performance. See the following Jira issue for more information: https://issues\.apache\.org/jira/browse/WW\-3580;>https://issues.apache.org/jira/browse/WW-3580
-
-  
-
+
+  For Struts 2 versions before 2.3: the OGNL version 3.0.3 library is a 
drop-in replacement for older OGNL jars,
+and provides much better performance. See the following JIRA 
issue for more information: 
+https://issues.apache.org/jira/browse/WW-3580;>https://issues.apache.org/jira/browse/WW-3580
+
 
-
-  
-
-
-  
-
+Turn off logging and devMode
 
-#Turn off logging and devMode.#
+The devMode allows reloading of 
configuration and validation related files, but because they 
+happen on each request, this setting will totally kill your performance.
+When using logging, make sure to turn off logging (esp. Freemarker generates a 
LOT of logging), and check if a level is 
+enabled before printing it, or you will get the cost of the String 

struts-site git commit: Cleans up pages

[lukaszlenart]

Repository: struts-site
Updated Branches:
  refs/heads/master 3e113c51f -> 5941b7eda


Cleans up pages


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/5941b7ed
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/5941b7ed
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/5941b7ed

Branch: refs/heads/master
Commit: 5941b7edace8be7891fe779355893058e5e32599
Parents: 3e113c5
Author: Lukasz Lenart 
Authored: Wed Aug 23 13:26:21 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 13:26:21 2017 +0200

--
 source/core-developers/application-servers.md | 37 -
 source/core-developers/index.md   |  4 +-
 source/core-developers/performance-tuning.md  | 91 +-
 source/core-developers/struts-default-vm.md   | 16 +---
 source/core-developers/velocity-properties.md | 24 ++
 5 files changed, 79 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/5941b7ed/source/core-developers/application-servers.md
--
diff --git a/source/core-developers/application-servers.md 
b/source/core-developers/application-servers.md
index e368168..c4edd0d 100644
--- a/source/core-developers/application-servers.md
+++ b/source/core-developers/application-servers.md
@@ -5,26 +5,17 @@ title: Application Servers
 
 # Application Servers
 
-The framework is known to work well with most application servers\. If a 
server's name is linked,  then there may be some extra steps to obtain full 
functionality\.
-
-+ Jetty
-
-+ JRun
-
-+ OC4J
-
-+ Orion
-
-+ Resin
-
-+ [SunOne 7.0](sunone-7-0.html)
-
-+ [JBoss 5](jboss-5.html)
-
-+ [WebLogic](weblogic.html)
-
-+ [WebLogic 6.1](weblogic-6-1.html)
-
-+ [WebSphere](websphere.html)
-
-+ [Glassfish 2\.x](glassfish-2-x.html)
+The framework is known to work well with most application servers. If a 
server's name is linked, then there may 
+be some extra steps to obtain full functionality.
+
+- Jetty
+- JRun
+- OC4J
+- Orion
+- Resin
+- [SunOne 7.0](sunone-7-0.html)
+- [JBoss 5](jboss-5.html)
+- [WebLogic](weblogic.html)
+- [WebLogic 6.1](weblogic-6-1.html)
+- [WebSphere](websphere.html)
+- [Glassfish 2.x](glassfish-2-x.html)

http://git-wip-us.apache.org/repos/asf/struts-site/blob/5941b7ed/source/core-developers/index.md
--
diff --git a/source/core-developers/index.md b/source/core-developers/index.md
index 3fad4ae..1f28710 100644
--- a/source/core-developers/index.md
+++ b/source/core-developers/index.md
@@ -28,10 +28,10 @@ Each may be configured via XML or annotations.
 - [Configuration Files](configuration-files.html)
   - [web.xml](web-xml.html)
   - [struts.xml](struts-xml.html)
-  - [struts.properties](struts-properties.html)
+  - [default.properties](default-properties.html)
   - [struts-default.xml](struts-default-xml.html)
   - [velocity.properties](velocity-properties.html)
-  - [struts\-default\.vm](struts-default-vm.html)
+  - [struts-default.vm](struts-default-vm.html)
 - [Application Servers](application-servers.html)
 - [Performance Tuning](performance-tuning.html)
 - [Security](../security/)

http://git-wip-us.apache.org/repos/asf/struts-site/blob/5941b7ed/source/core-developers/performance-tuning.md
--
diff --git a/source/core-developers/performance-tuning.md 
b/source/core-developers/performance-tuning.md
index 42de03c..84016c0 100644
--- a/source/core-developers/performance-tuning.md
+++ b/source/core-developers/performance-tuning.md
@@ -5,69 +5,86 @@ title: Performance Tuning
 
 # Performance Tuning
 
-Performance tuning
+## Performance tuning
 
-The following are some tips and tricks to squeeze the most performance out of 
Struts 2\.
+The following are some tips and tricks to squeeze the most performance out of 
Struts 2.
 
+> For Struts 2 versions before 2.3: the OGNL version 3.0.3 library is a 
drop-in replacement for older OGNL jars,
+> and provides **much** better performance. See the following JIRA issue for 
more information: 
+> 
[https://issues.apache.org/jira/browse/WW-3580](https://issues.apache.org/jira/browse/WW-3580)
 
+## Turn off logging and devMode
 
-| For Struts 2 versions before 2\.3: the OGNL version 3\.0\.3 library is a 
drop\-in replacement for older OGNL jars, and provides **much** better 
performance\. See the following Jira issue for more information: 
[https://issues\.apache\.org/jira/browse/WW\-3580](https://issues\.apache\.org/jira/browse/WW\-3580)
+The [devMode](development-mode.html) allows reloading of configuration and 
validation related files, but because they 
+happen on each 

struts-site git commit: Updates production by Jenkins

[git-site-role]

Repository: struts-site
Updated Branches:
  refs/heads/asf-site 40d302a8b -> 1b9b67fae


Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/1b9b67fa
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/1b9b67fa
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/1b9b67fa

Branch: refs/heads/asf-site
Commit: 1b9b67faea53d30d5eec096baa1449ae8fb2e3dd
Parents: 40d302a
Author: jenkins 
Authored: Wed Aug 23 11:17:30 2017 +
Committer: jenkins 
Committed: Wed Aug 23 11:17:30 2017 +

--
 .../core-developers/configuration-files.html|  49 +--
 content/core-developers/default-properties.html | 422 +++
 content/core-developers/struts-xml.html |  33 +-
 content/core-developers/web-xml.html| 252 +--
 4 files changed, 544 insertions(+), 212 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/1b9b67fa/content/core-developers/configuration-files.html
--
diff --git a/content/core-developers/configuration-files.html 
b/content/core-developers/configuration-files.html
index f6d8082..2b6d14e 100644
--- a/content/core-developers/configuration-files.html
+++ b/content/core-developers/configuration-files.html
@@ -127,19 +127,14 @@
 https://github.com/apache/struts-site/edit/master/source/core-developers/configuration-files.md;
 title="Edit this page on GitHub">Edit on GitHub
 Configuration Files
 
-From a Struts developer point of view, the one required configuration file 
used by the framework is
+From a Struts developer point of view, the one required configuration file 
used by the framework is web.xml.
+From here, you have full control over how Struts configures both itself and 
your application.  By default, Struts will 
+load a set of internal configuration files to configure itself, then another 
set to configure your application, however 
+it is possible to build an entire Struts application without writing a single 
configuration file other than web.xml.
 
-web.xml
-
-
-.  From here, you have full control over how Struts configures both itself 
and your application.  By default, Struts will load a set of internal 
configuration files to configure itself, then another set to configure your 
application, however it is possible to build an entire Struts application 
without writing a single configuration file other than
-
-web.xml
-
-
-.
-
-The table lists the files that you can use to configure the framework for 
your application. Some configuration files can be reloaded dynamically. Dynamic 
reloading makes interactive development possible. See Reloading configuration for more.
+The table lists the files that you can use to configure the framework for 
your application. Some configuration files 
+can be reloaded dynamically. Dynamic reloading makes interactive development 
possible. 
+See Reloading configuration for 
more.
 
 
   
@@ -191,7 +186,7 @@
   struts-plugin.xml
   yes
   At the root of a plugin JAR
-  Optional configuration files for Plugins  in the same 
format as struts.xml.
+  Optional configuration files for Plugins  in the same format as 
struts.xml.
 
 
   velocity.properties
@@ -202,32 +197,22 @@
   
 
 
-Static Content
-
-Common static content that is needed by the framework (JavaScript and CSS 
files, etc.) is served automatically by the FilterDispatcher filter.  Any 
request starting with “
-
-/struts/
-
-
-” denotes that static content is required, and then mapping the value 
after “
+Static Content
 
-/struts/
-
-
-” to common packages in the framework and, optionally in the 
application’s class path.
+Common static content that is needed by the framework (JavaScript and CSS 
files, etc.) is served automatically by 
+the FilterDispatcher filter.  Any request starting with /struts/ denotes that static content is 
required, and then 
+mapping the value after /struts/ to 
common packages in the framework and, optionally in the application’s class 
path.
 
 By default, the following packages are searched:
 
 
-  
-org.apache.struts2.static
-  
-  
-template
-  
+  org.apache.struts2.static
+  template
 
 
-Additional packages can be specified by providing a comma separated list to 
the configuration parameter named “packages” (configured in web.xml for the 
FilterDispatcher filter). When specifying additional static content, you should 
be careful not to expose sensitive configuration information (such as the 
password to a database).
+Additional packages can be specified by providing a comma separated list to 
the configuration parameter named “packages” 
+(configured in web.xml for the 

[struts] Git Push Summary

[lukaszlenart]

Repository: struts
Updated Tags:  refs/tags/STRUTS_2_5_13 [created] 0df93f50b

struts git commit: [maven-release-plugin] prepare release STRUTS_2_5_13

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/master 68cb702dc -> 9f5082615


[maven-release-plugin] prepare release STRUTS_2_5_13


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9f508261
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9f508261
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9f508261

Branch: refs/heads/master
Commit: 9f5082615ede714618c8694c418210d43338daf6
Parents: 68cb702
Author: Lukasz Lenart 
Authored: Wed Aug 23 13:05:07 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 13:05:07 2017 +0200

--
 apps/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 8 ++--
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/bean-validation/pom.xml | 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/pom.xml  | 2 +-
 plugins/dwr/pom.xml | 2 +-
 plugins/embeddedjsp/pom.xml | 2 +-
 plugins/gxp/pom.xml | 2 +-
 plugins/jasperreports/pom.xml   | 2 +-
 plugins/javatemplates/pom.xml   | 2 +-
 plugins/jfreechart/pom.xml  | 2 +-
 plugins/json/pom.xml| 2 +-
 plugins/junit/pom.xml   | 2 +-
 plugins/osgi/pom.xml| 2 +-
 plugins/oval/pom.xml| 2 +-
 plugins/pell-multipart/pom.xml  | 2 +-
 plugins/plexus/pom.xml  | 2 +-
 plugins/pom.xml | 2 +-
 plugins/portlet-tiles/pom.xml   | 2 +-
 plugins/portlet/pom.xml | 2 +-
 plugins/rest/pom.xml| 2 +-
 plugins/sitegraph/pom.xml   | 2 +-
 plugins/sitemesh/pom.xml| 2 +-
 plugins/spring/pom.xml  | 2 +-
 plugins/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 pom.xml | 4 ++--
 35 files changed, 42 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/9f508261/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index 626e702..ebff4b5 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.13-SNAPSHOT
+2.5.13
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/9f508261/apps/rest-showcase/pom.xml
--
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 73c33de..1077aa1 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
 
 org.apache.struts
 struts2-apps
-2.5.13-SNAPSHOT
+2.5.13
 
 
 struts2-rest-showcase
 war
-2.5.13-SNAPSHOT
+2.5.13
 Struts 2 Rest Showcase Webapp
 Struts 2 Rest Showcase Example
 

http://git-wip-us.apache.org/repos/asf/struts/blob/9f508261/apps/showcase/pom.xml
--
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 868d51f..ea4a5cb 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.5.13-SNAPSHOT
+2.5.13
 
 
 struts2-showcase

http://git-wip-us.apache.org/repos/asf/struts/blob/9f508261/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0a47af1..690468b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.13-SNAPSHOT
+2.5.13
 
 
 struts2-assembly

http://git-wip-us.apache.org/repos/asf/struts/blob/9f508261/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index 324e71e..e1eb45f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
 
 
 struts2-bom
-2.5.13-SNAPSHOT
+2.5.13
 pom
 
 Struts 2 Bill of Materials
@@ -25,7 +25,7 @@
 
 
 
-2.5.13-SNAPSHOT
+2.5.13
 
 
 
@@ -170,4 +170,8 @@
 
 
 
+
+  
+STRUTS_2_5_13
+  
 

http://git-wip-us.apache.org/repos/asf/struts/blob/9f508261/bundles/admin/pom.xml
--
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 6bd52a3..19f7dd6 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
 
   

struts git commit: [maven-release-plugin] prepare for next development iteration

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/master 9f5082615 -> c9bdb24bf


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c9bdb24b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c9bdb24b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c9bdb24b

Branch: refs/heads/master
Commit: c9bdb24bf9fa3f95b82ef88e0b16f8ac756997fd
Parents: 9f50826
Author: Lukasz Lenart 
Authored: Wed Aug 23 13:05:27 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 13:05:27 2017 +0200

--
 apps/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 8 ++--
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/bean-validation/pom.xml | 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/pom.xml  | 2 +-
 plugins/dwr/pom.xml | 2 +-
 plugins/embeddedjsp/pom.xml | 2 +-
 plugins/gxp/pom.xml | 2 +-
 plugins/jasperreports/pom.xml   | 2 +-
 plugins/javatemplates/pom.xml   | 2 +-
 plugins/jfreechart/pom.xml  | 2 +-
 plugins/json/pom.xml| 2 +-
 plugins/junit/pom.xml   | 2 +-
 plugins/osgi/pom.xml| 2 +-
 plugins/oval/pom.xml| 2 +-
 plugins/pell-multipart/pom.xml  | 2 +-
 plugins/plexus/pom.xml  | 2 +-
 plugins/pom.xml | 2 +-
 plugins/portlet-tiles/pom.xml   | 2 +-
 plugins/portlet/pom.xml | 2 +-
 plugins/rest/pom.xml| 2 +-
 plugins/sitegraph/pom.xml   | 2 +-
 plugins/sitemesh/pom.xml| 2 +-
 plugins/spring/pom.xml  | 2 +-
 plugins/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 pom.xml | 4 ++--
 35 files changed, 38 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/c9bdb24b/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index ebff4b5..3c3c11e 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.13
+2.5.14-SNAPSHOT
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/c9bdb24b/apps/rest-showcase/pom.xml
--
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 1077aa1..4c6620e 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
 
 org.apache.struts
 struts2-apps
-2.5.13
+2.5.14-SNAPSHOT
 
 
 struts2-rest-showcase
 war
-2.5.13
+2.5.14-SNAPSHOT
 Struts 2 Rest Showcase Webapp
 Struts 2 Rest Showcase Example
 

http://git-wip-us.apache.org/repos/asf/struts/blob/c9bdb24b/apps/showcase/pom.xml
--
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index ea4a5cb..016fefa 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.5.13
+2.5.14-SNAPSHOT
 
 
 struts2-showcase

http://git-wip-us.apache.org/repos/asf/struts/blob/c9bdb24b/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 690468b..3df1767 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.13
+2.5.14-SNAPSHOT
 
 
 struts2-assembly

http://git-wip-us.apache.org/repos/asf/struts/blob/c9bdb24b/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index e1eb45f..b01a9f7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
 
 
 struts2-bom
-2.5.13
+2.5.14-SNAPSHOT
 pom
 
 Struts 2 Bill of Materials
@@ -25,7 +25,7 @@
 
 
 
-2.5.13
+2.5.14-SNAPSHOT
 
 
 
@@ -170,8 +170,4 @@
 
 
 
-
-  
-STRUTS_2_5_13
-  
 

http://git-wip-us.apache.org/repos/asf/struts/blob/c9bdb24b/bundles/admin/pom.xml
--
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 19f7dd6..bfe7454 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@

[2/2] struts-site git commit: Updates production by Jenkins

[git-site-role]

Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/40d302a8
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/40d302a8
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/40d302a8

Branch: refs/heads/asf-site
Commit: 40d302a8b6485369e61aa03bfc91153e64e2631c
Parents: c88a260
Author: jenkins 
Authored: Wed Aug 23 09:00:46 2017 +
Committer: jenkins 
Committed: Wed Aug 23 09:00:46 2017 +

--
 .../accessing-application-session-request-objects.html  | 1 +
 content/core-developers/action-chaining.html| 1 +
 content/core-developers/action-configuration.html   | 1 +
 content/core-developers/action-event-listener.html  | 1 +
 content/core-developers/action-mapper-and-action-mapping.html   | 1 +
 content/core-developers/action-mapper.html  | 1 +
 content/core-developers/action-proxy-and-actionproxy-factory.html   | 1 +
 content/core-developers/after-annotation.html   | 1 +
 content/core-developers/ajax-client-side-validation.html| 1 +
 content/core-developers/ajax.html   | 1 +
 content/core-developers/alias-interceptor.html  | 1 +
 content/core-developers/annotation-workflow-interceptor.html| 1 +
 content/core-developers/annotations.html| 1 +
 content/core-developers/application-servers.html| 1 +
 content/core-developers/basic-validation.html   | 1 +
 content/core-developers/bean-configuration.html | 1 +
 content/core-developers/before-annotation.html  | 1 +
 content/core-developers/before-result-annotation.html   | 1 +
 content/core-developers/chain-result.html   | 1 +
 content/core-developers/chaining-interceptor.html   | 1 +
 content/core-developers/checkbox-interceptor.html   | 1 +
 content/core-developers/client-side-validation.html | 1 +
 content/core-developers/client-validation.html  | 1 +
 content/core-developers/conditionalvisitor-validator.html   | 1 +
 content/core-developers/configuration-elements.html | 1 +
 content/core-developers/configuration-files.html| 1 +
 .../core-developers/configuration-provider-and-configuration.html   | 1 +
 content/core-developers/constant-configuration.html | 1 +
 content/core-developers/conversion-annotation.html  | 1 +
 .../conversion-error-field-validator-annotation.html| 1 +
 content/core-developers/conversion-error-interceptor.html   | 1 +
 content/core-developers/conversion-validator.html   | 1 +
 content/core-developers/cookie-interceptor.html | 1 +
 content/core-developers/cookie-provider-interceptor.html| 1 +
 content/core-developers/create-if-null-annotation.html  | 1 +
 content/core-developers/create-session-interceptor.html | 1 +
 content/core-developers/custom-validator-annotation.html| 1 +
 content/core-developers/date-range-field-validator-annotation.html  | 1 +
 content/core-developers/date-validator.html | 1 +
 content/core-developers/debugging-interceptor.html  | 1 +
 content/core-developers/debugging.html  | 1 +
 content/core-developers/default-workflow-interceptor.html   | 1 +
 content/core-developers/dependency-injection.html   | 1 +
 content/core-developers/development-mode.html   | 1 +
 content/core-developers/dispatcher-listener.html| 1 +
 content/core-developers/dispatcher-result.html  | 1 +
 content/core-developers/dispatcher.html | 1 +
 .../core-developers/double-range-field-validator-annotation.html| 1 +
 content/core-developers/double-validator.html   | 1 +
 content/core-developers/element-annotation.html | 1 +
 content/core-developers/email-validator-annotation.html | 1 +
 content/core-developers/email-validator.html| 1 +
 content/core-developers/exception-configuration.html| 1 +
 content/core-developers/exception-interceptor.html  | 1 +
 content/core-developers/execute-and-wait-interceptor.html   | 1 +
 content/core-developers/expression-validator-annotation.html| 1 +
 content/core-developers/expression-validator.html   | 1 +
 content/core-developers/field-expression-validator-annotation.html  | 1 +
 

[1/2] struts-site git commit: Updates production by Jenkins

[git-site-role]

Repository: struts-site
Updated Branches:
  refs/heads/asf-site c88a260e1 -> 40d302a8b


http://git-wip-us.apache.org/repos/asf/struts-site/blob/40d302a8/content/core-developers/jboss-5.html
--
diff --git a/content/core-developers/jboss-5.html 
b/content/core-developers/jboss-5.html
index a67a786..35bf84c 100644
--- a/content/core-developers/jboss-5.html
+++ b/content/core-developers/jboss-5.html
@@ -124,6 +124,7 @@
 
   
 << back to Core 
Developers Guide
+https://github.com/apache/struts-site/edit/master/source/core-developers/jboss-5.md;
 title="Edit this page on GitHub">Edit on GitHub
 JBoss 5
 
 Convention plugin support

http://git-wip-us.apache.org/repos/asf/struts-site/blob/40d302a8/content/core-developers/key-annotation.html
--
diff --git a/content/core-developers/key-annotation.html 
b/content/core-developers/key-annotation.html
index 4758db3..892dc3e 100644
--- a/content/core-developers/key-annotation.html
+++ b/content/core-developers/key-annotation.html
@@ -124,6 +124,7 @@
 
   
 << back to Core 
Developers Guide
+https://github.com/apache/struts-site/edit/master/source/core-developers/key-annotation.md;
 title="Edit this page on GitHub">Edit on GitHub
 Key Annotation
 
 {snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.util.Key}

http://git-wip-us.apache.org/repos/asf/struts-site/blob/40d302a8/content/core-developers/key-property-annotation.html
--
diff --git a/content/core-developers/key-property-annotation.html 
b/content/core-developers/key-property-annotation.html
index 79f01a2..40c45a6 100644
--- a/content/core-developers/key-property-annotation.html
+++ b/content/core-developers/key-property-annotation.html
@@ -124,6 +124,7 @@
 
   
 << back to Core 
Developers Guide
+https://github.com/apache/struts-site/edit/master/source/core-developers/key-property-annotation.md;
 title="Edit this page on GitHub">Edit on GitHub
 KeyProperty Annotation
 
 {snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.util.KeyProperty}

http://git-wip-us.apache.org/repos/asf/struts-site/blob/40d302a8/content/core-developers/localization.html
--
diff --git a/content/core-developers/localization.html 
b/content/core-developers/localization.html
index 9830b9b..f4645cd 100644
--- a/content/core-developers/localization.html
+++ b/content/core-developers/localization.html
@@ -124,6 +124,7 @@
 
   
 << back to Core 
Developers Guide
+https://github.com/apache/struts-site/edit/master/source/core-developers/localization.md;
 title="Edit this page on GitHub">Edit on GitHub
 Localization
 
 Overview

http://git-wip-us.apache.org/repos/asf/struts-site/blob/40d302a8/content/core-developers/logger-interceptor.html
--
diff --git a/content/core-developers/logger-interceptor.html 
b/content/core-developers/logger-interceptor.html
index 7459cc0..1df75ea 100644
--- a/content/core-developers/logger-interceptor.html
+++ b/content/core-developers/logger-interceptor.html
@@ -124,6 +124,7 @@
 
   
 << back to Core 
Developers Guide
+https://github.com/apache/struts-site/edit/master/source/core-developers/logger-interceptor.md;
 title="Edit this page on GitHub">Edit on GitHub
 Logger Interceptor
 
 {snippet:id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.LoggingInterceptor}

http://git-wip-us.apache.org/repos/asf/struts-site/blob/40d302a8/content/core-developers/logging.html
--
diff --git a/content/core-developers/logging.html 
b/content/core-developers/logging.html
index 349ad54..d06ffdf 100644
--- a/content/core-developers/logging.html
+++ b/content/core-developers/logging.html
@@ -124,6 +124,7 @@
 
   
 << back to Core 
Developers Guide
+https://github.com/apache/struts-site/edit/master/source/core-developers/logging.md;
 title="Edit this page on GitHub">Edit on GitHub
 Logging
 
 #Logging support#

http://git-wip-us.apache.org/repos/asf/struts-site/blob/40d302a8/content/core-developers/message-store-interceptor.html
--
diff --git a/content/core-developers/message-store-interceptor.html 
b/content/core-developers/message-store-interceptor.html
index 36c00ba..956751c 100644
--- a/content/core-developers/message-store-interceptor.html
+++ b/content/core-developers/message-store-interceptor.html
@@ -124,6 +124,7 @@
 
   
 << back to Core 
Developers Guide
+https://github.com/apache/struts-site/edit/master/source/core-developers/message-store-interceptor.md;
 title="Edit this page on GitHub">Edit on GitHub
 Message Store 

struts-site git commit: Adds link to edit page on GitHub

[lukaszlenart]

Repository: struts-site
Updated Branches:
  refs/heads/master faa2f637c -> 67669c5f2


Adds link to edit page on GitHub


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/67669c5f
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/67669c5f
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/67669c5f

Branch: refs/heads/master
Commit: 67669c5f2466ce593f364d78a0a83e75cb31f7ed
Parents: faa2f63
Author: Lukasz Lenart 
Authored: Wed Aug 23 11:00:14 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 11:00:14 2017 +0200

--
 source/_layouts/core-developers.html | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/67669c5f/source/_layouts/core-developers.html
--
diff --git a/source/_layouts/core-developers.html 
b/source/_layouts/core-developers.html
index 090fae5..f8145a4 100644
--- a/source/_layouts/core-developers.html
+++ b/source/_layouts/core-developers.html
@@ -26,6 +26,7 @@
 
   
 << back to Core 
Developers Guide
+Edit on 
GitHub
 {{ content }}
   
 

struts-site git commit: Updates production by Jenkins

[git-site-role]

Repository: struts-site
Updated Branches:
  refs/heads/asf-site e2b7cd1ee -> c88a260e1


Updates production by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/c88a260e
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/c88a260e
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/c88a260e

Branch: refs/heads/asf-site
Commit: c88a260e12e70cf593959e9c31d3a81be3086852
Parents: e2b7cd1
Author: jenkins 
Authored: Wed Aug 23 08:59:08 2017 +
Committer: jenkins 
Committed: Wed Aug 23 08:59:08 2017 +

--
 content/core-developers/dispatcher.html |  35 +--
 .../core-developers/result-configuration.html   | 254 ---
 content/core-developers/unknown-handlers.html   |  59 ++---
 3 files changed, 128 insertions(+), 220 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/c88a260e/content/core-developers/dispatcher.html
--
diff --git a/content/core-developers/dispatcher.html 
b/content/core-developers/dispatcher.html
index 28f0281..29c4533 100644
--- a/content/core-developers/dispatcher.html
+++ b/content/core-developers/dispatcher.html
@@ -126,35 +126,18 @@
 << back to Core 
Developers Guide
 Dispatcher
 
-###Description###
+Dispatcher is the main point of control which dispatch request execution to 
given actions. It is used 
+by filters / servlet / listener / portlet to set up 
and run Struts environment.
 
-Dispatcher is the main point of control which dispatch request execution to 
given actions. It is used by filters / servlet / 
listener / portlet to set up and run Struts environment.
+Error handling
 
-Error handling
+When exception occurs (misconfiguration or some internal error), Dispatcher 
will pass handling to DispatcherErrorHandler
+which by default uses HttpServletResponse#sendError to report error 
back to client. It will be 404 or 500 by default 
+(depends on exception type).
 
-When exception occurs (misconfiguration or some internal error), Dispatcher 
will pass handling to 
-
-DispatcherErrorHandler
-
-
-which by default uses 
-
-HttpServletResponse#sendError
-
-
-to report error back to client. It will be 404 or 500 by default (depends 
on exception type).
-
-If you need a different type of handling you can implement your own 
-
-DispatcherErrorHandler
-
-
-and register it with Dispatcher using extension point 
-
-struts.dispatcher.errorHandler
-
-
-, see Plugins  for how to register your own implementation of 
internal mechanism.
+If you need a different type of handling you can implement your own DispatcherErrorHandler and register it with 
+Dispatcher using extension point struts.dispatcher.errorHandler, see Plugins for how 
+to register your own implementation of internal mechanism.
 
   
 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/c88a260e/content/core-developers/result-configuration.html
--
diff --git a/content/core-developers/result-configuration.html 
b/content/core-developers/result-configuration.html
index 9450f39..e137de0 100644
--- a/content/core-developers/result-configuration.html
+++ b/content/core-developers/result-configuration.html
@@ -124,14 +124,19 @@
 
   
 << back to Core 
Developers Guide
-Result Configuration
+Result Configuration
 
-When an action  class method completes, it returns a String. The 
value of the String is used to select a result element. An action mapping will 
often have a set of results representing different possible outcomes. A 
standard set of result tokens are defined by the
+
+  Result 
Elements
+  Multiple 
names
+  Global 
Results
+  Dynamic 
Results
+  Returning Result Objects
+
 
-ActionSupport
-
-
-base class.
+When an action class method 
completes, it returns a String. The value of the String is used to select a 
result element. 
+An action mapping will often have a set of results representing different 
possible outcomes. A standard set of result 
+tokens are defined by the ActionSupport 
base class.
 
 Predefined result names
 
@@ -140,106 +145,66 @@ String NONE= "none";
 String ERROR   = "error";
 String INPUT   = "input";
 String LOGIN   = "login";
-
 
 
 
 Of course, applications can define other result tokens to match specific 
cases.
 
-(information) Returning
-
-ActionSupport.NONE
-
-
-(or
-
-null
-
-
-) from an action  class method causes the results processing to be 
skipped. This is useful if the action fully handles the result processing such 
as writing directly to the HttpServletResponse OutputStream.
+
+  Returning ActionSupport.NONE (or 
null) from an action class method causes 
the results processing 
+to be 

[1/2] struts-site git commit: Cleans up page content

[lukaszlenart]

Repository: struts-site
Updated Branches:
  refs/heads/master 8479180e0 -> faa2f637c


Cleans up page content


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/732e451a
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/732e451a
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/732e451a

Branch: refs/heads/master
Commit: 732e451a75017d0fb0ff9fbe2d7e90c745814c33
Parents: 8479180
Author: Lukasz Lenart 
Authored: Wed Aug 23 10:53:21 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 10:53:21 2017 +0200

--
 source/core-developers/result-configuration.md | 224 +++-
 1 file changed, 71 insertions(+), 153 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/732e451a/source/core-developers/result-configuration.md
--
diff --git a/source/core-developers/result-configuration.md 
b/source/core-developers/result-configuration.md
index 64b14bf..828503c 100644
--- a/source/core-developers/result-configuration.md
+++ b/source/core-developers/result-configuration.md
@@ -6,267 +6,185 @@ title: Result Configuration
 # Result Configuration
 
 
-When an _action_  class method completes, it returns a String\. The value of 
the String is used to select a result element\. An action mapping will often 
have a set of results representing different possible outcomes\. A standard set 
of result tokens are defined by the 
-
-~~~
-ActionSupport
-~~~
- base class\.
+When an `action` class method completes, it returns a String. The value of the 
String is used to select a result element. 
+An action mapping will often have a set of results representing different 
possible outcomes. A standard set of result 
+tokens are defined by the `ActionSupport` base class.
 
 **Predefined result names**
 
-
-~~~
+```
 String SUCCESS = "success";
 String NONE= "none";
 String ERROR   = "error";
 String INPUT   = "input";
 String LOGIN   = "login";
+```
 
-~~~
-
-Of course, applications can define other result tokens to match specific 
cases\.
-
-(information) Returning 
-
-~~~
-ActionSupport.NONE
-~~~
- (or 
+Of course, applications can define other result tokens to match specific cases.
 
-~~~
-null
-~~~
-) from an _action_  class method causes the results processing to be skipped\. 
This is useful if the action fully handles the result processing such as 
writing directly to the HttpServletResponse OutputStream\.
+> Returning `ActionSupport.NONE` (or `null`) from an action class method 
causes the results processing 
+> to be skipped. This is useful if the action fully handles the result 
processing such as writing directly
+> to the HttpServletResponse OutputStream.
 
-#Result Elements#
+## Result Elements
 
-The result element has two jobs\. First, it provides a logical name\. An 
-
-~~~
-Action
-~~~
- can pass back a token like "success" or "error" without knowing any other 
implementation details\. Second, the result element provides a result type\. 
Most results simply forward to a server page or template, but other [Result 
Types](result-types.html) can be used to do more interesting things\.
+The result element has two jobs. First, it provides a logical name. An 
`Action` can pass back a token like `success` 
+or `error` without knowing any other implementation details. Second, the 
result element provides a result type. Most 
+results simply forward to a server page or template, but other [Result 
Types](result-types.html) can be used to do more 
+interesting things.
 
 __Intelligent Defaults__
 
-Each package may set a default result type to be used if none is specified in 
a result element\. If one package extends another, the "child" package can set 
its own default result, or inherit one from the parent\.
+Each package may set a default result type to be used if none is specified in 
a result element. If one package extends 
+another, the "child" package can set its own default result, or inherit one 
from the parent.
 
 **Setting a default Result Type**
 
-
-~~~
+```xml
 
-   
+   
 
-~~~
-
-If a 
-
-~~~
-type
-~~~
- attribute is not specified, the framework will use the default 
-
-~~~
-dispatcher
-~~~
- type, which forwards to another web resource\. If the resource is a 
JavaServer Page, then the container will render it, using its JSP engine\.
+```
 
-Likewise if the 
+If a `type` attribute is not specified, the framework will use the default 
`dispatcher` type, which forwards to another 
+web resource. If the resource is a JavaServer Page, then the container will 
render it, using its JSP engine.
 
-~~~
-name
-~~~
- attribute is not specified, the 

[2/2] struts-site git commit: Cleans up page content

[lukaszlenart]

Cleans up page content


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/faa2f637
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/faa2f637
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/faa2f637

Branch: refs/heads/master
Commit: faa2f637c43714ac33a4d2889442b6ec61ff6655
Parents: 732e451
Author: Lukasz Lenart 
Authored: Wed Aug 23 10:58:27 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 10:58:27 2017 +0200

--
 source/core-developers/dispatcher.md   | 35 -
 source/core-developers/result-configuration.md |  3 ++
 source/core-developers/unknown-handlers.md | 57 +++--
 3 files changed, 30 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/faa2f637/source/core-developers/dispatcher.md
--
diff --git a/source/core-developers/dispatcher.md 
b/source/core-developers/dispatcher.md
index 4a1e727..961c789 100644
--- a/source/core-developers/dispatcher.md
+++ b/source/core-developers/dispatcher.md
@@ -5,32 +5,15 @@ title: Dispatcher
 
 # Dispatcher
 
-###Description###
+Dispatcher is the main point of control which dispatch request execution to 
given actions. It is used 
+by [filters](web-xml.html) / servlet / listener / portlet to set up and run 
Struts environment.
 
-Dispatcher is the main point of control which dispatch request execution to 
given actions\. It is used by [filters](web-xml.html) / servlet / listener / 
portlet to set up and run Struts environment\.
+## Error handling
 
-Error handling
+When exception occurs (misconfiguration or some internal error), Dispatcher 
will pass handling to `DispatcherErrorHandler`
+which by default uses `HttpServletResponse#sendError` to report error back to 
client. It will be 404 or 500 by default 
+(depends on exception type).
 
-When exception occurs (misconfiguration or some internal error), Dispatcher 
will pass handling to 
-
-~~~
-DispatcherErrorHandler
-~~~
- which by default uses 
-
-~~~
-HttpServletResponse#sendError
-~~~
- to report error back to client\. It will be 404 or 500 by default (depends on 
exception type)\.
-
-If you need a different type of handling you can implement your own 
-
-~~~
-DispatcherErrorHandler
-~~~
- and register it with Dispatcher using extension point 
-
-~~~
-struts.dispatcher.errorHandler
-~~~
-, see _Plugins_  for how to register your own implementation of internal 
mechanism\.
\ No newline at end of file
+If you need a different type of handling you can implement your own 
`DispatcherErrorHandler` and register it with 
+Dispatcher using extension point `struts.dispatcher.errorHandler`, see 
[Plugins](../plugins-developer-guide/) for how 
+to register your own implementation of internal mechanism.

http://git-wip-us.apache.org/repos/asf/struts-site/blob/faa2f637/source/core-developers/result-configuration.md
--
diff --git a/source/core-developers/result-configuration.md 
b/source/core-developers/result-configuration.md
index 828503c..f06e26a 100644
--- a/source/core-developers/result-configuration.md
+++ b/source/core-developers/result-configuration.md
@@ -4,7 +4,10 @@ title: Result Configuration
 ---
 
 # Result Configuration
+{:.no_toc}
 
+* Will be replaced with the ToC, excluding a header
+{:toc}
 
 When an `action` class method completes, it returns a String. The value of the 
String is used to select a result element. 
 An action mapping will often have a set of results representing different 
possible outcomes. A standard set of result 

http://git-wip-us.apache.org/repos/asf/struts-site/blob/faa2f637/source/core-developers/unknown-handlers.md
--
diff --git a/source/core-developers/unknown-handlers.md 
b/source/core-developers/unknown-handlers.md
index fec6e6c..4e5e57b 100644
--- a/source/core-developers/unknown-handlers.md
+++ b/source/core-developers/unknown-handlers.md
@@ -5,33 +5,23 @@ title: Unknown Handlers
 
 # Unknown Handlers
 
-Unknown Handler stacks are available from Struts 2\.1 on\.
+Unknown Handler stacks are available from Struts 2.1 on.
 
-> 
+## Unknown Handlers
 
-#Unkown Handlers#
-
-Unknown Handlers are classes that implement the 
-
-~~~
-com.opensymphony.xwork2.UnknownHandler
-~~~
- interface, and are called by the framework, when an unknown action, result, 
or method are executed\. To define an unknown handler, create a class 
implementing the mentioned interface, and add a bean definition to your 
struts\.xml:
-
-
-~~~
+Unknown Handlers are classes 

struts git commit: WW-4838 Allows define incompatible improvements as an init-param

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/master 853b44611 -> 68cb702dc


WW-4838 Allows define incompatible improvements as an init-param


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/68cb702d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/68cb702d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/68cb702d

Branch: refs/heads/master
Commit: 68cb702dc8b13eb0e948a59cc3e274206019c642
Parents: 853b446
Author: Lukasz Lenart 
Authored: Wed Aug 23 09:23:23 2017 +0200
Committer: Lukasz Lenart 
Committed: Wed Aug 23 09:23:23 2017 +0200

--
 .../views/freemarker/FreemarkerManager.java   | 18 --
 .../views/freemarker/StrutsBeanWrapper.java   |  4 +++-
 2 files changed, 19 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/68cb702d/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java 
b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
index b1010c3..22a66e5 100644
--- 
a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
+++ 
b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
@@ -314,7 +314,9 @@ public class FreemarkerManager {
  * @throws TemplateException in case of errors during creating the 
configuration
  */
 protected Configuration createConfiguration(ServletContext servletContext) 
throws TemplateException {
-Configuration configuration = new 
Configuration(Configuration.VERSION_2_3_0);
+Version incompatibleImprovements = 
getFreemarkerVersion(servletContext);
+
+Configuration configuration = new 
Configuration(incompatibleImprovements);
 
 
configuration.setTemplateExceptionHandler(TemplateExceptionHandler.HTML_DEBUG_HANDLER);
 
@@ -340,6 +342,17 @@ public class FreemarkerManager {
 return configuration;
 }
 
+protected Version getFreemarkerVersion(ServletContext servletContext) {
+Version incompatibleImprovements = Configuration.VERSION_2_3_0;
+
+String incompatibleImprovementsParam = 
servletContext.getInitParameter("freemarker." + 
Configuration.INCOMPATIBLE_IMPROVEMENTS_KEY_SNAKE_CASE);
+if (incompatibleImprovementsParam != null) {
+incompatibleImprovements = new 
Version(incompatibleImprovementsParam);
+}
+
+return incompatibleImprovements;
+}
+
 
 protected ScopesHashModel buildScopesHashModel(ServletContext 
servletContext, HttpServletRequest request, HttpServletResponse response, 
ObjectWrapper wrapper, ValueStack stack) {
 ScopesHashModel model = new ScopesHashModel(wrapper, servletContext, 
request, stack);
@@ -396,7 +409,8 @@ public class FreemarkerManager {
 }
 
 protected ObjectWrapper createObjectWrapper(ServletContext servletContext) 
{
-StrutsBeanWrapper wrapper = new StrutsBeanWrapper(altMapWrapper);
+Version incompatibleImprovements = 
getFreemarkerVersion(servletContext);
+StrutsBeanWrapper wrapper = new StrutsBeanWrapper(altMapWrapper, 
incompatibleImprovements);
 wrapper.setUseCache(cacheBeanWrapper);
 return wrapper;
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/68cb702d/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java 
b/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
index ad1222f..c9e7eed 100644
--- 
a/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
+++ 
b/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
@@ -33,6 +33,7 @@ import freemarker.template.SimpleSequence;
 import freemarker.template.TemplateCollectionModel;
 import freemarker.template.TemplateHashModelEx;
 import freemarker.template.TemplateModel;
+import freemarker.template.Version;
 
 /**
  * 
@@ -53,7 +54,8 @@ import freemarker.template.TemplateModel;
 public class StrutsBeanWrapper extends BeansWrapper {
 private boolean altMapWrapper;
 
-public StrutsBeanWrapper(boolean altMapWrapper) {
+public StrutsBeanWrapper(boolean altMapWrapper, Version 
incompatibleImprovements) {
+super(incompatibleImprovements);
 this.altMapWrapper = altMapWrapper;
 }