[libjson-java] 24/26: Merge tag 'upstream/2.4'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libjson-java.

commit db866ba0363b190bc12fb3487388c1f0b1b0fd1e
Merge: 7a7bf20 e8252d7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 22 23:39:35 2015 +0200

    Merge tag 'upstream/2.4'
    
    Upstream version 2.4

 META-INF/MANIFEST.MF                               |    4 +
 net/sf/json/AbstractJSON.java                      |  286 ++
 net/sf/json/JSON.java                              |   89 +
 net/sf/json/JSONArray.java                         | 2625 +++++++++++++++++++
 net/sf/json/JSONException.java                     |   44 +
 net/sf/json/JSONFunction.java                      |  167 ++
 net/sf/json/JSONNull.java                          |  106 +
 net/sf/json/JSONObject.java                        | 2747 ++++++++++++++++++++
 net/sf/json/JSONSerializer.java                    |  148 ++
 net/sf/json/JSONString.java                        |   35 +
 net/sf/json/JsonConfig.java                        | 1440 ++++++++++
 net/sf/json/filters/AndPropertyFilter.java         |   40 +
 net/sf/json/filters/CompositePropertyFilter.java   |   67 +
 net/sf/json/filters/FalsePropertyFilter.java       |   28 +
 net/sf/json/filters/MappingPropertyFilter.java     |   75 +
 net/sf/json/filters/NotPropertyFilter.java         |   37 +
 net/sf/json/filters/OrPropertyFilter.java          |   40 +
 net/sf/json/filters/TruePropertyFilter.java        |   28 +
 net/sf/json/groovy/JsonGroovyBuilder.java          |  317 +++
 net/sf/json/groovy/JsonSlurper.java                |   82 +
 .../processors/DefaultDefaultValueProcessor.java   |   45 +
 net/sf/json/processors/DefaultValueProcessor.java  |   32 +
 .../processors/DefaultValueProcessorMatcher.java   |   51 +
 .../json/processors/JsDateJsonBeanProcessor.java   |   68 +
 .../json/processors/JsDateJsonValueProcessor.java  |   46 +
 net/sf/json/processors/JsonBeanProcessor.java      |   38 +
 .../json/processors/JsonBeanProcessorMatcher.java  |   50 +
 net/sf/json/processors/JsonValueProcessor.java     |   46 +
 .../json/processors/JsonValueProcessorMatcher.java |   50 +
 net/sf/json/processors/JsonVerifier.java           |   51 +
 net/sf/json/processors/PropertyNameProcessor.java  |   34 +
 .../processors/PropertyNameProcessorMatcher.java   |   50 +
 net/sf/json/regexp/JdkRegexpMatcher.java           |   53 +
 net/sf/json/regexp/Perl5RegexpMatcher.java         |   63 +
 net/sf/json/regexp/RegexpMatcher.java              |   38 +
 net/sf/json/regexp/RegexpUtils.java                |   66 +
 net/sf/json/test/JSONAssert.java                   |  543 ++++
 net/sf/json/util/CycleDetectionStrategy.java       |  100 +
 net/sf/json/util/EnumMorpher.java                  |   56 +
 net/sf/json/util/JSONBuilder.java                  |  323 +++
 net/sf/json/util/JSONStringer.java                 |   77 +
 net/sf/json/util/JSONTokener.java                  |  510 ++++
 net/sf/json/util/JSONUtils.java                    |  826 ++++++
 net/sf/json/util/JavaIdentifierTransformer.java    |  164 ++
 net/sf/json/util/JsonEventListener.java            |   78 +
 net/sf/json/util/NewBeanInstanceStrategy.java      |   74 +
 .../json/util/PropertyExclusionClassMatcher.java   |   50 +
 net/sf/json/util/PropertyFilter.java               |   30 +
 net/sf/json/util/PropertySetStrategy.java          |   74 +
 net/sf/json/util/WebHijackPreventionStrategy.java  |   56 +
 net/sf/json/util/WebUtils.java                     |  158 ++
 net/sf/json/xml/JSONTypes.java                     |   31 +
 net/sf/json/xml/XMLSerializer.java                 | 1422 ++++++++++
 53 files changed, 13758 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjson-java.git