Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/47d2ad64 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/47d2ad64 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/47d2ad64 Branch: refs/heads/develop Commit: 47d2ad64f02b8ea22b6b4e5c6624ad02f694883d Parents: 912f39f 55ea6c5 Author: niclas <[email protected]> Authored: Tue Apr 4 08:01:14 2017 +0800 Committer: niclas <[email protected]> Committed: Tue Apr 4 08:01:14 2017 +0800 ---------------------------------------------------------------------- .../gradle/code/PublishingPlugin.groovy | 4 +- .../DependenciesDownloadTask.groovy | 2 +- .../dependencies/DependenciesPlugin.groovy | 2 +- .../distributions/DistributionsPlugin.groovy | 10 +- .../structure/manual/DocumentationTask.groovy | 2 +- core/api/src/docs/metrics.txt | 4 +- .../polygene/api/serialization/ConvertedBy.java | 37 ++++ .../javaxjson/JavaxJsonDeserializer.java | 30 +++- .../javaxjson/JavaxJsonFactories.java | 15 +- .../javaxjson/JavaxJsonSerializer.java | 25 ++- .../javaxjson/JavaxJsonSettings.java | 28 +++ .../AbstractConvertersSerializationTest.java | 159 +++++++++++++++++ dependencies.gradle | 28 +-- .../JavaxJsonSerializationAssembler.java | 4 +- .../javaxjson/HandCraftedJsonTest.java | 1 - .../JavaxJsonCollectionSerializationTest.java | 172 +++++++++++++++++++ .../JavaxJsonConvertersSerializationTest.java | 45 +++++ .../javaxxml/JavaxXmlDeserializer.java | 45 +++-- .../javaxxml/JavaxXmlFactories.java | 119 +++++++++++-- .../javaxxml/JavaxXmlSerializer.java | 52 +++--- .../javaxxml/JavaxXmlSettings.java | 65 ++++++- .../JavaxXmlSerializationAssembler.java | 4 +- .../javaxxml/deserializer-normalization.xsl | 17 ++ .../javaxxml/JavaxXmlAdaptersTest.java | 17 ++ ...avaxXmlConfigurationDeserializationTest.java | 24 ++- .../JavaxXmlConvertersSerializationTest.java | 67 ++++++++ .../JavaxXmlPlainValueSerializationTest.java | 7 +- .../src/test/resources/configtest.xml | 31 +++- .../src/docs/serialization-messagepack.txt | 4 +- .../messagepack/MessagePackDeserializer.java | 49 ++++-- .../messagepack/MessagePackSerializer.java | 27 ++- .../MessagePackConvertersSerializationTest.java | 44 +++++ 32 files changed, 1012 insertions(+), 128 deletions(-) ----------------------------------------------------------------------
