[jenkins-json] 01/05: Merge tag 'upstream/2.4-jenkins-1'
James Downing Page
jamespage at alioth.debian.org
Mon Aug 12 09:30:11 UTC 2013
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch master
in repository jenkins-json.
commit 320e212ca2645409632de0338f4aee926194f800
Merge: 99c3d4b 1ce6530
Author: James Page <james.page at ubuntu.com>
Date: Mon Aug 12 10:00:56 2013 +0100
Merge tag 'upstream/2.4-jenkins-1'
Upstream version 2.4-jenkins-1
.cvsignore | 2 +
.gitignore | 12 +-
LICENSE.txt | 202 ++++
build.gradle | 48 +
build.properties | 1 +
build.xml | 87 +-
deploy.sh | 87 ++
extensions/spring/.cvsignore | 6 +
extensions/spring/deploy.sh | 49 +
extensions/spring/pom.xml | 210 ++++
.../sf/json/spring/web/servlet/view/JsonView.java | 158 +++
.../json/spring/web/servlet/view/JsonViewTest.java | 171 ++++
.../spring/src/test/resources/log4j.properties | 8 +
pom.xml | 98 +-
src/changes/changes.xml | 479 ++++++++-
.../metaclass/java/lang/StringMetaClass.groovy | 56 --
.../metaclass/java/util/ArrayListMetaClass.groovy | 50 -
.../metaclass/java/util/HashMapMetaClass.groovy | 50 -
.../net/sf/json/JSONObjectMetaClass.groovy | 67 --
src/main/groovy/net/sf/json/groovy/GJson.groovy | 127 +++
src/main/java/net/sf/json/AbstractJSON.java | 77 +-
.../java/net/sf/json/DelegatingValueVisitor.java | 35 -
src/main/java/net/sf/json/JSON.java | 9 +-
src/main/java/net/sf/json/JSONException.java | 2 +-
src/main/java/net/sf/json/JSONFunction.java | 52 +-
src/main/java/net/sf/json/JSONNull.java | 29 +-
src/main/java/net/sf/json/JSONSerializer.java | 14 +-
src/main/java/net/sf/json/JSONString.java | 2 +-
src/main/java/net/sf/json/JsonConfig.java | 1044 +++++++++++++++++---
src/main/java/net/sf/json/ValueVisitor.java | 14 -
.../net/sf/json/filters/AndPropertyFilter.java | 2 +-
.../sf/json/filters/CompositePropertyFilter.java | 2 +-
.../net/sf/json/filters/FalsePropertyFilter.java | 2 +-
.../net/sf/json/filters/MappingPropertyFilter.java | 2 +-
.../net/sf/json/filters/NotPropertyFilter.java | 2 +-
.../java/net/sf/json/filters/OrPropertyFilter.java | 2 +-
.../net/sf/json/filters/TruePropertyFilter.java | 2 +-
.../java/net/sf/json/groovy/JsonGroovyBuilder.java | 23 +-
src/main/java/net/sf/json/groovy/JsonSlurper.java | 82 ++
.../processors/DefaultDefaultValueProcessor.java | 45 +
.../DefaultValueProcessor.java} | 18 +-
...cher.java => DefaultValueProcessorMatcher.java} | 15 +-
.../json/processors/JsDateJsonBeanProcessor.java | 2 +-
.../json/processors/JsDateJsonValueProcessor.java | 2 +-
.../net/sf/json/processors/JsonBeanProcessor.java | 3 +-
.../json/processors/JsonBeanProcessorMatcher.java | 6 +-
.../net/sf/json/processors/JsonValueProcessor.java | 2 +-
...Matcher.java => JsonValueProcessorMatcher.java} | 14 +-
.../java/net/sf/json/processors/JsonVerifier.java | 3 +-
.../PropertyNameProcessor.java} | 20 +-
...cher.java => PropertyNameProcessorMatcher.java} | 14 +-
.../java/net/sf/json/regexp/JdkRegexpMatcher.java | 17 +-
.../net/sf/json/regexp/Perl5RegexpMatcher.java | 24 +-
.../java/net/sf/json/regexp/RegexpMatcher.java | 2 +-
src/main/java/net/sf/json/regexp/RegexpUtils.java | 15 +-
src/main/java/net/sf/json/test/JSONAssert.java | 49 +-
.../net/sf/json/util/CycleDetectionStrategy.java | 26 +-
src/main/java/net/sf/json/util/JSONBuilder.java | 25 +-
src/main/java/net/sf/json/util/JSONStringer.java | 26 +-
src/main/java/net/sf/json/util/JSONTokener.java | 59 +-
src/main/java/net/sf/json/util/JSONUtils.java | 158 +--
.../sf/json/util/JavaIdentifierTransformer.java | 2 +-
.../java/net/sf/json/util/JsonEventListener.java | 2 +-
.../net/sf/json/util/NewBeanInstanceStrategy.java | 32 +-
.../PropertyExclusionClassMatcher.java} | 16 +-
src/main/java/net/sf/json/util/PropertyFilter.java | 2 +-
.../java/net/sf/json/util/PropertySetStrategy.java | 78 ++
.../sf/json/util/WebHijackPreventionStrategy.java | 2 +-
src/main/java/net/sf/json/util/WebUtils.java | 2 +-
src/main/java/net/sf/json/xml/JSONTypes.java | 2 +-
src/main/java/net/sf/json/xml/XMLSerializer.java | 185 +++-
src/main/jdk15/net/sf/json/JSONArray.java | 573 ++++++++---
src/main/jdk15/net/sf/json/JSONObject.java | 906 +++++++++++------
src/main/jdk15/net/sf/json/util/EnumMorpher.java | 2 +-
src/main/jruby/net/sf/json/jsonarray.rb | 25 -
src/main/jruby/net/sf/json/jsonobject.rb | 41 -
src/site/fml/faq.fml | 21 +-
src/site/resources/images/logos/groovy-logo.png | Bin 0 -> 17560 bytes
src/site/resources/images/logos/jruby-logo.png | Bin 0 -> 14368 bytes
src/site/resources/scripts/shBrushJScript.js | 22 +
src/site/resources/scripts/shBrushRuby.js | 26 +
src/site/site.vm | 4 +-
src/site/site.xml | 6 +-
src/site/xdoc/advanced.xml | 19 +
src/site/xdoc/features.xml | 9 +-
src/site/xdoc/groovy.xml | 4 +-
src/site/xdoc/index.xml | 12 +-
src/site/xdoc/package.xml | 6 +-
src/site/xdoc/snippets.xml | 701 +++++++++++++
src/site/xdoc/usage.xml | 4 +-
src/site/xdoc/users.xml | 6 +
src/test/groovy/net/sf/json/groovy/AllTests.groovy | 3 +-
src/test/groovy/net/sf/json/groovy/Book.groovy | 19 +
.../net/sf/json/groovy/TestJSONArrayGroovy.groovy | 6 +-
.../net/sf/json/groovy/TestJSONObjectGroovy.groovy | 6 +-
.../sf/json/groovy/TestJsonGroovyBuilder.groovy | 20 +-
.../net/sf/json/groovy/TestJsonSlurper.groovy | 88 ++
.../net/sf/json/groovy/TestMetaClasses.groovy | 5 +-
.../AbstractJSONArrayStaticBuildersTestCase.java | 2 +-
.../AbstractJSONObjectStaticBuildersTestCase.java | 2 +-
src/test/java/net/sf/json/AbstractJSONTest.java | 2 +-
src/test/java/net/sf/json/AllTests.java | 3 +-
src/test/java/net/sf/json/Assertions.java | 6 +-
src/test/java/net/sf/json/JSONTestSuite.java | 2 +-
.../net/sf/json/PrefixerPropertyNameProcessor.java | 18 +
src/test/java/net/sf/json/PropertyConstants.java | 2 +-
src/test/java/net/sf/json/TestJSONArray.java | 103 +-
src/test/java/net/sf/json/TestJSONArrayAsJSON.java | 2 +-
src/test/java/net/sf/json/TestJSONArrayAsList.java | 2 +-
.../java/net/sf/json/TestJSONArrayCollections.java | 453 +++++++++
.../json/TestJSONArrayEqualsHashCodeCompareTo.java | 2 +-
src/test/java/net/sf/json/TestJSONArrayEvents.java | 4 +-
...TestJSONArrayStaticBuilders_Array_DynaBean.java | 2 +-
...SONArrayStaticBuilders_Collection_DynaBean.java | 2 +-
.../TestJSONArrayStaticBuilders_JSONString.java | 2 +-
.../json/TestJSONArrayStaticBuilders_String.java | 2 +-
src/test/java/net/sf/json/TestJSONFunction.java | 30 +-
src/test/java/net/sf/json/TestJSONNullAsJSON.java | 2 +-
src/test/java/net/sf/json/TestJSONObject.java | 237 ++++-
src/test/java/net/sf/json/TestJSONObjectAsMap.java | 2 +-
.../TestJSONObjectEqualsHashCodeCompareTo.java | 10 +-
.../java/net/sf/json/TestJSONObjectEvents.java | 4 +-
.../TestJSONObjectStaticBuilders_DynaBean.java | 2 +-
.../TestJSONObjectStaticBuilders_JSONObject.java | 2 +-
.../TestJSONObjectStaticBuilders_JSONString.java | 2 +-
.../TestJSONObjectStaticBuilders_JSONTokener.java | 2 +-
.../sf/json/TestJSONObjectStaticBuilders_Map.java | 2 +-
.../TestJSONObjectStaticBuilders_ObjectBean.java | 2 +-
...TestJSONObjectStaticBuilders_PrimitiveBean.java | 2 +-
.../json/TestJSONObjectStaticBuilders_String.java | 2 +-
.../net/sf/json/TestJSONObjectWithProcessors.java | 23 +-
src/test/java/net/sf/json/TestJSONSerializer.java | 6 +-
src/test/java/net/sf/json/TestUserSubmitted.java | 607 +++++++++++-
src/test/java/net/sf/json/filters/AllTests.java | 2 +-
.../net/sf/json/filters/TestAndPropertyFilter.java | 2 +-
.../json/filters/TestCompositePropertyFilter.java | 2 +-
.../sf/json/filters/TestMappingPropertyFilter.java | 2 +-
.../net/sf/json/filters/TestNotPropertyFilter.java | 2 +-
.../net/sf/json/filters/TestOrPropertyFilter.java | 2 +-
src/test/java/net/sf/json/processors/AllTests.java | 68 +-
.../StartsWithJsonBeanProcessorMatcher.java | 46 +
.../processors/TestJsDateJsonBeanProcessor.java | 170 ++--
.../processors/TestJsDateJsonValueProcessor.java | 172 ++--
.../processors/TestJsonBeanProcessorMatcher.java | 106 +-
.../json/regexp/AbstractRegexpMatcherTestCase.java | 2 +-
src/test/java/net/sf/json/regexp/AllTests.java | 2 +-
.../net/sf/json/regexp/TestJdkRegexpMatcher.java | 2 +-
.../net/sf/json/regexp/TestPerl5RegexpMatcher.java | 2 +-
src/test/java/net/sf/json/sample/ArrayBean.java | 2 +-
.../net/sf/json/sample/ArrayJSONStringBean.java | 2 +-
src/test/java/net/sf/json/sample/BeanA.java | 2 +-
src/test/java/net/sf/json/sample/BeanA1763699.java | 2 +-
src/test/java/net/sf/json/sample/BeanB.java | 2 +-
src/test/java/net/sf/json/sample/BeanB1763699.java | 2 +-
src/test/java/net/sf/json/sample/BeanC.java | 2 +-
src/test/java/net/sf/json/sample/BeanFoo.java | 2 +-
src/test/java/net/sf/json/sample/BeanWithFunc.java | 2 +-
src/test/java/net/sf/json/sample/ChildBean.java | 2 +-
src/test/java/net/sf/json/sample/ClassBean.java | 2 +-
src/test/java/net/sf/json/sample/DateBean.java | 4 +-
src/test/java/net/sf/json/sample/EmptyBean.java | 2 +-
.../sample/{BeanB1763699.java => FieldBean.java} | 15 +-
src/test/java/net/sf/json/sample/IdBean.java | 2 +-
.../json/sample/IdentityJsonValueProcessor.java} | 23 +-
.../sample/{ValueBean.java => InterfaceBean.java} | 14 +-
src/test/java/net/sf/json/sample/JSONTestBean.java | 2 +-
.../net/sf/json/sample/JavaIdentifierBean.java | 2 +-
.../java/net/sf/json/sample/JsonEventAdpater.java | 2 +-
src/test/java/net/sf/json/sample/ListingBean.java | 2 +-
.../sample/{MappingBean.java => MappedBean.java} | 26 +-
src/test/java/net/sf/json/sample/MappingBean.java | 2 +-
src/test/java/net/sf/json/sample/Media.java | 2 +-
src/test/java/net/sf/json/sample/MediaBean.java | 2 +-
src/test/java/net/sf/json/sample/MediaList.java | 2 +-
.../java/net/sf/json/sample/MediaListBean.java | 2 +-
.../java/net/sf/json/sample/NumberArrayBean.java | 84 ++
src/test/java/net/sf/json/sample/NumberBean.java | 56 +-
src/test/java/net/sf/json/sample/ObjectBean.java | 2 +-
.../net/sf/json/sample/ObjectJSONStringBean.java | 2 +-
.../{ArrayBean.java => PackageProtectedBean.java} | 17 +-
src/test/java/net/sf/json/sample/ParentBean.java | 2 +-
src/test/java/net/sf/json/sample/Player.java | 2 +-
src/test/java/net/sf/json/sample/PlayerList.java | 2 +-
.../java/net/sf/json/sample/PrimitiveBean.java | 11 +-
...{MediaList.java => PrivateConstructorBean.java} | 19 +-
src/test/java/net/sf/json/sample/PropertyBean.java | 2 +-
.../sample/{UnstandardBean.java => SetBean.java} | 46 +-
.../java/net/sf/json/sample/TransientBean.java | 2 +-
.../java/net/sf/json/sample/UnstandardBean.java | 2 +-
...an.java => UnstandardBeanInstanceStrategy.java} | 26 +-
src/test/java/net/sf/json/sample/ValueBean.java | 28 +-
src/test/java/net/sf/json/test/AllTests.java | 2 +-
src/test/java/net/sf/json/test/TestJSONAssert.java | 47 +-
src/test/java/net/sf/json/util/AllTests.java | 2 +-
.../java/net/sf/json/util/TestJSONBuilder.java | 2 +-
.../java/net/sf/json/util/TestJSONStringer.java | 2 +-
.../java/net/sf/json/util/TestJSONTokener.java | 2 +-
src/test/java/net/sf/json/util/TestJSONUtils.java | 8 +-
.../json/util/TestJavaIdentifierTransformer.java | 2 +-
src/test/java/net/sf/json/util/TestWebUtils.java | 2 +-
src/test/java/net/sf/json/xml/AllTests.java | 2 +-
.../java/net/sf/json/xml/TestUserSubmitted.java | 116 ++-
.../net/sf/json/xml/TestXMLSerializer_reads.java | 158 ++-
.../net/sf/json/xml/TestXMLSerializer_writes.java | 32 +-
src/test/jdk15/net/sf/json/TestGenerics.java | 150 +++
.../jdk15/net/sf/json/TestJSONArrayCollection.java | 186 ++++
src/test/jdk15/net/sf/json/TestJSONArrayJdk15.java | 18 +-
.../jdk15/net/sf/json/TestJSONObjectJdk15.java | 96 +-
.../jdk15/net/sf/json/bugs/TestBug2843623.java | 38 +
.../sample/{EnumBean.java => AnnotatedBean.java} | 37 +-
.../jdk15/net/sf/json/sample/AnnotationBean.java | 2 +-
src/test/jdk15/net/sf/json/sample/EnumBean.java | 16 +-
.../jdk15/net/sf/json/sample/GenericsBean.java | 94 ++
.../jdk15/net/sf/json/sample/JsonAnnotation.java | 4 +-
src/test/jdk15/net/sf/json/sample/JsonEnum.java | 2 +-
src/test/jruby/net/sf/json/jruby/tc_jsonarray.rb | 10 -
src/test/jruby/net/sf/json/jruby/tc_jsonobject.rb | 35 -
src/test/jruby/net/sf/json/jruby/testsuite.rb | 3 -
src/test/resources/net/sf/json/groovy/sample.json | 16 +
219 files changed, 8288 insertions(+), 2122 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-json.git
More information about the pkg-java-commits
mailing list