svn commit: r20159 - /dev/struts/2.5.11/

2017-06-22 Thread lukaszlenart 
Author: lukaszlenart
Date: Thu Jun 22 13:35:20 2017
New Revision: 20159

Log:
Updates test release 2.5.11

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

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

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

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

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

Added: dev/struts/2.5.11/struts-2.5.11-all.zip.md5
==
--- dev/struts/2.5.11/struts-2.5.11-all.zip.md5 (added)
+++ dev/struts/2.5.11/struts-2.5.11-all.zip.md5 Thu Jun 22 13:35:20 2017
@@ -0,0 +1 @@
+407a907c45a313231c806bafb9c101e4
\ No newline at end of file

Added: dev/struts/2.5.11/struts-2.5.11-all.zip.sha1
==
--- dev/struts/2.5.11/struts-2.5.11-all.zip.sha1 (added)
+++ dev/struts/2.5.11/struts-2.5.11-all.zip.sha1 Thu Jun 22 13:35:20 2017
@@ -0,0 +1 @@
+d6c05f558395bdc8e2f67192d8e8e748662de609
\ No newline at end of file

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

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

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

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

Added: dev/struts/2.5.11/struts-2.5.11-apps.zip.md5
==
--- dev/struts/2.5.11/struts-2.5.11-apps.zip.md5 (added)
+++ dev/struts/2.5.11/struts-2.5.11-apps.zip.md5 Thu Jun 22 13:35:20 2017
@@ -0,0 +1 @@
+fb436515e72a3cebeb1f85f86c547774
\ No newline at end of file

Added: dev/struts/2.5.11/struts-2.5.11-apps.zip.sha1
==
--- dev/struts/2.5.11/struts-2.5.11-apps.zip.sha1 (added)
+++ dev/struts/2.5.11/struts-2.5.11-apps.zip.sha1 Thu Jun 22 13:35:20 2017
@@ -0,0 +1 @@
+eede955b29032cba2290cb1300333284981cd55e
\ No newline at end of file

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

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

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

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

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

[struts] Git Push Summary

2017-06-22 Thread lukaszlenart 
Repository: struts
Updated Tags:  refs/tags/STRUTS_2_5_11 [created] 86238e691

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

2017-06-22 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master a249ed5f3 -> f84255783


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

Branch: refs/heads/master
Commit: f84255783c80d6650d2abf89e6f2a89f67de8f6f
Parents: a249ed5
Author: Lukasz Lenart 
Authored: Thu Jun 22 13:11:35 2017 +0200
Committer: Lukasz Lenart 
Committed: Thu Jun 22 13:11:35 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/f8425578/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index aed405c..dbf0824 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.11
+2.5.12-SNAPSHOT
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/f8425578/apps/rest-showcase/pom.xml
--
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 9559758..b7a3e81 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
 
 org.apache.struts
 struts2-apps
-2.5.11
+2.5.12-SNAPSHOT
 
 
 struts2-rest-showcase
 war
-2.5.11
+2.5.12-SNAPSHOT
 Struts 2 Rest Showcase Webapp
 Struts 2 Rest Showcase Example
 

http://git-wip-us.apache.org/repos/asf/struts/blob/f8425578/apps/showcase/pom.xml
--
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 85eb9c1..c6a4e29 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.5.11
+2.5.12-SNAPSHOT
 
 
 struts2-showcase

http://git-wip-us.apache.org/repos/asf/struts/blob/f8425578/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index cc482aa..612dae8 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.11
+2.5.12-SNAPSHOT
 
 
 struts2-assembly

http://git-wip-us.apache.org/repos/asf/struts/blob/f8425578/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index 35fea5c..0d2258d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
 
 
 struts2-bom
-2.5.11
+2.5.12-SNAPSHOT
 pom
 
 Struts 2 Bill of Materials
@@ -25,7 +25,7 @@
 
 
 
-2.5.11
+2.5.12-SNAPSHOT
 
 
 
@@ -170,8 +170,4 @@
 
 
 
-
-  
-STRUTS_2_5_11
-  
 

http://git-wip-us.apache.org/repos/asf/struts/blob/f8425578/bundles/admin/pom.xml
--
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 69c48dd..84de84d 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_11

2017-06-22 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master 5d999d6ac -> a249ed5f3


[maven-release-plugin] prepare release STRUTS_2_5_11


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

Branch: refs/heads/master
Commit: a249ed5f31a1aca8305c49500e6d21eed0c18b46
Parents: 5d999d6
Author: Lukasz Lenart 
Authored: Thu Jun 22 13:11:07 2017 +0200
Committer: Lukasz Lenart 
Committed: Thu Jun 22 13:11: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/a249ed5f/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index cb86546..aed405c 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.11-SNAPSHOT
+2.5.11
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/a249ed5f/apps/rest-showcase/pom.xml
--
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 1f384d4..9559758 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
 
 org.apache.struts
 struts2-apps
-2.5.11-SNAPSHOT
+2.5.11
 
 
 struts2-rest-showcase
 war
-2.5.11-SNAPSHOT
+2.5.11
 Struts 2 Rest Showcase Webapp
 Struts 2 Rest Showcase Example
 

http://git-wip-us.apache.org/repos/asf/struts/blob/a249ed5f/apps/showcase/pom.xml
--
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index cbd4848..85eb9c1 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.5.11-SNAPSHOT
+2.5.11
 
 
 struts2-showcase

http://git-wip-us.apache.org/repos/asf/struts/blob/a249ed5f/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6bd64b7..cc482aa 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.5.11-SNAPSHOT
+2.5.11
 
 
 struts2-assembly

http://git-wip-us.apache.org/repos/asf/struts/blob/a249ed5f/bom/pom.xml
--
diff --git a/bom/pom.xml b/bom/pom.xml
index 808a131..35fea5c 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
 
 
 struts2-bom
-2.5.11-SNAPSHOT
+2.5.11
 pom
 
 Struts 2 Bill of Materials
@@ -25,7 +25,7 @@
 
 
 
-2.5.11-SNAPSHOT
+2.5.11
 
 
 
@@ -170,4 +170,8 @@
 
 
 
+
+  
+STRUTS_2_5_11
+  
 

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

[2/2] struts git commit: Adds a constant to control when proxy can be accessed

2017-06-22 Thread lukaszlenart 
Adds a constant to control when proxy can be accessed


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

Branch: refs/heads/master
Commit: 5d999d6ac145c769191cc2e9a4897a47093f43d8
Parents: 8f53b6f 0d6442b
Author: Lukasz Lenart 
Authored: Thu Jun 22 09:01:35 2017 +0200
Committer: Lukasz Lenart 
Committed: Thu Jun 22 09:01:35 2017 +0200

--
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  | 12 +
 .../xwork2/ognl/OgnlValueStack.java |  1 +
 .../xwork2/ognl/SecurityMemberAccess.java   |  7 ++-
 .../org/apache/struts2/StrutsConstants.java |  2 +
 .../ognl/SecurityMemberAccessProxyTest.java | 49 
 .../xwork2/spring/actionContext-xwork.xml   |  1 +
 .../spring/src/main/resources/struts-plugin.xml |  2 +
 7 files changed, 73 insertions(+), 1 deletion(-)
--

[1/2] struts git commit: add constant to control proxy member access

2017-06-22 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master 8f53b6f59 -> 5d999d6ac


add constant to control proxy member access


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

Branch: refs/heads/master
Commit: 0d6442bab5b44d93c4c2e63c5335f0a331333b92
Parents: 4c386c6
Author: Aleksandr Mashchenko 
Authored: Thu Jun 22 00:58:41 2017 +0300
Committer: Aleksandr Mashchenko 
Committed: Thu Jun 22 00:58:41 2017 +0300

--
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  | 12 +
 .../xwork2/ognl/OgnlValueStack.java |  1 +
 .../xwork2/ognl/SecurityMemberAccess.java   |  7 ++-
 .../org/apache/struts2/StrutsConstants.java |  2 +
 .../ognl/SecurityMemberAccessProxyTest.java | 49 
 .../xwork2/spring/actionContext-xwork.xml   |  1 +
 .../spring/src/main/resources/struts-plugin.xml |  2 +
 7 files changed, 73 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/0d6442ba/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
--
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java 
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index ced8eff..d15977f 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -28,6 +28,7 @@ import ognl.*;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.struts2.StrutsConstants;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -64,6 +65,7 @@ public class OgnlUtil {
 
 private Container container;
 private boolean allowStaticMethodAccess;
+private boolean disallowProxyMemberAccess;
 
 @Inject
 public void setXWorkConverter(XWorkConverter conv) {
@@ -144,6 +146,15 @@ public class OgnlUtil {
 this.allowStaticMethodAccess = 
Boolean.parseBoolean(allowStaticMethodAccess);
 }
 
+@Inject(value = StrutsConstants.STRUTS_DISALLOW_PROXY_MEMBER_ACCESS, 
required = false)
+public void setDisallowProxyMemberAccess(String disallowProxyMemberAccess) 
{
+this.disallowProxyMemberAccess = 
Boolean.parseBoolean(disallowProxyMemberAccess);
+}
+
+public boolean isDisallowProxyMemberAccess() {
+return disallowProxyMemberAccess;
+}
+
 /**
  * Sets the object's properties using the default type converter, 
defaulting to not throw
  * exceptions for problems setting the properties.
@@ -679,6 +690,7 @@ public class OgnlUtil {
 memberAccess.setExcludedClasses(excludedClasses);
 
memberAccess.setExcludedPackageNamePatterns(excludedPackageNamePatterns);
 memberAccess.setExcludedPackageNames(excludedPackageNames);
+memberAccess.setDisallowProxyMemberAccess(disallowProxyMemberAccess);
 
 return Ognl.createDefaultContext(root, resolver, defaultConverter, 
memberAccess);
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/0d6442ba/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java 
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index 28bef54..4ea6b44 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -84,6 +84,7 @@ public class OgnlValueStack implements Serializable, 
ValueStack, ClearableValueS
 securityMemberAccess.setExcludedClasses(ognlUtil.getExcludedClasses());
 
securityMemberAccess.setExcludedPackageNamePatterns(ognlUtil.getExcludedPackageNamePatterns());
 
securityMemberAccess.setExcludedPackageNames(ognlUtil.getExcludedPackageNames());
+
securityMemberAccess.setDisallowProxyMemberAccess(ognlUtil.isDisallowProxyMemberAccess());
 }
 
 protected void setRoot(XWorkConverter xworkConverter, CompoundRootAccessor 
accessor, CompoundRoot compoundRoot,

http://git-wip-us.apache.org/repos/asf/struts/blob/0d6442ba/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java 
b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index cce09cb..7a84a34 100644
---

[2/2] struts git commit: WW-4744 WW-4694 Removes annotation search to commons lang 3.6

2017-06-22 Thread lukaszlenart 
WW-4744 WW-4694 Removes annotation search to commons lang 3.6


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

Branch: refs/heads/master
Commit: 8f53b6f59efe0f713e4689ef10fe6bae5e4c0cb7
Parents: fa20b71 33e1eeb
Author: Lukasz Lenart 
Authored: Thu Jun 22 08:40:46 2017 +0200
Committer: Lukasz Lenart 
Committed: Thu Jun 22 08:40:46 2017 +0200

--
 .../interceptor/DefaultWorkflowInterceptor.java |   5 +-
 .../AnnotationWorkflowInterceptor.java  |  25 ++--
 .../xwork2/util/AnnotationUtils.java| 113 ---
 .../apache/struts2/components/Component.java|   5 +-
 .../AnnotationValidationInterceptor.java|   4 +-
 .../xwork2/util/AnnotationUtilsTest.java|  53 -
 .../xwork2/util/annotation/DummyClass.java  |  10 +-
 .../xwork2/util/annotation/DummyClassExt.java   |   4 -
 .../xwork2/util/annotation/DummyInterface.java  |   6 -
 .../xwork2/util/annotation/MyAnnotationI.java   |   8 --
 .../interceptor/BeanValidationInterceptor.java  |   5 +-
 pom.xml |   2 +-
 12 files changed, 27 insertions(+), 213 deletions(-)
--

[1/2] struts git commit: WW-4744 WW-4694 Removes annotation search to commons lang 3.6

2017-06-22 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master fa20b71fc -> 8f53b6f59


WW-4744 WW-4694 Removes annotation search to commons lang 3.6


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

Branch: refs/heads/master
Commit: 33e1eeb386c98beeaeff51504a2ff156098f2c01
Parents: 4c386c6
Author: Yasser Zamani 
Authored: Wed Jun 21 13:28:45 2017 +0430
Committer: Yasser Zamani 
Committed: Wed Jun 21 13:28:45 2017 +0430

--
 .../interceptor/DefaultWorkflowInterceptor.java |   5 +-
 .../AnnotationWorkflowInterceptor.java  |  25 ++--
 .../xwork2/util/AnnotationUtils.java| 113 ---
 .../apache/struts2/components/Component.java|   5 +-
 .../AnnotationValidationInterceptor.java|   4 +-
 .../xwork2/util/AnnotationUtilsTest.java|  53 -
 .../xwork2/util/annotation/DummyClass.java  |  10 +-
 .../xwork2/util/annotation/DummyClassExt.java   |   4 -
 .../xwork2/util/annotation/DummyInterface.java  |   6 -
 .../xwork2/util/annotation/MyAnnotationI.java   |   8 --
 .../interceptor/BeanValidationInterceptor.java  |   5 +-
 pom.xml |   2 +-
 12 files changed, 27 insertions(+), 213 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/33e1eeb3/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
index f9bcbd8..d88d6f8 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
@@ -22,8 +22,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.reflect.MethodUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import com.opensymphony.xwork2.util.AnnotationUtils;
-import java.lang.reflect.Method;
 
 /**
  * 
@@ -208,7 +206,8 @@ public class DefaultWorkflowInterceptor extends 
MethodFilterInterceptor {
  */
 protected String processInputConfig(final Object action, final String 
method, final String currentResultName) throws Exception {
 String resultName = currentResultName;
-InputConfig annotation = 
AnnotationUtils.findAnnotation(action.getClass().getMethod(method, 
EMPTY_CLASS_ARRAY), InputConfig.class);
+InputConfig annotation = 
MethodUtils.getAnnotation(action.getClass().getMethod(method, 
EMPTY_CLASS_ARRAY),
+InputConfig.class ,true,true);
 if (annotation != null) {
 if (StringUtils.isNotEmpty(annotation.methodName())) {
 resultName = (String) MethodUtils.invokeMethod(action, true, 
annotation.methodName());

http://git-wip-us.apache.org/repos/asf/struts/blob/33e1eeb3/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
index 38e3503..36faa09 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
@@ -19,7 +19,6 @@ import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.XWorkException;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
 import com.opensymphony.xwork2.interceptor.PreResultListener;
-import com.opensymphony.xwork2.util.AnnotationUtils;
 import org.apache.commons.lang3.reflect.MethodUtils;
 
 import java.lang.reflect.Method;
@@ -113,13 +112,15 @@ public class AnnotationWorkflowInterceptor extends 
AbstractInterceptor implement
 public String intercept(ActionInvocation invocation) throws Exception {
 final Object action = invocation.getAction();
 invocation.addPreResultListener(this);
-List methods = new 
ArrayList<>(AnnotationUtils.getAnnotatedMethods(action.getClass(), 
Before.class));
+List methods = new 
ArrayList<>(MethodUtils.getMethodsListWithAnnotation(action.getClass(), 
Before.class,
+true, true));
 if (methods.size()

struts git commit: WW-4794 Fixes wrapField's where clause

2017-06-22 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master 4c386c663 -> fa20b71fc


WW-4794 Fixes wrapField's where clause


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

Branch: refs/heads/master
Commit: fa20b71fc2b7764e9f5bb1ed14fb356ab6fb3258
Parents: 4c386c6
Author: Yasser Zamani 
Authored: Tue Jun 20 16:42:08 2017 +0430
Committer: Yasser Zamani 
Committed: Tue Jun 20 16:42:08 2017 +0430

--
 .../apache/struts2/views/jasperreports/ValueStackDataSource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/fa20b71f/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
--
diff --git 
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
 
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
index c39b34e..d875d2e 100644
--- 
a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
+++ 
b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/ValueStackDataSource.java
@@ -97,7 +97,7 @@ public class ValueStackDataSource implements 
JRRewindableDataSource {
 Object value = valueStack.findValue(expression);
 LOG.debug("Field [{}] = [{}]", field.getName(), value);
 
-if (!wrapField && MakeIterator.isIterable(value) && 
!field.getValueClass().isInstance(value)) {
+if (!wrapField && MakeIterator.isIterable(value) && 
field.getValueClass().isInstance(value)) {
 return value;
 } else if (MakeIterator.isIterable(value)) {
 // wrap value with ValueStackDataSource if not already wrapped