You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/10/13 05:40:53 UTC

[struts] branch master updated (4b20507 -> 3fa7aa9)

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.


    from 4b20507  Merge pull request #171 from Prodigysov/remove-obsolete-todo
     add 39bdb99  WW-4034 Refactors and extracts interface from JSONWriter
     add 5bb472f  WW-4034 Allows to use custom JSONwriter
     add 996e179  WW-4034 Makes JSONWriter not static prototype to fix concurrent calls
     add ecdc0f8  WW-4034 a few non-functional changes
     new 3fa7aa9  Merge pull request #167 from yasserzamani/WW-4034

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../{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(-)
 copy plugins/json/src/main/java/org/apache/struts2/json/{JSONWriter.java => DefaultJSONWriter.java} (96%)
 rename plugins/json/src/test/java/org/apache/struts2/json/{JSONWriterTest.java => DefaultJSONWriterTest.java} (85%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <co...@struts.apache.org>'].

[struts] 01/01: Merge pull request #167 from yasserzamani/WW-4034

Posted by lu...@apache.org.
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 <lu...@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" <co...@struts.apache.org>.