This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jenkins-xstream.
commit 0dbccc528c565cb6b6f43dca0d70e816f0deeb6f Merge: 6b9590a ec349b1 Author: Emmanuel Bourg <[email protected]> Date: Fri Sep 5 22:59:24 2014 +0200 Merge tag 'upstream/1.4.7-jenkins-1' Upstream version 1.4.7-jenkins-1 pom.xml | 196 ++++++- xstream-benchmark/pom.xml | 54 +- .../xstream/tools/benchmark/Harness.java | 8 +- .../cache/products/AliasedAttributeCache.java | 7 +- .../tools/benchmark/cache/products/Cache122.java | 10 +- .../cache/products/DefaultImplementationCache.java | 7 +- .../benchmark/cache/products/RealClassCache.java | 7 +- .../cache/products/SerializedClassCache.java | 7 +- .../benchmark/cache/products/XStreamCache.java | 25 +- xstream-builder/pom.xml | 33 -- .../com/thoughtworks/xstream/ReadOnlyXStream.java | 32 -- .../thoughtworks/xstream/builder/FieldConfig.java | 56 -- .../thoughtworks/xstream/builder/TypeConfig.java | 55 -- .../xstream/builder/XStreamBuilder.java | 124 ----- .../processor/AbsoluteReferencesProcessor.java | 27 - .../builder/processor/AliasFieldProcessor.java | 27 - .../builder/processor/AliasTypeProcessor.java | 27 - .../xstream/builder/processor/ConfigProcessor.java | 24 - .../builder/processor/ConverterProcessor.java | 28 - .../builder/processor/FieldConfigProcessor.java | 24 - .../builder/processor/IdReferencesProcessor.java | 27 - .../builder/processor/IgnoreFieldProcessor.java | 32 -- .../builder/processor/ImplementedByProcessor.java | 27 - .../builder/processor/NoReferencesProcessor.java | 27 - .../builder/processor/TypeConfigProcessor.java | 24 - .../annotations/AnnotatedTypeProcessor.java | 23 - .../acceptance/AbstractBuilderAcceptanceTest.java | 228 -------- .../acceptance/XStreamBuilderTest.java | 209 ------- .../annotations/XStreamBuilderAnnotationsTest.java | 38 -- xstream-distribution/pom.xml | 30 +- .../src/content/annotations-tutorial.html | 4 +- xstream-distribution/src/content/changes.html | 232 +++++++- .../src/content/converter-tutorial.html | 7 +- xstream-distribution/src/content/converters.html | 365 +++++++++---- xstream-distribution/src/content/download.html | 43 +- xstream-distribution/src/content/faq.html | 158 ++++-- .../src/content/how-to-contribute.html | 31 +- xstream-distribution/src/content/index.html | 15 +- xstream-distribution/src/content/issues.html | 9 +- .../src/content/json-tutorial.html | 7 +- .../src/content/manual-tweaking-output.html | 7 +- xstream-distribution/src/content/news.html | 69 ++- xstream-distribution/src/content/security.html | 255 +++++++++ xstream-distribution/src/content/team.html | 7 +- xstream-distribution/src/content/website.xml | 1 + xstream-hibernate/pom.xml | 57 +- .../HibernatePersistentCollectionConverter.java | 19 +- .../converter/HibernatePersistentMapConverter.java | 9 +- .../HibernatePersistentSortedMapConverter.java | 9 +- .../HibernatePersistentSortedSetConverter.java | 9 +- .../xstream/hibernate/mapper/HibernateMapper.java | 21 +- .../thoughtworks/xstream/hibernate/package.html | 9 +- .../xstream/hibernate/util/Hibernate.java | 21 +- xstream/pom.xml | 81 ++- .../src/java/com/thoughtworks/xstream/XStream.java | 542 ++++++++++++++---- .../java/com/thoughtworks/xstream/XStreamer.java | 201 +++++-- .../xstream/annotations/XStreamAlias.java | 12 +- .../xstream/annotations/XStreamAliasType.java | 29 + .../xstream/annotations/XStreamConverter.java | 52 +- .../thoughtworks/xstream/converters/Converter.java | 14 +- .../xstream/converters/ConverterLookup.java | 5 +- .../xstream/converters/SingleValueConverter.java | 4 +- .../converters/SingleValueConverterWrapper.java | 4 +- .../basic/AbstractSingleValueConverter.java | 4 +- .../xstream/converters/basic/LongConverter.java | 36 +- .../collections/AbstractCollectionConverter.java | 4 +- .../collections/CollectionConverter.java | 35 +- .../converters/collections/MapConverter.java | 37 +- .../collections/PropertiesConverter.java | 15 +- .../converters/collections/TreeMapConverter.java | 33 +- .../converters/collections/TreeSetConverter.java | 35 +- .../xstream/converters/enums/EnumConverter.java | 2 +- .../xstream/converters/enums/EnumMapConverter.java | 26 +- .../xstream/converters/enums/EnumSetConverter.java | 24 +- .../converters/enums/EnumSingleValueConverter.java | 4 +- .../converters/enums/EnumToStringConverter.java | 105 ++++ .../converters/extended/DynamicProxyConverter.java | 49 +- .../xstream/converters/extended/FontConverter.java | 96 +++- .../ISO8601GregorianCalendarConverter.java | 9 +- .../converters/extended/JavaClassConverter.java | 61 ++- .../converters/extended/JavaFieldConverter.java | 38 +- .../converters/extended/JavaMethodConverter.java | 26 +- .../converters/extended/LookAndFeelConverter.java | 4 +- .../converters/extended/NamedArrayConverter.java | 107 ++++ .../extended/NamedCollectionConverter.java | 89 +++ .../converters/extended/NamedMapConverter.java | 391 +++++++++++++ .../converters/extended/RegexPatternConverter.java | 32 +- .../extended/StackTraceElementConverter.java | 31 +- .../extended/StackTraceElementFactory.java | 2 +- .../extended/StackTraceElementFactory15.java | 25 + .../converters/extended/ThrowableConverter.java | 26 +- .../extended/ToAttributedValueConverter.java | 55 +- .../extended/UseAttributeForEnumMapper.java | 66 +++ .../xstream/converters/javabean/BeanProvider.java | 29 +- .../converters/javabean/JavaBeanConverter.java | 8 +- ...ributedCharacterIteratorAttributeConverter.java | 106 +++- .../reflection/AbstractReflectionConverter.java | 456 ++++++++++------ .../reflection/CGLIBEnhancedConverter.java | 34 +- .../reflection/ExternalizableConverter.java | 29 +- .../converters/reflection/FieldDictionary.java | 4 +- .../reflection/PureJavaReflectionProvider.java | 39 +- .../converters/reflection/ReflectionConverter.java | 23 +- .../converters/reflection/ReflectionProvider.java | 53 +- .../reflection/ReflectionProviderWrapper.java | 5 +- .../reflection/SelfStreamingInstanceChecker.java | 31 +- .../reflection/SerializableConverter.java | 55 +- .../reflection/SerializationMethodInvoker.java | 5 +- .../reflection/Sun14ReflectionProvider.java | 162 +----- .../SunLimitedUnsafeReflectionProvider.java | 94 ++++ .../reflection/SunUnsafeReflectionProvider.java | 120 ++++ .../xstream/core/ClassLoaderReference.java | 44 ++ .../xstream/core/DefaultConverterLookup.java | 8 +- .../java/com/thoughtworks/xstream/core/JVM.java | 449 +++++++++------ .../xstream/core/util/ClassLoaderReference.java | 23 +- .../xstream/core/util/CompositeClassLoader.java | 19 +- .../xstream/core/util/CustomObjectInputStream.java | 30 +- .../core/util/DependencyInjectionFactory.java | 70 +-- .../com/thoughtworks/xstream/core/util/Fields.java | 39 +- .../xstream/core/util/OrderRetainingMap.java | 7 + .../util}/SelfStreamingInstanceChecker.java | 28 +- .../thoughtworks/xstream/core/util/WeakCache.java | 6 +- .../xstream/io/binary/BinaryStreamReader.java | 4 +- .../com/thoughtworks/xstream/io/binary/Token.java | 12 +- .../xstream/io/copy/HierarchicalStreamCopier.java | 6 +- .../xstream/io/json/AbstractJsonWriter.java | 55 +- .../xstream/io/json/JettisonMappedXmlDriver.java | 34 +- .../thoughtworks/xstream/io/json/JsonWriter.java | 4 +- .../com/thoughtworks/xstream/io/path/Path.java | 4 +- .../thoughtworks/xstream/io/xml/BEAStaxDriver.java | 21 + .../thoughtworks/xstream/io/xml/JDom2Driver.java | 104 ++++ .../thoughtworks/xstream/io/xml/JDom2Reader.java | 101 ++++ .../thoughtworks/xstream/io/xml/JDom2Writer.java | 102 ++++ .../xstream/io/xml/PrettyPrintWriter.java | 23 +- .../com/thoughtworks/xstream/io/xml/SaxWriter.java | 80 +-- .../thoughtworks/xstream/io/xml/SjsxpDriver.java | 21 +- .../xstream/io/xml/StandardStaxDriver.java | 111 ++++ .../thoughtworks/xstream/io/xml/StaxDriver.java | 44 +- .../thoughtworks/xstream/io/xml/TraxSource.java | 25 +- .../thoughtworks/xstream/io/xml/WstxDriver.java | 21 + .../xstream/io/xml/XmlFriendlyNameCoder.java | 12 +- .../xstream/mapper/AnnotationConfiguration.java | 3 +- .../xstream/mapper/AnnotationMapper.java | 161 ++++-- .../xstream/mapper/AttributeMapper.java | 13 +- .../thoughtworks/xstream/mapper/CachingMapper.java | 22 +- .../thoughtworks/xstream/mapper/DefaultMapper.java | 45 +- .../xstream/mapper/FieldAliasingMapper.java | 26 +- .../xstream/mapper/ImplicitCollectionMapper.java | 12 +- .../xstream/mapper/SecurityMapper.java | 79 +++ .../xstream/security/AnyTypePermission.java | 32 ++ .../xstream/security/ArrayTypePermission.java | 32 ++ .../xstream/security/CGLIBProxyTypePermission.java | 36 ++ .../xstream/security/ExplicitTypePermission.java | 54 ++ .../xstream/security/ForbiddenClassException.java | 27 + .../xstream/security/InterfaceTypePermission.java | 33 ++ .../xstream/security/NoPermission.java | 39 ++ .../xstream/security/NoTypePermission.java | 36 ++ .../xstream/security/NullPermission.java | 26 + .../xstream/security/PrimitiveTypePermission.java | 34 ++ .../xstream/security/ProxyTypePermission.java | 37 ++ .../xstream/security/RegExpTypePermission.java | 48 ++ .../xstream/security/TypeHierarchyPermission.java | 32 ++ .../xstream/security/TypePermission.java | 25 + .../xstream/security/WildcardTypePermission.java | 84 +++ xstream/src/test/$Package.java | 18 + .../acceptance/AbstractAcceptanceTest.java | 49 +- .../acceptance/AbstractReferenceTest.java | 3 +- .../com/thoughtworks/acceptance/AliasTest.java | 70 ++- .../thoughtworks/acceptance/Basic15TypesTest.java | 10 +- .../thoughtworks/acceptance/BasicTypesTest.java | 17 +- .../acceptance/CglibCompatibilityTest.java | 7 +- .../thoughtworks/acceptance/ClassLoaderTest.java | 56 +- .../acceptance/CustomFieldKeySorterTest.java | 6 +- .../thoughtworks/acceptance/CustomMapperTest.java | 9 +- .../thoughtworks/acceptance/DynamicProxyTest.java | 9 +- .../com/thoughtworks/acceptance/ErrorTest.java | 19 +- .../acceptance/Extended14TypesTest.java | 6 +- .../thoughtworks/acceptance/ExtendedTypesTest.java | 6 +- .../thoughtworks/acceptance/FinalFieldsTest.java | 5 +- .../thoughtworks/acceptance/ImplicitArrayTest.java | 14 +- .../acceptance/ImplicitCollectionTest.java | 19 +- .../thoughtworks/acceptance/ImplicitMapTest.java | 10 +- .../com/thoughtworks/acceptance/ImplicitTest.java | 194 +++++++ .../thoughtworks/acceptance/InnerClassesTest.java | 3 +- .../thoughtworks/acceptance/JodaTimeTypesTest.java | 3 +- .../acceptance/NamedLocalElementsTest.java | 603 +++++++++++++++++++++ .../thoughtworks/acceptance/OmitFieldsTest.java | 71 ++- .../acceptance/QNameMappedConcreteClassesTest.java | 15 +- .../acceptance/SecurityManagerTest.java | 184 ------- .../acceptance/SecurityVulnerabilityTest.java | 83 +++ .../acceptance/SortableFieldListTest.java | 6 +- .../com/thoughtworks/acceptance/SwingTest.java | 9 +- .../acceptance/TreeMapAndTreeSetTest.java | 94 ++-- .../acceptance/XStream11XmlFriendlyTest.java | 9 +- .../test/com/thoughtworks/acceptance/XStreamer.xsl | 9 +- .../com/thoughtworks/acceptance/XStreamerTest.java | 13 +- .../acceptance/XmlFriendlyDollarOnlyTest.java | 7 +- .../acceptance/annotations/AliasTest.java | 49 +- .../acceptance/annotations/AttributesTest.java | 65 ++- .../annotations/ParametrizedConverterTest.java | 57 +- .../thoughtworks/acceptance/objects/Product.java | 33 +- .../acceptance/someobjects/Handler.java | 8 +- .../acceptance/someobjects/Protocol.java | 8 +- .../test/com/thoughtworks/xstream/XStreamTest.java | 9 +- .../converters/enums/EnumSetConverterTest.java | 4 +- .../enums/EnumToStringConverterTest.java | 69 +++ .../xstream/converters/enums/PolymorphicEnum.java | 14 +- .../converters/extended/FontConverterTest.java | 73 ++- .../ISO8601GregorianCalendarConverter17Test.java | 55 ++ .../extended/JavaClassConverterTest.java | 21 +- .../extended/ToAttributedValueConverterTest.java | 45 +- .../converters/javabean/JavaBeanConverterTest.java | 18 +- .../PureJavaReflectionProvider15Test.java | 4 +- .../reflection/ReflectionConverterTest.java | 5 +- .../reflection/SerializableConverterTest.java | 25 +- .../SunLimitedUnsafeReflectionProviderTest.java | 17 + ...t.java => SunUnsafeReflectionProviderTest.java} | 71 ++- .../com/thoughtworks/xstream/core/JVMTest.java | 4 +- .../core/util/DependencyInjectionFactoryTest.java | 22 + .../xstream/core/util/WeakCacheTest.java | 2 +- .../xstream/io/DriverEndToEndTestSuite.java | 18 +- .../io/json/JettisonMappedXmlDriverTest.java | 55 +- .../xstream/io/json/JsonWriterFormatTest.java | 52 +- .../xstream/io/json/JsonWriterModeTest.java | 10 +- .../xstream/io/xml/AbstractXMLReaderTest.java | 8 +- .../xstream/io/xml/JDom2AcceptanceTest.java | 84 +++ .../xstream/io/xml/JDom2ReaderTest.java | 30 + .../xstream/io/xml/JDom2WriterTest.java | 27 + .../xstream/mapper/DefaultClassMapperTest.java | 6 +- .../mapper/ImplicitCollectionMapperTest.java | 6 +- .../xstream/mapper/SecurityMapperTest.java | 208 +++++++ .../xstream/mapper/XmlFriendlyMapperTest.java | 17 +- .../xstream/testutil/DynamicSecurityManager.java | 104 ---- .../test/org/jenkinsci/XStreamSerializeAsTest.java | 40 ++ 233 files changed, 8667 insertions(+), 3226 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-xstream.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
