svn commit: r16406 - /dev/struts/2.5.4/

2016-10-06 Thread lukaszlenart 
Author: lukaszlenart
Date: Thu Oct  6 19:31:24 2016
New Revision: 16406

Log:
Updates test release 2.5.4

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

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

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

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

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

Added: dev/struts/2.5.4/struts-2.5.4-all.zip.md5
==
--- dev/struts/2.5.4/struts-2.5.4-all.zip.md5 (added)
+++ dev/struts/2.5.4/struts-2.5.4-all.zip.md5 Thu Oct  6 19:31:24 2016
@@ -0,0 +1 @@
+e7560e71963b2f7c0642a9476c7e5f0d
\ No newline at end of file

Added: dev/struts/2.5.4/struts-2.5.4-all.zip.sha1
==
--- dev/struts/2.5.4/struts-2.5.4-all.zip.sha1 (added)
+++ dev/struts/2.5.4/struts-2.5.4-all.zip.sha1 Thu Oct  6 19:31:24 2016
@@ -0,0 +1 @@
+8f3545b2d1a9450f49ce9810c5c2b1464646e7fc
\ No newline at end of file

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

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

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

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

Added: dev/struts/2.5.4/struts-2.5.4-apps.zip.md5
==
--- dev/struts/2.5.4/struts-2.5.4-apps.zip.md5 (added)
+++ dev/struts/2.5.4/struts-2.5.4-apps.zip.md5 Thu Oct  6 19:31:24 2016
@@ -0,0 +1 @@
+4bf29a4a19294067424c2125d47dbc19
\ No newline at end of file

Added: dev/struts/2.5.4/struts-2.5.4-apps.zip.sha1
==
--- dev/struts/2.5.4/struts-2.5.4-apps.zip.sha1 (added)
+++ dev/struts/2.5.4/struts-2.5.4-apps.zip.sha1 Thu Oct  6 19:31:24 2016
@@ -0,0 +1 @@
+ca13c84abed690555795008c6cfdc66862e9b2cf
\ No newline at end of file

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

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

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

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

Added: dev/struts/2.5.4/struts-2.5.4-docs.zip.md5
==
--- dev/struts/2.5.4/struts-2.5.4-docs.zip.md5 (added)
+++

[struts] Git Push Summary

2016-10-06 Thread lukaszlenart 
Repository: struts
Updated Tags:  refs/tags/STRUTS_2_5_4 [created] 0999e74b6

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

2016-10-06 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master 12cc86187 -> 7cd3d30fd


[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/7cd3d30f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7cd3d30f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7cd3d30f

Branch: refs/heads/master
Commit: 7cd3d30fdcde06756b117e1437c49997866d11af
Parents: 12cc861
Author: Lukasz Lenart 
Authored: Thu Oct 6 21:04:16 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu Oct 6 21:04:16 2016 +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/7cd3d30f/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index aa958ff..0b75f72 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.4
+2.5.5-SNAPSHOT
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/7cd3d30f/apps/rest-showcase/pom.xml
--
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index acdde04..27e1578 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
 
 org.apache.struts
 struts2-apps
-2.5.4
+2.5.5-SNAPSHOT
 
 
 struts2-rest-showcase
 war
-2.5.4
+2.5.5-SNAPSHOT
 Struts 2 Rest Showcase Webapp
 Struts 2 Rest Showcase Example
 

http://git-wip-us.apache.org/repos/asf/struts/blob/7cd3d30f/apps/showcase/pom.xml
--
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 6115bb1..13d99e4 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.5.4
+2.5.5-SNAPSHOT
 
 
 struts2-showcase

http://git-wip-us.apache.org/repos/asf/struts/blob/7cd3d30f/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c8b3d96..392215f 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.4
+2.5.5-SNAPSHOT
 
 
 struts2-assembly

http://git-wip-us.apache.org/repos/asf/struts/blob/7cd3d30f/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index 77fdd09..202b339 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
 
 
 struts2-bom
-2.5.4
+2.5.5-SNAPSHOT
 pom
 
 Struts 2 Bill of Materials
@@ -25,7 +25,7 @@
 
 
 
-2.5.4
+2.5.5-SNAPSHOT
 
 
 
@@ -170,8 +170,4 @@
 
 
 
-
-  
-STRUTS_2_5_4
-  
 

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

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

2016-10-06 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master adeda4788 -> 12cc86187


[maven-release-plugin] prepare release STRUTS_2_5_4


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

Branch: refs/heads/master
Commit: 12cc861875665e19c9d72a131f606a9b855b5c80
Parents: adeda47
Author: Lukasz Lenart 
Authored: Thu Oct 6 21:03:54 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu Oct 6 21:03:54 2016 +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/12cc8618/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index 4ce847a..aa958ff 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.4-SNAPSHOT
+2.5.4
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/12cc8618/apps/rest-showcase/pom.xml
--
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 153e743..acdde04 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
 
 org.apache.struts
 struts2-apps
-2.5.4-SNAPSHOT
+2.5.4
 
 
 struts2-rest-showcase
 war
-2.5.4-SNAPSHOT
+2.5.4
 Struts 2 Rest Showcase Webapp
 Struts 2 Rest Showcase Example
 

http://git-wip-us.apache.org/repos/asf/struts/blob/12cc8618/apps/showcase/pom.xml
--
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index ec499f8..6115bb1 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.5.4-SNAPSHOT
+2.5.4
 
 
 struts2-showcase

http://git-wip-us.apache.org/repos/asf/struts/blob/12cc8618/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0c9f450..c8b3d96 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.4-SNAPSHOT
+2.5.4
 
 
 struts2-assembly

http://git-wip-us.apache.org/repos/asf/struts/blob/12cc8618/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index 916e4c9..77fdd09 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
 
 
 struts2-bom
-2.5.4-SNAPSHOT
+2.5.4
 pom
 
 Struts 2 Bill of Materials
@@ -25,7 +25,7 @@
 
 
 
-2.5.4-SNAPSHOT
+2.5.4
 
 
 
@@ -170,4 +170,8 @@
 
 
 
+
+  
+STRUTS_2_5_4
+  
 

http://git-wip-us.apache.org/repos/asf/struts/blob/12cc8618/bundles/admin/pom.xml
--
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 798e325..debd4df 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@

struts git commit: WW-4572 Updates JavaDocs

2016-10-06 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master bb403720a -> adeda4788


WW-4572 Updates JavaDocs


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

Branch: refs/heads/master
Commit: adeda4788b65f093b496551e2b32ad0218087a20
Parents: bb40372
Author: Lukasz Lenart 
Authored: Thu Oct 6 20:56:34 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu Oct 6 20:56:34 2016 +0200

--
 .../org/apache/struts2/interceptor/ServletConfigInterceptor.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/adeda478/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
 
b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
index c92d482..5f1abf8 100644
--- 
a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
+++ 
b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
@@ -55,7 +55,7 @@ import 
com.opensymphony.xwork2.interceptor.AbstractInterceptor;
  *
  * {@link ServletResponseAware}
  *
- * {@link ParameterAware}
+ * {@link ParameterAware} - deprecated since 2.5.4, please use {@link 
HttpParametersAware}
  *
  * {@link HttpParametersAware}
  *
@@ -107,6 +107,7 @@ import 
com.opensymphony.xwork2.interceptor.AbstractInterceptor;
  * @see ServletRequestAware
  * @see ServletResponseAware
  * @see ParameterAware
+ * @see HttpParametersAware
  * @see SessionAware
  * @see ApplicationAware
  * @see PrincipalAware

struts git commit: WW-4572 Reverts ParameterAware interface to its previous version and introduces new one

2016-10-06 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master 67541e07a -> bb403720a


WW-4572 Reverts ParameterAware interface to its previous version and introduces 
new one


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

Branch: refs/heads/master
Commit: bb403720acb559ba10e372511dc6caaeda724c3b
Parents: 67541e0
Author: Lukasz Lenart 
Authored: Thu Oct 6 20:51:19 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu Oct 6 20:51:19 2016 +0200

--
 .../struts2/dispatcher/HttpParameters.java  |  6 +--
 .../interceptor/HttpParametersAware.java| 47 
 .../struts2/interceptor/ParameterAware.java |  8 ++--
 .../interceptor/ServletConfigInterceptor.java   |  8 +++-
 .../ServletConfigInterceptorTest.java   | 18 +++-
 5 files changed, 78 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/bb403720/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 4b35705..a85c9c7 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
@@ -57,10 +57,10 @@ public class HttpParameters implements Cloneable {
 return 
HttpParameters.createEmpty().withParent(this).withExtraParams(newParams).build();
 }
 
-public Map toMap() {
-Map result = new HashMap<>(parameters.size());
+public Map toMap() {
+Map result = new HashMap<>(parameters.size());
 for (Map.Entry entry : parameters.entrySet()) {
-result.put(entry.getKey(), entry.getValue().getObject());
+result.put(entry.getKey(), entry.getValue().getMultipleValues());
 }
 return result;
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/bb403720/core/src/main/java/org/apache/struts2/interceptor/HttpParametersAware.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/HttpParametersAware.java 
b/core/src/main/java/org/apache/struts2/interceptor/HttpParametersAware.java
new file mode 100644
index 000..854f85b
--- /dev/null
+++ b/core/src/main/java/org/apache/struts2/interceptor/HttpParametersAware.java
@@ -0,0 +1,47 @@
+/*
+ * $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.
+ */
+
+package org.apache.struts2.interceptor;
+
+import org.apache.struts2.dispatcher.HttpParameters;
+
+
+/**
+ * 
+ * This interface gives actions an alternative way of receiving input 
parameters. The parameters will
+ * contain all input parameters as implementation of {@link 
org.apache.struts2.dispatcher.Parameter}.
+ * Actions that need this should simply implement it.
+ * 
+ *
+ * 
+ * One common use for this is to have the action propagate parameters to 
internally instantiated data
+ * objects.
+ * 
+ */
+public interface HttpParametersAware {
+
+/**
+ * Sets the HTTP parameters in the implementing class.
+ *
+ * @param parameters an instance of {@link HttpParameters}.
+ */
+void setParameters(HttpParameters parameters);
+}

http://git-wip-us.apache.org/repos/asf/struts/blob/bb403720/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java 
b/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
index b37c0c6..755efbb 100644
---