[1/3] struts git commit: Merge pull request #1 from apache/master

2016-01-16 Thread lukaszlenart
Repository: struts
Updated Branches:
  refs/heads/master e0003f047 -> 294394b25


Merge pull request #1 from apache/master

Merge changes

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

Branch: refs/heads/master
Commit: 7170c13509611284b100521968163698e96708b9
Parents: 0e2 110d63f
Author: victor sosa 
Authored: Mon Jan 4 18:06:23 2016 -0400
Committer: victor sosa 
Committed: Mon Jan 4 18:06:23 2016 -0400

--
 .../opensymphony/xwork2/util/CompoundRoot.java  |  9 +---
 plugins/jasperreports/pom.xml   |  4 ++--
 .../jasperreports/JasperReportsResult.java  |  2 +-
 .../org/apache/struts2/json/JSONResult.java |  2 +-
 .../org/apache/struts2/json/JSONResultTest.java | 24 ++--
 .../struts2/rest/DefaultHttpHeadersTest.java| 16 +
 6 files changed, 34 insertions(+), 23 deletions(-)
--




[2/3] struts git commit: Patch WW-3266

2016-01-16 Thread lukaszlenart
Patch WW-3266

getFieldValue() method of ValueStackDataSource uses getDescription() to
get field value may not appropriate

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

Branch: refs/heads/master
Commit: 37f822f9cce8505e28a3dba5a2ac34aa03a17dd2
Parents: 7170c13
Author: Victor Sosa 
Authored: Thu Jan 7 11:09:58 2016 -0400
Committer: Victor Sosa 
Committed: Thu Jan 7 11:09:58 2016 -0400

--
 .../struts2/views/jasperreports/ValueStackDataSource.java | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/37f822f9/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 81641a5..c39b34e 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
@@ -92,12 +92,7 @@ public class ValueStackDataSource implements 
JRRewindableDataSource {
 //TODO: move the code to return a ValueStackDataSource to a seperate
 //  method when and if the JRDataSource interface is updated to 
support
 //  this.
-String expression = field.getDescription();
-
-if (expression == null) {
-//Description is optional so use the field name as a default
-expression = field.getName();
-}
+String expression = field.getName();
 
 Object value = valueStack.findValue(expression);
 LOG.debug("Field [{}] = [{}]", field.getName(), value);



[3/3] struts git commit: WW-3266 Uses getFieldValue() instead of getDescription()

2016-01-16 Thread lukaszlenart
WW-3266 Uses getFieldValue() instead of getDescription()


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

Branch: refs/heads/master
Commit: 294394b256d079c098dc04bab6af4ba541d6a71f
Parents: e0003f0 37f822f
Author: Lukasz Lenart 
Authored: Sat Jan 16 10:03:11 2016 +0100
Committer: Lukasz Lenart 
Committed: Sat Jan 16 10:03:11 2016 +0100

--
 .../struts2/views/jasperreports/ValueStackDataSource.java | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)
--