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 29e1847f64088b1d172631fbc5253b0f2e40144f
Merge: 29b29a9 9739291
Author: Lukasz Lenart <lukasz.len...@gmail.com>
AuthorDate: Mon Jan 15 11:50:46 2018 +0100
Merge pull request #199 from yasserzamani/WW-4906
fix conversion by annotation and WW-4906
.../conversion/annotations/TypeConversion.java | 15 ++++-----
.../impl/DefaultConversionAnnotationProcessor.java | 19 +++++++----
.../impl/DefaultConversionFileProcessor.java | 4 +--
.../xwork2/conversion/impl/XWorkConverter.java | 25 +++++++++++---
.../com/opensymphony/xwork2/AnnotatedTestBean.java | 13 ++++++++
.../impl/AnnotationXWorkConverterTest.java | 10 +++++-
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 2 +-
.../xwork2/ognl/OgnlValueStackTest.java | 13 ++++++++
.../xwork2/ognl/SetPropertiesTest.java | 39 +++++++++++++++++++++-
.../xwork2/test/annotations/PersonAction.java | 2 +-
.../java/com/opensymphony/xwork2/util/Foo.java | 25 ++++++++++++++
.../com/opensymphony/xwork2/util/MyBeanAction.java | 31 +++++++++++++++++
.../opensymphony/xwork2/util/MyBeanActionTest.java | 33 ++++++++++++++++++
13 files changed, 206 insertions(+), 25 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" <commits@struts.apache.org>.
