[libxstream-java] 01/05: Merge tag 'upstream/1.4.9'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Mar 29 10:59:08 UTC 2016


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

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

commit cc7cb343b24c614e210c3745717ac27927d0ea82
Merge: a0300af 950f48b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Mar 29 11:26:27 2016 +0200

    Merge tag 'upstream/1.4.9'
    
    Upstream version 1.4.9

 .gitattributes                                     |  17 +
 .gitignore                                         |   3 +
 .travis.yml                                        |  10 +
 BUILD.txt                                          |   6 +-
 LICENSE.txt                                        |   2 +-
 README.md                                          |  27 ++
 README.txt                                         |  23 +-
 pom.xml                                            | 231 ++++++++++---
 settings-template.xml                              |  19 +-
 svn-autoprops.config                               |  84 -----
 xstream-benchmark/pom.xml                          |  10 +-
 xstream-benchmark/profiles/osgi                    |   0
 .../xstream/tools/benchmark/Harness.java           |   3 +-
 .../xstream/tools/benchmark/Metric.java            |   3 +-
 .../xstream/tools/benchmark/Product.java           |   3 +-
 .../xstream/tools/benchmark/Reporter.java          |   3 +-
 .../xstream/tools/benchmark/Target.java            |   3 +-
 .../benchmark/metrics/CharacterCountMetric.java    |   3 +-
 .../metrics/DeserializationSpeedMetric.java        |   3 +-
 .../metrics/SerializationSpeedMetric.java          |   3 +-
 .../tools/benchmark/metrics/SizeMetric.java        |   3 +-
 .../xstream/tools/benchmark/model/A100Fields.java  |   3 +-
 .../xstream/tools/benchmark/model/A100Parents.java |   3 +-
 .../tools/benchmark/model/A50InnerClasses.java     |   3 +-
 .../benchmark/model/A50StaticInnerClasses.java     |   3 +-
 .../xstream/tools/benchmark/model/Five.java        |   3 +-
 .../xstream/tools/benchmark/model/FiveBean.java    |   3 +-
 .../xstream/tools/benchmark/model/One.java         |   3 +-
 .../xstream/tools/benchmark/model/OneBean.java     |   3 +-
 .../tools/benchmark/model/SerializableFive.java    |   3 +-
 .../tools/benchmark/model/SerializableOne.java     |   3 +-
 .../products/JavaObjectSerialization.java          |   3 +-
 .../tools/benchmark/products/XStreamBEAStax.java   |   3 +-
 .../tools/benchmark/products/XStreamBinary.java    |   3 +-
 .../tools/benchmark/products/XStreamCompact.java   |   3 +-
 .../tools/benchmark/products/XStreamDom.java       |   3 +-
 .../tools/benchmark/products/XStreamDom4J.java     |   3 +-
 .../tools/benchmark/products/XStreamDriver.java    |   3 +-
 .../tools/benchmark/products/XStreamJDom.java      |   3 +-
 .../tools/benchmark/products/XStreamKXml2.java     |   3 +-
 .../tools/benchmark/products/XStreamKXml2DOM.java  |   3 +-
 .../tools/benchmark/products/XStreamSjsxp.java     |   3 +-
 .../tools/benchmark/products/XStreamStax.java      |   3 +-
 .../tools/benchmark/products/XStreamWoodstox.java  |   3 +-
 .../tools/benchmark/products/XStreamXom.java       |   3 +-
 .../tools/benchmark/products/XStreamXpp.java       |   3 +-
 .../tools/benchmark/products/XStreamXpp3.java      |   3 +-
 .../tools/benchmark/products/XStreamXpp3DOM.java   |   3 +-
 .../tools/benchmark/reporters/HtmlReporter.java    |   5 +-
 .../tools/benchmark/reporters/MultiReporter.java   |   3 +-
 .../tools/benchmark/reporters/TextReporter.java    |   3 +-
 .../tools/benchmark/targets/BasicTarget.java       |   3 +-
 .../tools/benchmark/targets/ExtendedTarget.java    |   3 +-
 .../tools/benchmark/targets/JTreeTarget.java       |   3 +-
 .../tools/benchmark/targets/JavaBeanTarget.java    |   3 +-
 .../tools/benchmark/targets/ListTarget.java        |   3 +-
 .../xstream/tools/benchmark/targets/Person.java    |   3 +-
 .../tools/benchmark/targets/ReflectionTarget.java  |   3 +-
 .../benchmark/targets/SerializableTarget.java      |   3 +-
 .../tools/benchmark/targets/StringTarget.java      |   3 +-
 .../benchmark/targets/UserDefinedClassTarget.java  |   3 +-
 xstream-distribution/pom.xml                       |  17 +-
 xstream-distribution/src/content/benchmarks.html   | 289 ++++++++++++++++
 xstream-distribution/src/content/changes.html      |  93 +++++-
 xstream-distribution/src/content/converters.html   |  53 ++-
 xstream-distribution/src/content/download.html     |  83 +++--
 xstream-distribution/src/content/faq.html          |  90 ++++-
 .../src/content/how-to-contribute.html             |  37 +-
 xstream-distribution/src/content/index.html        |  14 +-
 xstream-distribution/src/content/issues.html       |  23 +-
 .../src/content/json-tutorial.html                 |   6 +-
 xstream-distribution/src/content/license.html      |   4 +-
 xstream-distribution/src/content/list-dev.html     |  43 ---
 xstream-distribution/src/content/list-user.html    |  41 ---
 .../src/content/mailing-lists.html                 |  44 +++
 xstream-distribution/src/content/manual.html       |  56 ----
 xstream-distribution/src/content/news.html         |  35 +-
 .../src/content/parser-benchmarks.html             | 145 --------
 xstream-distribution/src/content/references.html   |  11 +-
 xstream-distribution/src/content/repository.html   |  45 +--
 xstream-distribution/src/content/security.html     |   6 +-
 xstream-distribution/src/content/team.html         |   6 +-
 xstream-distribution/src/content/website.xml       |  11 +-
 xstream-distribution/src/xsite/xsite.xml           |  19 +-
 xstream-hibernate/pom.xml                          |  14 +-
 xstream-hibernate/profiles/osgi                    |   0
 {xstream-benchmark => xstream-jmh}/pom.xml         | 126 ++++---
 xstream-jmh/src/application/bin/xstream-jmh.cmd    |  71 ++++
 xstream-jmh/src/application/bin/xstream-jmh.sh     |  65 ++++
 xstream-jmh/src/assembly-app.xml                   |  43 +++
 .../benchmark/jmh/ConverterTypeBenchmark.java      | 282 ++++++++++++++++
 .../xstream/benchmark/jmh/NameCoderBenchmark.java  | 332 ++++++++++++++++++
 .../xstream/benchmark/jmh/ParserBenchmark.java     | 372 +++++++++++++++++++++
 .../benchmark/jmh/StringConverterBenchmark.java    | 328 ++++++++++++++++++
 xstream-jmh/src/reference/converterType.txt        |   4 +
 xstream-jmh/src/reference/nameCoder.txt            |   6 +
 xstream-jmh/src/reference/parsers.txt              |  37 ++
 xstream-jmh/src/reference/stringConverter.txt      |   7 +
 xstream/pom.xml                                    |  17 +-
 xstream/profiles/osgi                              |   0
 .../src/java/com/thoughtworks/xstream/XStream.java | 220 +++++++-----
 .../com/thoughtworks/xstream/XStreamException.java |  14 +-
 .../java/com/thoughtworks/xstream/XStreamer.java   |  14 +-
 .../xstream/annotations/Annotations.java           |   0
 .../xstream/annotations/XStreamAlias.java          |   0
 .../xstream/annotations/XStreamContainedType.java  |   0
 .../xstream/annotations/XStreamConverter.java      |  10 +-
 .../xstream/converters/ConversionException.java    |  77 +----
 ...onException.java => ErrorWritingException.java} |  73 ++--
 .../xstream/converters/basic/DateConverter.java    |   6 +-
 .../collections/AbstractCollectionConverter.java   |  12 +-
 .../converters/collections/TreeMapConverter.java   |   6 +-
 .../converters/collections/TreeSetConverter.java   |   6 +-
 .../converters/enums/EnumToStringConverter.java    |  17 +-
 .../extended/ActivationDataFlavorConverter.java    |  94 ++++++
 .../ISO8601GregorianCalendarConverter.java         |   6 +-
 .../converters/extended/NamedMapConverter.java     |  16 +-
 .../xstream/converters/extended/PathConverter.java |  59 ++++
 .../extended/StackTraceElementFactory.java         |  35 +-
 .../extended/ToAttributedValueConverter.java       |  19 +-
 .../converters/extended/ToStringConverter.java     |   8 +-
 .../xstream/converters/javabean/BeanProvider.java  |  55 ++-
 .../converters/javabean/JavaBeanConverter.java     |  28 +-
 .../converters/javabean/PropertyDictionary.java    |   7 +-
 ...ributedCharacterIteratorAttributeConverter.java |  11 +-
 .../reflection/AbstractReflectionConverter.java    | 171 ++++++----
 .../reflection/CGLIBEnhancedConverter.java         |  33 +-
 .../reflection/ExternalizableConverter.java        |  17 +-
 .../converters/reflection/FieldDictionary.java     | 201 ++++++-----
 .../reflection/MissingFieldException.java          |   5 +-
 .../reflection/ObjectAccessException.java          |   6 +-
 .../reflection/PureJavaReflectionProvider.java     |  40 +--
 .../reflection/SerializableConverter.java          |  30 +-
 .../reflection/SortableFieldKeySorter.java         |  58 ++--
 .../SunLimitedUnsafeReflectionProvider.java        |  18 +-
 .../reflection/SunUnsafeReflectionProvider.java    |  21 +-
 .../core/AbstractReferenceUnmarshaller.java        |  17 +-
 .../thoughtworks/xstream/core/BaseException.java   |   7 +-
 .../xstream/core/DefaultConverterLookup.java       |   6 +-
 .../xstream/core/util/CustomObjectInputStream.java |   9 +-
 .../core/util/CustomObjectOutputStream.java        |   9 +-
 .../core/util/DependencyInjectionFactory.java      |  58 ++--
 .../com/thoughtworks/xstream/core/util/Fields.java |  66 ++--
 .../xstream/core/util/SerializationMembers.java    |  60 ++--
 .../core/util/ThreadSafePropertyEditor.java        |  13 +-
 .../xstream/io/xml/AbstractXppDriver.java          |   6 +-
 .../thoughtworks/xstream/io/xml/BEAStaxDriver.java |  12 +-
 .../thoughtworks/xstream/io/xml/Dom4JDriver.java   |  32 +-
 .../com/thoughtworks/xstream/io/xml/DomDriver.java |  50 ++-
 .../thoughtworks/xstream/io/xml/JDom2Driver.java   |  30 +-
 .../thoughtworks/xstream/io/xml/JDomDriver.java    |  30 +-
 .../com/thoughtworks/xstream/io/xml/QNameMap.java  |   2 +-
 .../thoughtworks/xstream/io/xml/SjsxpDriver.java   |   8 +-
 .../xstream/io/xml/StandardStaxDriver.java         |  10 +-
 .../thoughtworks/xstream/io/xml/StaxDriver.java    |   8 +-
 .../thoughtworks/xstream/io/xml/StaxReader.java    |   2 +-
 .../thoughtworks/xstream/io/xml/StaxWriter.java    |   2 +-
 .../thoughtworks/xstream/io/xml/WstxDriver.java    |   6 +-
 .../com/thoughtworks/xstream/io/xml/XomDriver.java |  50 ++-
 .../xstream/mapper/AnnotationMapper.java           |  11 +-
 .../xstream/mapper/ClassAliasingMapper.java        |  10 +-
 .../thoughtworks/xstream/mapper/DefaultMapper.java |  18 +-
 .../thoughtworks/xstream/mapper/EnumMapper.java    |  36 +-
 .../xstream/mapper/ImmutableTypesMapper.java       |  36 +-
 .../xstream/mapper/ImplicitCollectionMapper.java   |  60 ++--
 .../com/thoughtworks/xstream/mapper/Mapper.java    |  31 +-
 .../thoughtworks/xstream/mapper/MapperWrapper.java |   6 +-
 .../xstream/mapper/OuterClassMapper.java           |  72 +++-
 .../persistence/FilePersistenceStrategy.java       |  81 +++--
 .../acceptance/AbstractAcceptanceTest.java         |  14 +-
 .../acceptance/AbstractReferenceTest.java          |  59 +++-
 .../acceptance/Extended17TypesTest.java            |  64 ++++
 .../thoughtworks/acceptance/FinalFieldsTest.java   |   4 +-
 .../thoughtworks/acceptance/ImplicitArrayTest.java | 177 +++++++++-
 .../acceptance/ImplicitCollectionTest.java         | 181 +++++++++-
 .../thoughtworks/acceptance/ImplicitMapTest.java   | 271 ++++++++++++---
 .../com/thoughtworks/acceptance/ImplicitTest.java  | 120 ++++++-
 .../thoughtworks/acceptance/InnerClassesTest.java  | 110 +++++-
 .../acceptance/NamedLocalElementsTest.java         |  22 +-
 .../acceptance/SecurityManagerTest.java            |   3 +-
 .../test/com/thoughtworks/acceptance/XStreamer.xsl |   4 +-
 .../acceptance/annotations/FieldConverterTest.java |  25 +-
 .../annotations/ParametrizedConverterTest.java     |  97 +++++-
 .../acceptance/someobjects/Handler.java            |   2 +-
 .../acceptance/someobjects/HandlerManager.java     |   2 +-
 .../acceptance/someobjects/Protocol.java           |   2 +-
 .../converters/ConversionExceptionTest.java        |   3 +-
 .../ActivationDataFlavorConverterTest.java         |  56 ++++
 .../extended/ToAttributedValueConverterTest.java   |   2 +-
 .../converters/javabean/JavaBeanConverterTest.java |  38 ++-
 .../converters/reflection/FieldDictionaryTest.java | 120 ++++++-
 .../reflection/SortableFieldKeySorterTest.java     |   8 +-
 .../ReferenceByXPathMarshallingStrategyTest.java   | 145 +++++++-
 .../core/util/DependencyInjectionFactoryTest.java  |  19 +-
 .../xstream/io/binary/BinaryStreamTest.java        |  15 +-
 .../io/copy/HierarchicalStreamCopierTest.java      |  15 +-
 .../xstream/io/xml/AbstractXMLReaderTest.java      |  27 +-
 .../xstream/io/xml/BEAStaxReaderTest.java          |  18 +-
 .../xstream/io/xml/Dom4JReaderTest.java            |  36 +-
 .../thoughtworks/xstream/io/xml/DomReaderTest.java |  47 ++-
 .../xstream/io/xml/JDom2ReaderTest.java            |  58 +++-
 .../xstream/io/xml/JDomReaderTest.java             |  58 +++-
 .../xstream/io/xml/KXml2ReaderTest.java            |  15 +-
 .../xstream/io/xml/SjsxpReaderTest.java            |  11 +-
 ...ReaderTest.java => StandardStaxReaderTest.java} |  28 +-
 .../xstream/io/xml/StaxReaderTest.java             |  47 ++-
 .../xstream/io/xml/WstxReaderTest.java             |  27 +-
 .../thoughtworks/xstream/io/xml/XomReaderTest.java |  42 ++-
 .../xstream/io/xml/Xpp3ReaderTest.java             |  15 +-
 .../xstream/io/xml/XppDomReaderTest.java           |  15 +-
 .../thoughtworks/xstream/io/xml/XppReaderTest.java |  15 +-
 211 files changed, 6020 insertions(+), 1720 deletions(-)

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



More information about the pkg-java-commits mailing list