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 3fa7aa92174972427900c9e13a265782de19944f Merge: 4b20507 ecdc0f8 Author: Lukasz Lenart <lukasz.len...@gmail.com> AuthorDate: Fri Oct 13 07:40:51 2017 +0200 Merge pull request #167 from yasserzamani/WW-4034 WW-4034 Allows to use custom JSONwriter .../{JSONWriter.java => DefaultJSONWriter.java} | 35 +- .../org/apache/struts2/json/JSONConstants.java | 1 + .../org/apache/struts2/json/JSONInterceptor.java | 9 +- .../java/org/apache/struts2/json/JSONResult.java | 10 +- .../java/org/apache/struts2/json/JSONUtil.java | 30 +- .../java/org/apache/struts2/json/JSONWriter.java | 700 +-------------------- plugins/json/src/main/resources/struts-plugin.xml | 7 +- ...NWriterTest.java => DefaultJSONWriterTest.java} | 22 +- .../java/org/apache/struts2/json/JSONEnumTest.java | 4 +- .../apache/struts2/json/JSONInterceptorTest.java | 21 + .../org/apache/struts2/json/JSONResultTest.java | 69 +- .../java/org/apache/struts2/json/JSONUtilTest.java | 8 +- 12 files changed, 193 insertions(+), 723 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@struts.apache.org" <commits@struts.apache.org>.