This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository json-smart.
from 129f19c Merge tag 'upstream/1.2'
adds c531a2d Imported Upstream version 2.2
new 810666e Merge tag 'upstream/2.2'
new 6cabd04 Build the new accessors-smart module
new 1b7d843 Standards-Version updated to 3.9.8
new b237d22 Ignore the timezone dependent tests in TestDateConvert
new d1b6ecb Upload to unstable
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 31 +-
README.md | 38 ++
accessors-smart/.gitignore | 1 +
accessors-smart/pom.xml | 69 +++
.../src/main/java/net/minidev/asm/ASMUtil.java | 253 ++++++++++
.../src/main/java/net/minidev/asm/Accessor.java | 187 +++++++
.../java/net/minidev/asm/BasicFiledFilter.java | 29 ++
.../src/main/java/net/minidev/asm/BeansAccess.java | 197 ++++++++
.../java/net/minidev/asm/BeansAccessBuilder.java | 463 ++++++++++++++++++
.../java/net/minidev/asm/BeansAccessConfig.java | 74 +++
.../src/main/java/net/minidev/asm/ConvertDate.java | 290 +++++++++++
.../java/net/minidev/asm/DefaultConverter.java | 183 +++++++
.../java/net/minidev/asm/DynamicClassLoader.java | 88 ++++
.../src/main/java/net/minidev/asm/FieldFilter.java | 27 +
.../java/net/minidev/asm/ex/ConvertException.java | 14 +
.../net/minidev/asm/ex/NoSuchFieldException.java | 19 +
.../src/test/java/net/minidev/asm/ASMTest.java | 130 +++++
.../java/net/minidev/asm/BTestBeansAccessB.java | 185 +++++++
.../test/java/net/minidev/asm/TestDateConvert.java | 87 ++++
.../test/java/net/minidev/asm/TestNewInstance.java | 13 +
.../test/java/net/minidev/asm/bean/BBoolPriv.java | 13 +
.../test/java/net/minidev/asm/bean/BBoolPub.java | 5 +
.../java/net/minidev/asm/bean/BBooleanPriv.java | 13 +
.../java/net/minidev/asm/bean/BBooleanPub.java | 5 +
.../test/java/net/minidev/asm/bean/BEnumPriv.java | 13 +
.../java/net/minidev/asm/bean/BEnumPrivAc.java | 52 ++
.../test/java/net/minidev/asm/bean/BEnumPub.java | 5 +
.../test/java/net/minidev/asm/bean/BLongPriv.java | 13 +
.../java/net/minidev/asm/bean/BLongPrivAc.java | 46 ++
.../test/java/net/minidev/asm/bean/BLongPub.java | 5 +
.../test/java/net/minidev/asm/bean/BLongPubAc.java | 46 ++
.../java/net/minidev/asm/bean/BObjectPriv.java | 13 +
.../test/java/net/minidev/asm/bean/BObjectPub.java | 5 +
.../test/java/net/minidev/asm/bean/BStrPriv.java | 14 +
.../test/java/net/minidev/asm/bean/BStrPrivAc.java | 49 ++
.../test/java/net/minidev/asm/bean/BStrPub.java | 5 +
.../test/java/net/minidev/asm/bean/BStrPubAc.java | 49 ++
.../src/test/java/net/minidev/asm/bean/BTest.java | 33 ++
.../src/test/java/net/minidev/asm/bean/TEnum.java | 5 +
.../java/net/minidev/asm/bean/TestAsmAtom.java | 104 ++++
debian/changelog | 9 +
debian/control | 2 +-
debian/copyright | 2 +-
debian/libjson-smart-java.poms | 6 +-
debian/patches/01-bundle-dependencies.patch | 15 +
debian/patches/02-ignore-failing-tests.patch | 43 ++
debian/patches/series | 2 +
debian/rules | 5 +-
{json-smart => json-smart-backport}/pom.xml | 48 +-
json-smart-mini/ChangeLog.txt | 8 -
json-smart-mini/LICENSE.txt | 202 --------
json-smart-mini/pom.xml | 35 --
json-smart-mini/readme.txt | 2 -
.../src/main/java/net/minidev/json/JSONArray.java | 84 ----
.../src/main/java/net/minidev/json/JSONAware.java | 12 -
.../src/main/java/net/minidev/json/JSONObject.java | 188 -------
.../java/net/minidev/json/JSONStreamAware.java | 14 -
.../src/main/java/net/minidev/json/JSONValue.java | 164 -------
.../src/main/java/net/minidev/json/JStylerObj.java | 108 ----
.../net/minidev/json/parser/ContainerFactory.java | 31 --
.../net/minidev/json/parser/ContentHandler.java | 110 -----
.../java/net/minidev/json/parser/JSONParser.java | 80 ---
.../net/minidev/json/parser/JSONParserStream.java | 466 ------------------
.../net/minidev/json/parser/ParseException.java | 88 ----
.../test/java/net/minidev/json/test/TestFloat.java | 34 --
.../test/java/net/minidev/json/test/TestInts.java | 42 --
.../java/net/minidev/json/test/TestKeyword.java | 31 --
.../java/net/minidev/json/test/TestString.java | 30 --
json-smart-sample/pom.xml | 28 --
json-smart/pom.xml | 45 +-
.../src/main/java/net/minidev/json/JSONArray.java | 22 +-
.../main/java/net/minidev/json/JSONAwareEx.java | 5 +-
.../src/main/java/net/minidev/json/JSONNavi.java | 108 ++--
.../src/main/java/net/minidev/json/JSONObject.java | 67 +--
.../src/main/java/net/minidev/json/JSONStyle.java | 27 +-
.../main/java/net/minidev/json/JSONStyleIdent.java | 127 -----
.../src/main/java/net/minidev/json/JSONUtil.java | 200 +++++++-
.../src/main/java/net/minidev/json/JSONValue.java | 542 +++++++++------------
.../src/main/java/net/minidev/json/JStylerObj.java | 57 +--
.../java/net/minidev/json/annotate/JsonIgnore.java | 33 ++
.../minidev/json/annotate/JsonSmartAnnotation.java | 19 +
.../net/minidev/json/parser/ContainerFactory.java | 70 ---
.../net/minidev/json/parser/ContentHandler.java | 123 -----
.../json/parser/ContentHandlerCompressor.java | 137 ------
.../minidev/json/parser/ContentHandlerDumy.java | 65 ---
.../minidev/json/parser/FakeContainerFactory.java | 81 ---
.../java/net/minidev/json/parser/JSONParser.java | 159 +++---
.../net/minidev/json/parser/JSONParserBase.java | 230 ++++++---
.../minidev/json/parser/JSONParserByteArray.java | 55 ++-
.../minidev/json/parser/JSONParserInputStream.java | 29 +-
.../net/minidev/json/parser/JSONParserMemory.java | 5 +-
.../net/minidev/json/parser/JSONParserReader.java | 27 +-
.../net/minidev/json/parser/JSONParserString.java | 31 +-
.../net/minidev/json/parser/ParseException.java | 2 +-
.../java/net/minidev/json/reader/ArrayWriter.java | 21 +
.../java/net/minidev/json/reader/BeansWriter.java | 63 +++
.../net/minidev/json/reader/BeansWriterASM.java | 36 ++
.../minidev/json/reader/BeansWriterASMRemap.java | 53 ++
.../java/net/minidev/json/reader/JsonWriter.java | 395 +++++++++++++++
.../java/net/minidev/json/reader/JsonWriterI.java | 9 +
.../java/net/minidev/json/writer/ArraysMapper.java | 309 ++++++++++++
.../java/net/minidev/json/writer/BeansMapper.java | 153 ++++++
.../net/minidev/json/writer/CollectionMapper.java | 252 ++++++++++
.../net/minidev/json/writer/CompessorMapper.java | 218 +++++++++
.../net/minidev/json/writer/DefaultMapper.java | 63 +++
.../json/writer/DefaultMapperCollection.java | 74 +++
.../minidev/json/writer/DefaultMapperOrdered.java | 58 +++
.../java/net/minidev/json/writer/FakeMapper.java | 54 ++
.../java/net/minidev/json/writer/JsonReader.java | 155 ++++++
.../java/net/minidev/json/writer/JsonReaderI.java | 110 +++++
.../net/minidev/json/writer/MapperRemapped.java | 71 +++
.../net/minidev/json/writer/UpdaterMapper.java | 94 ++++
.../test/java/net/minidev/json/test/BugReport.java | 23 -
.../java/net/minidev/json/test/MustThrows.java | 32 +-
.../java/net/minidev/json/test/TestBigValue.java | 43 ++
.../java/net/minidev/json/test/TestCompressor.java | 8 -
.../test/java/net/minidev/json/test/TestFloat.java | 11 +
.../test/java/net/minidev/json/test/TestInts.java | 8 +-
.../net/minidev/json/test/TestInvalidNumber.java | 54 ++
.../java/net/minidev/json/test/TestKeyword.java | 2 +-
.../test/java/net/minidev/json/test/TestMisc.java | 9 +-
.../test/java/net/minidev/json/test/TestNavi.java | 38 +-
.../java/net/minidev/json/test/TestStrict.java | 8 +
.../java/net/minidev/json/test/TestString.java | 6 -
.../minidev/json/test/strict/TestTaillingJunk.java | 14 +-
.../net/minidev/json/test/strict/TestZeroLead.java | 21 +-
.../json/test/writer/TestWriteFeatures.java | 28 ++
.../json/testMapping/TestAdvancedMapper.java | 35 ++
.../json/testMapping/TestCustomMappingInstant.java | 72 +++
.../{TestSerPrimArrays.java => TestDate.java} | 2 +-
.../minidev/json/testMapping/TestFieldRename.java | 25 +
.../net/minidev/json/testMapping/TestMapBeans.java | 56 +--
.../json/testMapping/TestMapPrimArrays.java | 44 ++
.../minidev/json/testMapping/TestMapPublic.java | 244 ++--------
.../minidev/json/testMapping/TestMapPublic2.java | 33 ++
.../json/testMapping/TestSerPrimArrays.java | 40 +-
.../net/minidev/json/testMapping/TestUpdater.java | 58 +++
parent/pom.xml | 101 ++--
138 files changed, 6788 insertions(+), 3441 deletions(-)
create mode 100644 README.md
create mode 100644 accessors-smart/.gitignore
create mode 100644 accessors-smart/pom.xml
create mode 100644 accessors-smart/src/main/java/net/minidev/asm/ASMUtil.java
create mode 100644 accessors-smart/src/main/java/net/minidev/asm/Accessor.java
create mode 100644
accessors-smart/src/main/java/net/minidev/asm/BasicFiledFilter.java
create mode 100644
accessors-smart/src/main/java/net/minidev/asm/BeansAccess.java
create mode 100644
accessors-smart/src/main/java/net/minidev/asm/BeansAccessBuilder.java
create mode 100644
accessors-smart/src/main/java/net/minidev/asm/BeansAccessConfig.java
create mode 100644
accessors-smart/src/main/java/net/minidev/asm/ConvertDate.java
create mode 100644
accessors-smart/src/main/java/net/minidev/asm/DefaultConverter.java
create mode 100644
accessors-smart/src/main/java/net/minidev/asm/DynamicClassLoader.java
create mode 100644
accessors-smart/src/main/java/net/minidev/asm/FieldFilter.java
create mode 100644
accessors-smart/src/main/java/net/minidev/asm/ex/ConvertException.java
create mode 100644
accessors-smart/src/main/java/net/minidev/asm/ex/NoSuchFieldException.java
create mode 100644 accessors-smart/src/test/java/net/minidev/asm/ASMTest.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/BTestBeansAccessB.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/TestDateConvert.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/TestNewInstance.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BBoolPriv.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BBoolPub.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BBooleanPriv.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BBooleanPub.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BEnumPriv.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BEnumPrivAc.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BEnumPub.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BLongPriv.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BLongPrivAc.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BLongPub.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BLongPubAc.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BObjectPriv.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BObjectPub.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BStrPriv.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BStrPrivAc.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BStrPub.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BStrPubAc.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/BTest.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/TEnum.java
create mode 100644
accessors-smart/src/test/java/net/minidev/asm/bean/TestAsmAtom.java
create mode 100644 debian/patches/01-bundle-dependencies.patch
create mode 100644 debian/patches/02-ignore-failing-tests.patch
create mode 100644 debian/patches/series
copy {json-smart => json-smart-backport}/pom.xml (52%)
delete mode 100644 json-smart-mini/ChangeLog.txt
delete mode 100644 json-smart-mini/LICENSE.txt
delete mode 100644 json-smart-mini/pom.xml
delete mode 100644 json-smart-mini/readme.txt
delete mode 100644
json-smart-mini/src/main/java/net/minidev/json/JSONArray.java
delete mode 100644
json-smart-mini/src/main/java/net/minidev/json/JSONAware.java
delete mode 100644
json-smart-mini/src/main/java/net/minidev/json/JSONObject.java
delete mode 100644
json-smart-mini/src/main/java/net/minidev/json/JSONStreamAware.java
delete mode 100644
json-smart-mini/src/main/java/net/minidev/json/JSONValue.java
delete mode 100644
json-smart-mini/src/main/java/net/minidev/json/JStylerObj.java
delete mode 100644
json-smart-mini/src/main/java/net/minidev/json/parser/ContainerFactory.java
delete mode 100644
json-smart-mini/src/main/java/net/minidev/json/parser/ContentHandler.java
delete mode 100644
json-smart-mini/src/main/java/net/minidev/json/parser/JSONParser.java
delete mode 100644
json-smart-mini/src/main/java/net/minidev/json/parser/JSONParserStream.java
delete mode 100644
json-smart-mini/src/main/java/net/minidev/json/parser/ParseException.java
delete mode 100644
json-smart-mini/src/test/java/net/minidev/json/test/TestFloat.java
delete mode 100644
json-smart-mini/src/test/java/net/minidev/json/test/TestInts.java
delete mode 100644
json-smart-mini/src/test/java/net/minidev/json/test/TestKeyword.java
delete mode 100644
json-smart-mini/src/test/java/net/minidev/json/test/TestString.java
delete mode 100644 json-smart-sample/pom.xml
delete mode 100644
json-smart/src/main/java/net/minidev/json/JSONStyleIdent.java
create mode 100644
json-smart/src/main/java/net/minidev/json/annotate/JsonIgnore.java
create mode 100644
json-smart/src/main/java/net/minidev/json/annotate/JsonSmartAnnotation.java
delete mode 100644
json-smart/src/main/java/net/minidev/json/parser/ContainerFactory.java
delete mode 100644
json-smart/src/main/java/net/minidev/json/parser/ContentHandler.java
delete mode 100644
json-smart/src/main/java/net/minidev/json/parser/ContentHandlerCompressor.java
delete mode 100644
json-smart/src/main/java/net/minidev/json/parser/ContentHandlerDumy.java
delete mode 100644
json-smart/src/main/java/net/minidev/json/parser/FakeContainerFactory.java
create mode 100644
json-smart/src/main/java/net/minidev/json/reader/ArrayWriter.java
create mode 100644
json-smart/src/main/java/net/minidev/json/reader/BeansWriter.java
create mode 100644
json-smart/src/main/java/net/minidev/json/reader/BeansWriterASM.java
create mode 100644
json-smart/src/main/java/net/minidev/json/reader/BeansWriterASMRemap.java
create mode 100644
json-smart/src/main/java/net/minidev/json/reader/JsonWriter.java
create mode 100644
json-smart/src/main/java/net/minidev/json/reader/JsonWriterI.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/ArraysMapper.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/BeansMapper.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/CollectionMapper.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/CompessorMapper.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/DefaultMapper.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/DefaultMapperCollection.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/DefaultMapperOrdered.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/FakeMapper.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/JsonReader.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/JsonReaderI.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/MapperRemapped.java
create mode 100644
json-smart/src/main/java/net/minidev/json/writer/UpdaterMapper.java
delete mode 100644
json-smart/src/test/java/net/minidev/json/test/BugReport.java
create mode 100644
json-smart/src/test/java/net/minidev/json/test/TestBigValue.java
create mode 100644
json-smart/src/test/java/net/minidev/json/test/TestInvalidNumber.java
create mode 100644
json-smart/src/test/java/net/minidev/json/test/writer/TestWriteFeatures.java
create mode 100644
json-smart/src/test/java/net/minidev/json/testMapping/TestAdvancedMapper.java
create mode 100644
json-smart/src/test/java/net/minidev/json/testMapping/TestCustomMappingInstant.java
copy
json-smart/src/test/java/net/minidev/json/testMapping/{TestSerPrimArrays.java
=> TestDate.java} (90%)
create mode 100644
json-smart/src/test/java/net/minidev/json/testMapping/TestFieldRename.java
create mode 100644
json-smart/src/test/java/net/minidev/json/testMapping/TestMapPrimArrays.java
create mode 100644
json-smart/src/test/java/net/minidev/json/testMapping/TestMapPublic2.java
create mode 100644
json-smart/src/test/java/net/minidev/json/testMapping/TestUpdater.java
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/json-smart.git
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
