[struts] 01/01: Merge pull request #178 from lukaszlenart/text-provider-resurection

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 81a7fdb47fd1c74d2fbc9660509af6ccfdd28813
Merge: e9fe386 d821c27
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 14:33:28 2017 +0200

Merge pull request #178 from lukaszlenart/text-provider-resurection

WW-4884: Allow define just a TextProvider

 .../com/opensymphony/xwork2/StrutsTextProviderFactory.java | 14 ++
 core/src/main/java/org/apache/struts2/StrutsConstants.java |  8 ++--
 .../struts2/config/DefaultBeanSelectionProvider.java   |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .


[struts] branch master updated (e9fe386 -> 81a7fdb)

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.


from e9fe386  Merge pull request #176 from lukaszlenart/multipart-regex
 add afe897a  Deprecates the old extension point and defines a new one
 add 5325f78  Defines a new alias
 add d821c27  Injects user defined provider and uses it if available
 new 81a7fdb  Merge pull request #178 from 
lukaszlenart/text-provider-resurection

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../com/opensymphony/xwork2/StrutsTextProviderFactory.java | 14 ++
 core/src/main/java/org/apache/struts2/StrutsConstants.java |  8 ++--
 .../struts2/config/DefaultBeanSelectionProvider.java   |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].


[struts] branch master updated: WW-4878 Fixes typo and adds missing interceptor

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/master by this push:
 new a443937  WW-4878 Fixes typo and adds missing interceptor
a443937 is described below

commit a4439376b806fa73f96f469315d51ad83591b796
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 15:35:59 2017 +0200

WW-4878 Fixes typo and adds missing interceptor
---
 ...ametersInteceptor.java => ActionMappingParametersInterceptor.java} | 2 +-
 core/src/main/resources/struts-default.xml| 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
 
b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInterceptor.java
similarity index 97%
rename from 
core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
rename to 
core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInterceptor.java
index 32fa671..967f748 100644
--- 
a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
+++ 
b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInterceptor.java
@@ -71,7 +71,7 @@ import java.util.Map;
  * 
  * 
  */
-public class ActionMappingParametersInteceptor extends ParametersInterceptor {
+public class ActionMappingParametersInterceptor extends ParametersInterceptor {
 
 /**
  * @param ac The action context
diff --git a/core/src/main/resources/struts-default.xml 
b/core/src/main/resources/struts-default.xml
index 3c68264..27462a1e 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -221,7 +221,8 @@
 
 
 
-
+
+
 
 
 
@@ -237,6 +238,7 @@
 
 
 
+
 
 
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].


[struts-site] branch master updated: WW-4878 Documents missing interceptors

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/master by this push:
 new ffd3820  WW-4878 Documents missing interceptors
ffd3820 is described below

commit ffd382004950c57dd5578132bdf58e288ce1d56a
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 15:36:17 2017 +0200

WW-4878 Documents missing interceptors
---
 .../annotation-paramter-filter-interceptor.md  | 35 
 .../annotation-workflow-interceptor.md | 62 --
 .../core-developers/clear-session-interceptor.md   | 29 ++
 .../core-developers/cookie-provider-interceptor.md | 48 +
 .../core-developers/create-session-interceptor.md  | 53 --
 source/core-developers/interceptors.md | 25 +
 source/core-developers/logger-interceptor.md   | 40 --
 .../parameter-remover-interceptor.md   | 42 +++
 source/core-developers/parameters-interceptor.md   |  5 +-
 9 files changed, 179 insertions(+), 160 deletions(-)

diff --git a/source/core-developers/annotation-paramter-filter-interceptor.md 
b/source/core-developers/annotation-paramter-filter-interceptor.md
new file mode 100644
index 000..2376cb9
--- /dev/null
+++ b/source/core-developers/annotation-paramter-filter-interceptor.md
@@ -0,0 +1,35 @@
+---
+layout: default
+title: Annotation Parameter Filter Interceptor
+parent:
+title: Interceptors
+url: interceptors.html
+---
+
+# Annotation Parameter Filter Interceptor
+
+Annotation based version of [Parameter Filter 
Interceptor](parameter-filter-interceptor.html).
+
+This interceptor must be placed in the stack before the [Parameters 
Interceptor](parameters-interceptor.html). 
+When a parameter matches a field that is marked {@link Blocked} then it is 
removed from the parameter map.
+
+If an action class is marked with `BlockByDefault` then all parameters are 
removed unless a field on the Action exists 
+and is marked with `Allowed`.
+
+## Parameters
+
+There are no parameters for this interceptor.
+
+## Extending the Interceptor
+
+There are no obvious extensions to the existing interceptor.
+
+## Examples
+
+```xml
+
+
+
+example.jsp
+
+```
diff --git a/source/core-developers/annotation-workflow-interceptor.md 
b/source/core-developers/annotation-workflow-interceptor.md
index 46dcf74..97ef2cc 100644
--- a/source/core-developers/annotation-workflow-interceptor.md
+++ b/source/core-developers/annotation-workflow-interceptor.md
@@ -1,33 +1,26 @@
 ---
-layout: core-developers
-title: AnnotationWorkflowInterceptor
+layout: default
+title: Annotation Workflow Interceptor
+parent:
+title: Interceptors
+url: interceptors.html
 ---
 
-# AnnotationWorkflowInterceptor
+# Annotation Workflow Interceptor
 
-{% comment %}start snippet 
id=javadoc|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor
 {% endcomment %}
- Invokes any annotated methods on the action. Specifically, it supports 
the following
- annotations:
- 
-  @{@link Before} - will be invoked before the action method. If the 
returned value is not null, it is
- returned as the action result code
-  @{@link BeforeResult} - will be invoked after the action method but 
before the result execution
-  @{@link After} - will be invoked after the action method and result 
execution
- 
+Invokes any annotated methods on the action. Specifically, it supports the 
following annotations
+ 
+ - `@Before` - will be invoked before the action method. If the returned value 
is not null, it is returned as the action 
+   result code
+ - @`BeforeResult` - will be invoked after the action method but before the 
result execution
+ - `@After` - will be invoked after the action method and result execution
 
- There can be multiple methods marked with the same annotations, but the 
order of their execution
- is not guaranteed. However, the annotated methods on the superclass chain are 
guaranteed to be invoked before the
- annotated method in the current class in the case of a {@link Before} 
annotations and after, if the annotations is
- {@link After}.
-
-{% comment %}end snippet 
id=javadoc|javadoc=true|url=com.opensymphony.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor
 {% endcomment %}
+There can be multiple methods marked with the same annotations, but the order 
of their execution is not guaranteed. 
+However, the annotated methods on the superclass chain are guaranteed to be 
invoked before the annotated method in the current 
+class in the case of a {@link Before} annotations and after, if the 
annotations is `After`
 
 ## Examples
 
-
-
-{% comment %}start snippet 
id=javacode|javadoc=true|lang=java|url=com.opensymphony.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor
 {% endcomment %}
-
 ```java
   public

[struts-site] branch asf-site updated: Updates production by Jenkins

2017-10-27 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 69a82c9  Updates production by Jenkins
69a82c9 is described below

commit 69a82c9e1d41433449ad2a7065fae8f15c41b0dd
Author: jenkins 
AuthorDate: Fri Oct 27 13:37:40 2017 +

Updates production by Jenkins
---
 ...=> annotation-paramter-filter-interceptor.html} |  58 +---
 .../annotation-workflow-interceptor.html   |  67 +++---
 ...rceptor.html => clear-session-interceptor.html} |  47 --
 .../cookie-provider-interceptor.html   |  37 
 .../create-session-interceptor.html|  37 ++--
 content/core-developers/default-properties.html|   2 -
 content/core-developers/interceptors.html  | 100 -
 content/core-developers/logger-interceptor.html|  24 +++--
 ...tor.html => parameter-remover-interceptor.html} |  67 +++---
 .../core-developers/parameters-interceptor.html|   4 +-
 content/core-developers/struts-default-xml.html|   6 +-
 content/core-developers/validation.html|  20 +
 content/tag-developers/css-xhtml-theme.html|   8 --
 content/tag-developers/simple-theme.html   |   2 -
 content/tag-developers/xhtml-theme.html|  18 
 15 files changed, 219 insertions(+), 278 deletions(-)

diff --git a/content/core-developers/create-session-interceptor.html 
b/content/core-developers/annotation-paramter-filter-interceptor.html
similarity index 80%
copy from content/core-developers/create-session-interceptor.html
copy to content/core-developers/annotation-paramter-filter-interceptor.html
index 9810e99..a5256d9 100644
--- a/content/core-developers/create-session-interceptor.html
+++ b/content/core-developers/annotation-paramter-filter-interceptor.html
@@ -7,7 +7,7 @@
   
   
 
-  Create Session Interceptor
+  Annotation Parameter Filter Interceptor
 
   
   
@@ -125,54 +125,38 @@
 
 
   
-<< back to Core 
Developers Guide
-https://github.com/apache/struts-site/edit/master/source/core-developers/create-session-interceptor.md";
 title="Edit this page on GitHub">Edit on GitHub
-Create Session Interceptor
-
-
- 
- This interceptor creates the HttpSession if it doesn't exist, also SessionMap 
is recreated and put in ServletActionContext.
- 
-
- 
- This is particular useful when using the <@s.token> tag in freemarker 
templates.
- The tag do require that a HttpSession is already created since 
freemarker commits
- the response to the client immediately.
- 
-
+https://github.com/apache/struts-site/edit/master/source/core-developers/annotation-paramter-filter-interceptor.md";
 title="Edit this page on GitHub">Edit on GitHub
+
+<< back to 
Interceptors
+
+Annotation Parameter 
Filter Interceptor
 
-Parameters
-
-
- 
- None
- 
+Annotation based version of Parameter Filter Interceptor.
 
-
+This interceptor must be placed in the stack before the Parameters Interceptor. 
+When a parameter matches a field that is marked {@link Blocked} then it is 
removed from the parameter map.
 
-Extending the Interceptor
+If an action class is marked with BlockByDefault then all parameters are removed 
unless a field on the Action exists 
+and is marked with Allowed.
 
-
- 
-  None
- 
+Parameters
 
-
+There are no parameters for this interceptor.
 
-Examples
+Extending the Interceptor
 
-
- 
- 
- 
- input_with_token_tag.ftl
- 
+There are no obvious extensions to the existing interceptor.
 
+Examples
 
+
+
+
+example.jsp
+
 
 
 
-
   
 
 
diff --git a/content/core-developers/annotation-workflow-interceptor.html 
b/content/core-developers/annotation-workflow-interceptor.html
index 3638a25..7f0261b 100644
--- a/content/core-developers/annotation-workflow-interceptor.html
+++ b/content/core-developers/annotation-workflow-interceptor.html
@@ -7,7 +7,7 @@
   
   
 
-  AnnotationWorkflowInterceptor
+  Annotation Workflow Interceptor
 
   
   
@@ -125,24 +125,24 @@
 
 
   
-<< back to Core 
Developers Guide
 https://github.com/apache/struts-site/edit/master/source/core-developers/annotation-workflow-interceptor.md";
 title="Edit this page on GitHub">Edit on GitHub
-AnnotationWorkflowInterceptor
-
- Invokes any annotated methods on the action. Specifically, it supports 
the following
- annotations:
- 
-  @{@link Before} - will be invoked before the action method. If the 
returned value is not null, i

[struts-site] 01/04: Fixes file name

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit 5fbd53630af92ffa67c9a2ef9b84f44883cbb4ec
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 15:49:27 2017 +0200

Fixes file name
---
 ...r-filter-interceptor.md => annotation-parameter-filter-interceptor.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/source/core-developers/annotation-paramter-filter-interceptor.md 
b/source/core-developers/annotation-parameter-filter-interceptor.md
similarity index 100%
rename from source/core-developers/annotation-paramter-filter-interceptor.md
rename to source/core-developers/annotation-parameter-filter-interceptor.md

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .


[struts-site] 03/04: Uses proper code style

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit 36ad4d21fd8ff9b06784db834b8269e63d3ca80e
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 15:50:27 2017 +0200

Uses proper code style
---
 source/core-developers/annotation-workflow-interceptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/core-developers/annotation-workflow-interceptor.md 
b/source/core-developers/annotation-workflow-interceptor.md
index 31a94a7..38c8cd3 100644
--- a/source/core-developers/annotation-workflow-interceptor.md
+++ b/source/core-developers/annotation-workflow-interceptor.md
@@ -17,7 +17,7 @@ Invokes any annotated methods on the action. Specifically, it 
supports the follo
 
 There can be multiple methods marked with the same annotations, but the order 
of their execution is not guaranteed. 
 However, the annotated methods on the superclass chain are guaranteed to be 
invoked before the annotated method in the current 
-class in the case of a {@link Before} annotations and after, if the 
annotations is `After`
+class in the case of a `@Before` annotations and after, if the annotations is 
`@After`.
 
 ## Examples
 

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .


[struts-site] branch master updated (ffd3820 -> 1c8bdd7)

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git.


from ffd3820  WW-4878 Documents missing interceptors
 new 5fbd536  Fixes file name
 new 8ebf493  Fixes small typo
 new 36ad4d2  Uses proper code style
 new 1c8bdd7  Cleans up all interceptors' pages

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 source/core-developers/alias-interceptor.md|  54 ++
 ... => annotation-parameter-filter-interceptor.md} |   0
 .../annotation-workflow-interceptor.md |   4 +-
 source/core-developers/chaining-interceptor.md | 116 -
 source/core-developers/checkbox-interceptor.md |  65 ++--
 .../conversion-error-interceptor.md|  80 ++---
 source/core-developers/cookie-interceptor.md   | 112 -
 source/core-developers/debugging-interceptor.md|  60 ++-
 .../default-workflow-interceptor.md| 105 
 source/core-developers/exception-interceptor.md|  84 +++---
 .../execute-and-wait-interceptor.md| 116 +
 source/core-developers/file-upload-interceptor.md  | 143 
 source/core-developers/i18n-interceptor.md |  41 +++--
 source/core-developers/interceptors.md |  10 +-
 ...ogger-interceptor.md => logging-interceptor.md} |   0
 .../core-developers/message-store-interceptor.md   |  81 -
 source/core-developers/model-driven-interceptor.md |   5 +-
 source/core-developers/multiselect-interceptor.md  |  39 ++---
 source/core-developers/no-op-interceptor.md|  19 +--
 .../parameter-filter-interceptor.md|  77 +++--
 source/core-developers/prepare-interceptor.md  |  98 +++
 source/core-developers/roles-interceptor.md|  45 ++---
 source/core-developers/scope-interceptor.md| 181 -
 .../scoped-model-driven-interceptor.md |  59 ++-
 .../core-developers/servlet-config-interceptor.md  |  85 +++---
 .../static-parameters-interceptor.md   |  49 ++
 source/core-developers/timer-interceptor.md|  52 ++
 source/core-developers/token-interceptor.md|  88 +++---
 .../core-developers/token-session-interceptor.md   |  63 ++-
 source/core-developers/validation-interceptor.md   |  89 +++---
 30 files changed, 576 insertions(+), 1444 deletions(-)
 rename source/core-developers/{annotation-paramter-filter-interceptor.md => 
annotation-parameter-filter-interceptor.md} (100%)
 rename source/core-developers/{logger-interceptor.md => 
logging-interceptor.md} (100%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].


[struts-site] 02/04: Fixes small typo

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit 8ebf493365c7d9b011feed94fa393dce60b9b403
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 15:49:53 2017 +0200

Fixes small typo
---
 source/core-developers/annotation-workflow-interceptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/core-developers/annotation-workflow-interceptor.md 
b/source/core-developers/annotation-workflow-interceptor.md
index 97ef2cc..31a94a7 100644
--- a/source/core-developers/annotation-workflow-interceptor.md
+++ b/source/core-developers/annotation-workflow-interceptor.md
@@ -12,7 +12,7 @@ Invokes any annotated methods on the action. Specifically, it 
supports the follo
  
  - `@Before` - will be invoked before the action method. If the returned value 
is not null, it is returned as the action 
result code
- - @`BeforeResult` - will be invoked after the action method but before the 
result execution
+ - `@BeforeResult` - will be invoked after the action method but before the 
result execution
  - `@After` - will be invoked after the action method and result execution
 
 There can be multiple methods marked with the same annotations, but the order 
of their execution is not guaranteed. 

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .


[struts-site] 04/04: Cleans up all interceptors' pages

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit 1c8bdd73337e6bf501d7c812401966137c11
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 17:38:09 2017 +0200

Cleans up all interceptors' pages
---
 source/core-developers/alias-interceptor.md|  54 ++
 source/core-developers/chaining-interceptor.md | 116 -
 source/core-developers/checkbox-interceptor.md |  65 ++--
 .../conversion-error-interceptor.md|  80 ++---
 source/core-developers/cookie-interceptor.md   | 112 -
 source/core-developers/debugging-interceptor.md|  60 ++-
 .../default-workflow-interceptor.md| 105 
 source/core-developers/exception-interceptor.md|  84 +++---
 .../execute-and-wait-interceptor.md| 116 +
 source/core-developers/file-upload-interceptor.md  | 143 
 source/core-developers/i18n-interceptor.md |  41 +++--
 source/core-developers/interceptors.md |  10 +-
 ...ogger-interceptor.md => logging-interceptor.md} |   0
 .../core-developers/message-store-interceptor.md   |  81 -
 source/core-developers/model-driven-interceptor.md |   5 +-
 source/core-developers/multiselect-interceptor.md  |  39 ++---
 source/core-developers/no-op-interceptor.md|  19 +--
 .../parameter-filter-interceptor.md|  77 +++--
 source/core-developers/prepare-interceptor.md  |  98 +++
 source/core-developers/roles-interceptor.md|  45 ++---
 source/core-developers/scope-interceptor.md| 181 -
 .../scoped-model-driven-interceptor.md |  59 ++-
 .../core-developers/servlet-config-interceptor.md  |  85 +++---
 .../static-parameters-interceptor.md   |  49 ++
 source/core-developers/timer-interceptor.md|  52 ++
 source/core-developers/token-interceptor.md|  88 +++---
 .../core-developers/token-session-interceptor.md   |  63 ++-
 source/core-developers/validation-interceptor.md   |  89 +++---
 28 files changed, 574 insertions(+), 1442 deletions(-)

diff --git a/source/core-developers/alias-interceptor.md 
b/source/core-developers/alias-interceptor.md
index a49718a..1940fc9 100644
--- a/source/core-developers/alias-interceptor.md
+++ b/source/core-developers/alias-interceptor.md
@@ -1,59 +1,30 @@
 ---
-layout: core-developers
+layout: default
 title: Alias Interceptor
+parent:
+title: Interceptors
+url: interceptors.html
 ---
 
 # Alias Interceptor
 
+The aim of this Interceptor is to alias a named parameter to a different named 
parameter. By acting as the glue between 
+actions sharing similar parameters (but with different names), it can help 
greatly with action chaining.
 
-
-{% comment %}start snippet 
id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.AliasInterceptor
 {% endcomment %}
-
- The aim of this Interceptor is to alias a named parameter to a different 
named parameter. By acting as the glue
- between actions sharing similar parameters (but with different names), it can 
help greatly with action chaining.
-
- Action's alias expressions should be in the form of  #{ "name1" : 
"alias1", "name2" : "alias2" }.
- This means that assuming an action (or something else in the stack) has a 
value for the expression named name1 and the
- action this interceptor is applied to has a setter named alias1, 
alias1 will be set with the value from
- name1.
- 
-
-
-{% comment %}end snippet 
id=description|javadoc=true|url=com.opensymphony.xwork2.interceptor.AliasInterceptor
 {% endcomment %}
+Action's alias expressions should be in the form of `#{ "name1" : "alias1", 
"name2" : "alias2" }`. This means that assuming 
+an action (or something else in the stack) has a value for the expression 
named `name1` and the action this interceptor 
+is applied to has a setter named `alias1`, `alias1` will be set with the value 
from `name1`.
 
 ## Parameters
 
-
-
-{% comment %}start snippet 
id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.AliasInterceptor
 {% endcomment %}
-
- 
-
- aliasesKey (optional) - the name of the action parameter to look for the 
alias map (by default this is
- aliases).
-
- 
-
-
-{% comment %}end snippet 
id=parameters|javadoc=true|url=com.opensymphony.xwork2.interceptor.AliasInterceptor
 {% endcomment %}
+ - `aliasesKey` (optional) - the name of the action parameter to look for the 
alias map (by default this is aliases
 
 ## Extending the Interceptor
 
-
-
-{% comment %}start snippet 
id=extending|javadoc=true|url=com.opensymphony.xwork2.interceptor.AliasInterceptor
 {% endcomment %}
-
- This interceptor does not have any known extension points.
-
-
-{% comment %}end snippet 
id=extending|javadoc=true|url=com.opensymphony.xwork2.interceptor.AliasIntercepto

[struts-site] branch master updated (1c8bdd7 -> 29b7bec)

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git.


from 1c8bdd7  Cleans up all interceptors' pages
 new 47d4677  Adds ToC
 new 29b7bec  Fixes a wrong title of the back link

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 source/core-developers/chain-result.md   | 2 +-
 source/core-developers/dispatcher-result.md  | 2 +-
 source/core-developers/freemarker-result.md  | 2 +-
 source/core-developers/httpheader-result.md  | 2 +-
 source/core-developers/interceptors.md   | 2 +-
 source/core-developers/plaintext-result.md   | 2 +-
 source/core-developers/redirect-action-result.md | 2 +-
 source/core-developers/redirect-result.md| 2 +-
 source/core-developers/stream-result.md  | 2 +-
 source/core-developers/validation.md | 9 -
 source/core-developers/xsl-result.md | 2 +-
 11 files changed, 18 insertions(+), 11 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].


[struts-site] 02/02: Fixes a wrong title of the back link

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit 29b7bec64781de3767f1afeb774e514e673208d4
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 17:45:56 2017 +0200

Fixes a wrong title of the back link
---
 source/core-developers/chain-result.md   | 2 +-
 source/core-developers/dispatcher-result.md  | 2 +-
 source/core-developers/freemarker-result.md  | 2 +-
 source/core-developers/httpheader-result.md  | 2 +-
 source/core-developers/interceptors.md   | 2 +-
 source/core-developers/plaintext-result.md   | 2 +-
 source/core-developers/redirect-action-result.md | 2 +-
 source/core-developers/redirect-result.md| 2 +-
 source/core-developers/stream-result.md  | 2 +-
 source/core-developers/xsl-result.md | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/core-developers/chain-result.md 
b/source/core-developers/chain-result.md
index 03068a3..b25a4ec 100644
--- a/source/core-developers/chain-result.md
+++ b/source/core-developers/chain-result.md
@@ -2,7 +2,7 @@
 layout: default
 title: Chain Result
 parent:
-title: Core Developer Guide
+title: Core Developers Guide
 url: index.html
 ---
 
diff --git a/source/core-developers/dispatcher-result.md 
b/source/core-developers/dispatcher-result.md
index bae8a6a..9073b00 100644
--- a/source/core-developers/dispatcher-result.md
+++ b/source/core-developers/dispatcher-result.md
@@ -2,7 +2,7 @@
 layout: default
 title: Dispatcher Result
 parent:
-title: Core Developer Guide
+title: Core Developers Guide
 url: index.html
 ---
 
diff --git a/source/core-developers/freemarker-result.md 
b/source/core-developers/freemarker-result.md
index d87f77c..5e8808d 100644
--- a/source/core-developers/freemarker-result.md
+++ b/source/core-developers/freemarker-result.md
@@ -2,7 +2,7 @@
 layout: default
 title: FreeMarker Result
 parent:
-title: Core Developer Guide
+title: Core Developers Guide
 url: index.html
 ---
 
diff --git a/source/core-developers/httpheader-result.md 
b/source/core-developers/httpheader-result.md
index 8621e1e..eaa1234 100644
--- a/source/core-developers/httpheader-result.md
+++ b/source/core-developers/httpheader-result.md
@@ -2,7 +2,7 @@
 layout: default
 title: HttpHeader Result
 parent:
-title: Core Developer Guide
+title: Core Developers Guide
 url: index.html
 ---
 
diff --git a/source/core-developers/interceptors.md 
b/source/core-developers/interceptors.md
index 45df0bf..866dc03 100644
--- a/source/core-developers/interceptors.md
+++ b/source/core-developers/interceptors.md
@@ -2,7 +2,7 @@
 layout: core-developers
 title: Interceptors
 parent:
-title: Core Developer Guide
+title: Core Developers Guide
 url: index.html
 ---
 
diff --git a/source/core-developers/plaintext-result.md 
b/source/core-developers/plaintext-result.md
index a2242ad..678cadd 100644
--- a/source/core-developers/plaintext-result.md
+++ b/source/core-developers/plaintext-result.md
@@ -2,7 +2,7 @@
 layout: default
 title: PlainText Result
 parent:
-title: Core Developer Guide
+title: Core Developers Guide
 url: index.html
 ---
 
diff --git a/source/core-developers/redirect-action-result.md 
b/source/core-developers/redirect-action-result.md
index 1200fcc..e766abe 100644
--- a/source/core-developers/redirect-action-result.md
+++ b/source/core-developers/redirect-action-result.md
@@ -2,7 +2,7 @@
 layout: default
 title: Redirect Action Result
 parent:
-title: Core Developer Guide
+title: Core Developers Guide
 url: index.html
 ---
 
diff --git a/source/core-developers/redirect-result.md 
b/source/core-developers/redirect-result.md
index d1e633d..82adde1 100644
--- a/source/core-developers/redirect-result.md
+++ b/source/core-developers/redirect-result.md
@@ -2,7 +2,7 @@
 layout: default
 title: Redirect Result
 parent:
-title: Core Developer Guide
+title: Core Developers Guide
 url: index.html
 ---
 
diff --git a/source/core-developers/stream-result.md 
b/source/core-developers/stream-result.md
index cac1460..424c1fd 100644
--- a/source/core-developers/stream-result.md
+++ b/source/core-developers/stream-result.md
@@ -2,7 +2,7 @@
 layout: default
 title: Stream Result
 parent:
-title: Core Developer Guide
+title: Core Developers Guide
 url: index.html
 ---
 
diff --git a/source/core-developers/xsl-result.md 
b/source/core-developers/xsl-result.md
index 27ca532..fd537e6 100644
--- a/source/core-developers/xsl-result.md
+++ b/source/core-developers/xsl-result.md
@@ -2,7 +2,7 @@
 layout: default
 title: XSL Result
 parent:
-title: Core Developer Guide
+title: Core Developers Guide
 url: index.html
 ---
 

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .


[struts-site] 01/02: Adds ToC

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit 47d4677aed54d5238ec536a922ba8b132d8f61f3
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 17:45:24 2017 +0200

Adds ToC
---
 source/core-developers/validation.md | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/source/core-developers/validation.md 
b/source/core-developers/validation.md
index 37d1cc2..102d841 100644
--- a/source/core-developers/validation.md
+++ b/source/core-developers/validation.md
@@ -1,9 +1,16 @@
 ---
-layout: core-developers
+layout: default
 title: Validation
+parent:
+title: Core Developers Guide
+url: index.html
 ---
 
 # Validation
+{:.no_toc}
+
+* Will be replaced with the ToC, excluding a header
+{:toc}
 
 Struts 2 validation is configured via XML or annotations. Manual validation in 
the action is also possible, and may be 
 combined with XML and annotation-driven validation.

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .


[struts-site] branch asf-site updated: Updates production by Jenkins

2017-10-27 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 5468506  Updates production by Jenkins
5468506 is described below

commit 546850642df03c7a42c4bc9e17921e1091f523b2
Author: jenkins 
AuthorDate: Fri Oct 27 15:46:40 2017 +

Updates production by Jenkins
---
 content/core-developers/chain-result.html  |  2 +-
 content/core-developers/dispatcher-result.html |  2 +-
 content/core-developers/freemarker-result.html |  2 +-
 content/core-developers/httpheader-result.html |  2 +-
 content/core-developers/plaintext-result.html  |  2 +-
 .../core-developers/redirect-action-result.html|  2 +-
 content/core-developers/redirect-result.html   |  2 +-
 content/core-developers/stream-result.html |  2 +-
 content/core-developers/validation.html| 24 --
 content/core-developers/xsl-result.html|  2 +-
 10 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/content/core-developers/chain-result.html 
b/content/core-developers/chain-result.html
index efe9920..0904f9c 100644
--- a/content/core-developers/chain-result.html
+++ b/content/core-developers/chain-result.html
@@ -127,7 +127,7 @@
   
 https://github.com/apache/struts-site/edit/master/source/core-developers/chain-result.md";
 title="Edit this page on GitHub">Edit on GitHub
 
-<< back to Core 
Developer Guide
+<< back to Core 
Developers Guide
 
 Chain Result
 
diff --git a/content/core-developers/dispatcher-result.html 
b/content/core-developers/dispatcher-result.html
index 5ea5310..113c91b 100644
--- a/content/core-developers/dispatcher-result.html
+++ b/content/core-developers/dispatcher-result.html
@@ -127,7 +127,7 @@
   
 https://github.com/apache/struts-site/edit/master/source/core-developers/dispatcher-result.md";
 title="Edit this page on GitHub">Edit on GitHub
 
-<< back to Core 
Developer Guide
+<< back to Core 
Developers Guide
 
 Dispatcher Result
 
diff --git a/content/core-developers/freemarker-result.html 
b/content/core-developers/freemarker-result.html
index 3e849a9..1de4a68 100644
--- a/content/core-developers/freemarker-result.html
+++ b/content/core-developers/freemarker-result.html
@@ -127,7 +127,7 @@
   
 https://github.com/apache/struts-site/edit/master/source/core-developers/freemarker-result.md";
 title="Edit this page on GitHub">Edit on GitHub
 
-<< back to Core 
Developer Guide
+<< back to Core 
Developers Guide
 
 FreeMarker Result
 
diff --git a/content/core-developers/httpheader-result.html 
b/content/core-developers/httpheader-result.html
index 3d5dca1..9350acf 100644
--- a/content/core-developers/httpheader-result.html
+++ b/content/core-developers/httpheader-result.html
@@ -127,7 +127,7 @@
   
 https://github.com/apache/struts-site/edit/master/source/core-developers/httpheader-result.md";
 title="Edit this page on GitHub">Edit on GitHub
 
-<< back to Core 
Developer Guide
+<< back to Core 
Developers Guide
 
 HttpHeader Result
 
diff --git a/content/core-developers/plaintext-result.html 
b/content/core-developers/plaintext-result.html
index 75e7560..489bb73 100644
--- a/content/core-developers/plaintext-result.html
+++ b/content/core-developers/plaintext-result.html
@@ -127,7 +127,7 @@
   
 https://github.com/apache/struts-site/edit/master/source/core-developers/plaintext-result.md";
 title="Edit this page on GitHub">Edit on GitHub
 
-<< back to Core 
Developer Guide
+<< back to Core 
Developers Guide
 
 PlainText Result
 
diff --git a/content/core-developers/redirect-action-result.html 
b/content/core-developers/redirect-action-result.html
index a4525fd..ffd279a 100644
--- a/content/core-developers/redirect-action-result.html
+++ b/content/core-developers/redirect-action-result.html
@@ -127,7 +127,7 @@
   
 https://github.com/apache/struts-site/edit/master/source/core-developers/redirect-action-result.md";
 title="Edit this page on GitHub">Edit on GitHub
 
-<< back to Core 
Developer Guide
+<< back to Core 
Developers Guide
 
 Redirect Action Result
 
diff --git a/content/core-developers/redirect-result.html 
b/content/core-developers/redirect-result.html
index aa9190a..35e2c8e 100644
--- a/content/core-developers/redirect-result.html
+++ b/content/core-developers/redirect-result.html
@@ -127,7 +127,7 @@
   
 https://github.com/apache/struts-site/edit/master/source/core-developers/redirect-result.md";
 title="Edit this page on GitHub">Edit on GitHub
 
-<< back to Core 
Developer Guide
+<< back to Core 
Developers Guide
 
 Redirect Result
 
diff --git a/content/core-developers/stream-result.html 
b/content/core-developers/stream-result.html
index a34288f..434958e

[struts-site] branch master updated: Drops links to old docs and adds proper redirects

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/master by this push:
 new 68876f8  Drops links to old docs and adds proper redirects
68876f8 is described below

commit 68876f87626b462db170bd62c344f3b6854d0630
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 18:15:14 2017 +0200

Drops links to old docs and adds proper redirects
---
 source/.htaccess | 18 +-
 source/_includes/header.html |  8 +---
 source/docs/index.md | 28 
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/source/.htaccess b/source/.htaccess
index f8a2f2f..c5d94cc 100644
--- a/source/.htaccess
+++ b/source/.htaccess
@@ -1,6 +1,14 @@
-# This file is maintained at 
https://git-wip-us.apache.org/repos/asf?p=struts-site.git
-DirectoryIndex index.html home.html
+# This file is maintained at 
https://gitbox.apache.org/repos/asf?p=struts-site.git
+DirectoryIndex index.html
 
-RedirectMatch \/2.*\/docs\/(.*)?http://struts.apache.org/docs/$1
-RedirectMatch \/release\/2.*\/(.*)? http://struts.apache.org/$1
-RedirectMatch \/2.*\/(.*)?  http://struts.apache.org/$1
+RedirectMatch \/docs\/version\-notes\-25([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.$1
+RedirectMatch \/docs\/version\-notes\-23([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.3.$1
+RedirectMatch \/docs\/version\-notes\-22([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.2.$1
+RedirectMatch \/docs\/version\-notes\-21([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.1.$1
+RedirectMatch \/docs\/version\-notes\-20([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.0.$1
+
+RedirectMatch \/docs\/s2-0([0-9]{2}).html 
https://cwiki.apache.org/confluence/display/WW/Security+Bulletin+S2-0$1
+
+RedirectMatch \/2.*\/docs\/(.*)?
http://struts.apache.org/docs/$1
+RedirectMatch \/release\/2.*\/(.*)? http://struts.apache.org/$1
+RedirectMatch \/2.*\/(.*)?  http://struts.apache.org/$1
diff --git a/source/_includes/header.html b/source/_includes/header.html
index c488add..54ebed2 100644
--- a/source/_includes/header.html
+++ b/source/_includes/header.html
@@ -61,15 +61,9 @@
 Tag Developers Guide
 Maven Archetypes
 Plugins
-
 Struts 
Core API
-Plugin APIs
-Tag reference
+Tag 
reference
 http://cwiki.apache.org/S2PLUGINS/home.html";>Plugin registry
-
-Tutorials - 
DEPRECATED
-FAQs - DEPRECATED
-Guides - DEPRECATED
   
 
 
diff --git a/source/docs/index.md b/source/docs/index.md
new file mode 100644
index 000..aea2560
--- /dev/null
+++ b/source/docs/index.md
@@ -0,0 +1,28 @@
+---
+layout: default
+title: Old docs
+---
+
+# Old docs
+[Edit on GitHub]({{ site.repository_url }}/edit/master/source/{{ page.path 
}}){: .edit-on-gh title="Edit this page on GitHub"}
+
+The [old docs](https://cwiki.apache.org/confluence/display/WW/) are still 
available for reference on our wiki. We have migrated 
+all of them to Markdown and are hosted directly in 
[struts-site](https://gitbox.apache.org/repos/asf?p=struts-site.git)
+repo.
+
+Please follow the links below to find appropriate content:
+ 
+ - [Getting Started](../getting-started/)
+ - [Security Guide](../security/)
+ - [Core Developers Guide](../core-developers/)
+ - [Tag Developers Guide](../tag-developers/)
+ - [Maven Archetypes](../maven-archetypes/)
+ - [Plugins](../plugins/)
+
+There are still some pages hosted on wiki:
+
+ - [Version 
Notes](https://cwiki.apache.org/confluence/display/WW/Migration+Guide)
+ - [Security 
Bulletins](https://cwiki.apache.org/confluence/display/WW/Security+Bulletins)
+ - [Architects 
Guide](https://cwiki.apache.org/confluence/display/WW/Architects+Guide)
+ - [Contributors 
Guide](https://cwiki.apache.org/confluence/display/WW/Contributors+Guide)
+ - [FAQs](https://cwiki.apache.org/confluence/display/WW/FAQs)

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].


[struts-site] branch asf-site updated: Updates redirects

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new f8b9e99  Updates redirects
f8b9e99 is described below

commit f8b9e9958f0ed1acfad2eec8567bab571d6f94c9
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 18:27:54 2017 +0200

Updates redirects
---
 content/.htaccess | 18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/content/.htaccess b/content/.htaccess
index f8a2f2f..c5d94cc 100644
--- a/content/.htaccess
+++ b/content/.htaccess
@@ -1,6 +1,14 @@
-# This file is maintained at 
https://git-wip-us.apache.org/repos/asf?p=struts-site.git
-DirectoryIndex index.html home.html
+# This file is maintained at 
https://gitbox.apache.org/repos/asf?p=struts-site.git
+DirectoryIndex index.html
 
-RedirectMatch \/2.*\/docs\/(.*)?http://struts.apache.org/docs/$1
-RedirectMatch \/release\/2.*\/(.*)? http://struts.apache.org/$1
-RedirectMatch \/2.*\/(.*)?  http://struts.apache.org/$1
+RedirectMatch \/docs\/version\-notes\-25([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.$1
+RedirectMatch \/docs\/version\-notes\-23([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.3.$1
+RedirectMatch \/docs\/version\-notes\-22([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.2.$1
+RedirectMatch \/docs\/version\-notes\-21([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.1.$1
+RedirectMatch \/docs\/version\-notes\-20([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.0.$1
+
+RedirectMatch \/docs\/s2-0([0-9]{2}).html 
https://cwiki.apache.org/confluence/display/WW/Security+Bulletin+S2-0$1
+
+RedirectMatch \/2.*\/docs\/(.*)?
http://struts.apache.org/docs/$1
+RedirectMatch \/release\/2.*\/(.*)? http://struts.apache.org/$1
+RedirectMatch \/2.*\/(.*)?  http://struts.apache.org/$1

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].


[struts-site] branch asf-site updated: Updates redirect to Security Bulletins

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new cbd7a3c  Updates redirect to Security Bulletins
cbd7a3c is described below

commit cbd7a3cfc94845d811aaed574dbd10e54ecf9d6d
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 18:29:53 2017 +0200

Updates redirect to Security Bulletins
---
 content/.htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/.htaccess b/content/.htaccess
index c5d94cc..505c87c 100644
--- a/content/.htaccess
+++ b/content/.htaccess
@@ -7,7 +7,7 @@ RedirectMatch \/docs\/version\-notes\-22([0-9]{1,2})+\.html   
https://cwiki.apac
 RedirectMatch \/docs\/version\-notes\-21([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.1.$1
 RedirectMatch \/docs\/version\-notes\-20([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.0.$1
 
-RedirectMatch \/docs\/s2-0([0-9]{2}).html 
https://cwiki.apache.org/confluence/display/WW/Security+Bulletin+S2-0$1
+RedirectMatch \/docs\/s2-0([0-9]{2}).html 
https://cwiki.apache.org/confluence/display/WW/S2-0$1
 
 RedirectMatch \/2.*\/docs\/(.*)?
http://struts.apache.org/docs/$1
 RedirectMatch \/release\/2.*\/(.*)? http://struts.apache.org/$1

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].


[struts-site] 01/02: Adds proper redirect to Security Guides

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit a1875db9c23f367f1d902154f0b1f4e2b0b36404
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 18:31:57 2017 +0200

Adds proper redirect to Security Guides
---
 source/.htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/.htaccess b/source/.htaccess
index c5d94cc..505c87c 100644
--- a/source/.htaccess
+++ b/source/.htaccess
@@ -7,7 +7,7 @@ RedirectMatch \/docs\/version\-notes\-22([0-9]{1,2})+\.html   
https://cwiki.apac
 RedirectMatch \/docs\/version\-notes\-21([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.1.$1
 RedirectMatch \/docs\/version\-notes\-20([0-9]{1,2})+\.html   
https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.0.$1
 
-RedirectMatch \/docs\/s2-0([0-9]{2}).html 
https://cwiki.apache.org/confluence/display/WW/Security+Bulletin+S2-0$1
+RedirectMatch \/docs\/s2-0([0-9]{2}).html 
https://cwiki.apache.org/confluence/display/WW/S2-0$1
 
 RedirectMatch \/2.*\/docs\/(.*)?
http://struts.apache.org/docs/$1
 RedirectMatch \/release\/2.*\/(.*)? http://struts.apache.org/$1

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .


[struts-site] branch master updated (68876f8 -> f9ee640)

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git.


from 68876f8  Drops links to old docs and adds proper redirects
 new a1875db  Adds proper redirect to Security Guides
 new f9ee640  Adds redirects for plugins

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 source/.htaccess | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].


[struts-site] 02/02: Adds redirects for plugins

2017-10-27 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit f9ee64067febd86a8a43abd512fadedfc0b8bb91
Author: Lukasz Lenart 
AuthorDate: Fri Oct 27 18:37:00 2017 +0200

Adds redirects for plugins
---
 source/.htaccess | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/.htaccess b/source/.htaccess
index 505c87c..90b4503 100644
--- a/source/.htaccess
+++ b/source/.htaccess
@@ -9,6 +9,8 @@ RedirectMatch \/docs\/version\-notes\-20([0-9]{1,2})+\.html   
https://cwiki.apac
 
 RedirectMatch \/docs\/s2-0([0-9]{2}).html 
https://cwiki.apache.org/confluence/display/WW/S2-0$1
 
+RedirectMatch \/docs\/([a-zA-Z]+)-plugin\.html
http://struts.apache.org/plugins/$1/
+
 RedirectMatch \/2.*\/docs\/(.*)?
http://struts.apache.org/docs/$1
 RedirectMatch \/release\/2.*\/(.*)? http://struts.apache.org/$1
 RedirectMatch \/2.*\/(.*)?  http://struts.apache.org/$1

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .


[struts-site] branch asf-site updated: Updates production by Jenkins

2017-10-27 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 9556fcd  Updates production by Jenkins
9556fcd is described below

commit 9556fcd9ec01c920008adeb39e16778b68fa0a6c
Author: jenkins 
AuthorDate: Fri Oct 27 16:39:40 2017 +

Updates production by Jenkins
---
 content/.htaccess | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/content/.htaccess b/content/.htaccess
index 505c87c..90b4503 100644
--- a/content/.htaccess
+++ b/content/.htaccess
@@ -9,6 +9,8 @@ RedirectMatch \/docs\/version\-notes\-20([0-9]{1,2})+\.html   
https://cwiki.apac
 
 RedirectMatch \/docs\/s2-0([0-9]{2}).html 
https://cwiki.apache.org/confluence/display/WW/S2-0$1
 
+RedirectMatch \/docs\/([a-zA-Z]+)-plugin\.html
http://struts.apache.org/plugins/$1/
+
 RedirectMatch \/2.*\/docs\/(.*)?
http://struts.apache.org/docs/$1
 RedirectMatch \/release\/2.*\/(.*)? http://struts.apache.org/$1
 RedirectMatch \/2.*\/(.*)?  http://struts.apache.org/$1

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].