[3/3] struts git commit: WW-4696 Upgrades to Log4j 2.7

2016-10-07 Thread lukaszlenart 
WW-4696 Upgrades to Log4j 2.7


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

Branch: refs/heads/master
Commit: 1bd9bde6105f16de9068936eb704368e57e21fa5
Parents: 6ab6ec8
Author: Lukasz Lenart 
Authored: Fri Oct 7 10:13:50 2016 +0200
Committer: Lukasz Lenart 
Committed: Fri Oct 7 10:13:50 2016 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/1bd9bde6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 12e14f8..fcdd409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
 5.1
 3.0.7
 1.0.6
-2.6.2
+2.7
 
 
 
${project.build.directory}/site

[1/3] struts git commit: WW-4572 Fixes issue with file upload

2016-10-07 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master 7cd3d30fd -> 1bd9bde61


WW-4572 Fixes issue with file upload


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

Branch: refs/heads/master
Commit: 69da41eb793ad31a6c076e109dbfa6dd1b5a1cd5
Parents: 7cd3d30
Author: Lukasz Lenart 
Authored: Fri Oct 7 10:05:38 2016 +0200
Committer: Lukasz Lenart 
Committed: Fri Oct 7 10:05:38 2016 +0200

--
 .../xwork2/interceptor/ParametersInterceptor.java|  4 +++-
 .../org/apache/struts2/dispatcher/HttpParameters.java|  9 +
 .../java/org/apache/struts2/dispatcher/Parameter.java|  8 
 .../apache/struts2/interceptor/CheckboxInterceptor.java  |  6 +++---
 .../struts2/interceptor/DateTextFieldInterceptor.java|  6 +++---
 .../struts2/interceptor/FileUploadInterceptor.java   | 11 ++-
 .../struts2/interceptor/MultiselectInterceptor.java  |  7 ---
 .../src/main/java/org/apache/struts2/JSPRuntime.java | 10 +++---
 8 files changed, 39 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 07bb9df..4c94b6b 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -203,7 +203,9 @@ public class ParametersInterceptor extends 
MethodFilterInterceptor {
 String name = entry.getKey();
 Parameter value = entry.getValue();
 try {
-if (value.isMultiple()) {
+if (value instanceof Parameter.File) {
+newStack.setParameter(name, value.getObject());
+} else  if (value.isMultiple()) {
 newStack.setParameter(name, value.getMultipleValues());
 } else {
 newStack.setParameter(name, value.getValue());

http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java 
b/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
index a85c9c7..5c6360e 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
@@ -53,10 +53,6 @@ public class HttpParameters implements Cloneable {
 return parameters.containsKey(name);
 }
 
-public HttpParameters clone(Map newParams) {
-return 
HttpParameters.createEmpty().withParent(this).withExtraParams(newParams).build();
-}
-
 public Map toMap() {
 Map result = new HashMap<>(parameters.size());
 for (Map.Entry entry : parameters.entrySet()) {
@@ -65,6 +61,11 @@ public class HttpParameters implements Cloneable {
 return result;
 }
 
+public HttpParameters appendAll(Map newParams) {
+parameters.putAll(newParams);
+return this;
+}
+
 public static class Builder {
 private Map requestParameterMap;
 private HttpParameters parent;

http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java
--
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java 
b/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java
index 7a08895..97f7946 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java
@@ -3,6 +3,8 @@ package org.apache.struts2.dispatcher;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.io.File;
+
 public interface Parameter {
 
 String getName();
@@ -82,6 +84,12 @@ public interface Parameter {
 }
 }
 
+class File extends Request {
+public File(String name, Object value) {
+super(name, value);
+}
+}
+
 class EmptyHttpParameter implements Parameter {
 
 private String name;

http://git-wip-us.apache.org/repos/asf/struts/blob/69da41eb/core/src/main/java/org/apache/struts2/interc

[2/3] struts git commit: WW-4572 Simplifies method name

2016-10-07 Thread lukaszlenart 
WW-4572 Simplifies method name


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

Branch: refs/heads/master
Commit: 6ab6ec879cc9eb1997b88856173d2123b32509ee
Parents: 69da41e
Author: Lukasz Lenart 
Authored: Fri Oct 7 10:06:10 2016 +0200
Committer: Lukasz Lenart 
Committed: Fri Oct 7 10:06:10 2016 +0200

--
 .../xwork2/interceptor/ParametersInterceptor.java|  4 ++--
 .../xwork2/interceptor/StaticParametersInterceptor.java  |  2 +-
 .../org/apache/struts2/components/ActionComponent.java   |  2 +-
 .../org/apache/struts2/dispatcher/HttpParameters.java|  2 +-
 .../interceptor/ActionMappingParametersInteceptor.java   |  4 ++--
 .../java/com/opensymphony/xwork2/ActionContextTest.java  |  2 +-
 .../interceptor/StaticParametersInterceptorTest.java |  2 +-
 .../xwork2/validator/DoubleRangeValidatorTest.java   |  2 +-
 .../xwork2/validator/ValidatorAnnotationTest.java|  4 ++--
 .../interceptor/ExecuteAndWaitInterceptorTest.java   |  2 +-
 .../struts2/interceptor/FileUploadInterceptorTest.java   |  4 ++--
 .../apache/struts2/interceptor/I18nInterceptorTest.java  |  2 +-
 .../struts2/interceptor/MessageStoreInterceptorTest.java | 11 ---
 .../interceptor/MessageStorePreResultListenerTest.java   |  4 ++--
 .../interceptor/ServletConfigInterceptorTest.java|  4 ++--
 .../apache/struts2/interceptor/TokenInterceptorTest.java |  2 +-
 .../java/org/apache/struts2/util/TokenHelperTest.java|  2 +-
 .../apache/struts2/portlet/result/PortletResultTest.java |  3 +--
 18 files changed, 27 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
index 4c94b6b..c1439c5 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -161,10 +161,10 @@ public class ParametersInterceptor extends 
MethodFilterInterceptor {
 HttpParameters params;
 Map acceptableParameters;
 if (ordered) {
-params = 
HttpParameters.createEmpty().withComparator(getOrderedComparator()).withParent(parameters).build();
+params = 
HttpParameters.create().withComparator(getOrderedComparator()).withParent(parameters).build();
 acceptableParameters = new TreeMap<>(getOrderedComparator());
 } else {
-params = 
HttpParameters.createEmpty().withParent(parameters).build();
+params = HttpParameters.create().withParent(parameters).build();
 acceptableParameters = new TreeMap<>();
 }
 

http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
index 658883f..8aab382 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
@@ -218,7 +218,7 @@ public class StaticParametersInterceptor extends 
AbstractInterceptor {
 protected void addParametersToContext(ActionContext ac, Map 
newParams) {
 HttpParameters previousParams = ac.getParameters();
 
-HttpParameters.Builder combinedParams = HttpParameters.createEmpty();
+HttpParameters.Builder combinedParams = HttpParameters.create();
 if (overwrite) {
 if (previousParams != null) {
 combinedParams = combinedParams.withParent(previousParams);

http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/org/apache/struts2/components/ActionComponent.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/components/ActionComponent.java 
b/core/src/main/java/org/apache/struts2/components/ActionComponent.java
index 762aafd..d6fb690 100644
--- a/core/src/main/java/org/apache/struts2/components/ActionComponent.java
+++ b/core/src/main/java/org/apache/struts2/components/ActionComponent.java
@@ -216,7 +216,7