You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@struts.apache.org by lu...@apache.org on 2020/05/03 12:19:19 UTC

[struts] 01/01: Merge pull request #410 from apache/WW-5065-append-or-not-cherry-pick

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 0a5399957674b19d589cd5b1069cfc5491bbdd67
Merge: 12539ed 082d289
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sun May 3 14:19:09 2020 +0200

    Merge pull request #410 from apache/WW-5065-append-or-not-cherry-pick
    
    [WW-5065] Defines a new flag to control appending params - cherry-pick

 .../xwork2/config/impl/AbstractMatcher.java        | 73 ++++++++++++++-------
 .../xwork2/config/impl/ActionConfigMatcher.java    | 28 +++++++-
 .../xwork2/config/impl/DefaultConfiguration.java   | 17 +++--
 .../xwork2/config/impl/NamespaceMatcher.java       | 20 +++++-
 .../providers/XWorkConfigurationProvider.java      |  1 +
 .../java/org/apache/struts2/StrutsConstants.java   |  3 +
 .../config/impl/ActionConfigMatcherTest.java       | 74 ++++++++++++++++++++++
 7 files changed, 184 insertions(+), 32 deletions(-)