[sisu-guice] 01/02: Merge tag 'upstream/3.2.3+dfsg'
Eugene Zhukov
eugene-guest at moszumanska.debian.org
Thu Aug 21 08:45:29 UTC 2014
This is an automated email from the git hooks/post-receive script.
eugene-guest pushed a commit to branch master
in repository sisu-guice.
commit 2291b885bd120520aafd68eb2596c86b56af9591
Merge: 3db57ae b9edb9c
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date: Thu Aug 21 07:46:31 2014 +0000
Merge tag 'upstream/3.2.3+dfsg'
Upstream version 3.2.3+dfsg
.travis.yml | 37 ++
CONTRIBUTING.md | 6 +
PATCHES/GUICE_288_decouple_thread_local.patch | 46 --
PATCHES/GUICE_492_slf4j_logger_injection.patch | 40 +-
PATCHES/GUICE_618_extensible_filter_pipeline.patch | 8 +-
.../GUICE_618_followup_pipeline_experiment.patch | 74 ++-
...GUICE_695_persistence_properties_provider.patch | 30 +-
PATCHES/GUICE_697_add_missing_headers.patch | 26 +-
.../GUICE_718_configurable_annotation_check.patch | 2 +-
PATCHES/GUICE_745_getpathinfo_not_decoded.patch | 12 +-
PATCHES/GUICE_799_fix_osgi_metadata.patch | 294 ++++++++++--
PATCHES/SISUFY.patch | 463 ++++++------------
README.md | 4 +-
build.xml | 131 +++---
common.xml | 4 +-
compareBuilds.sh | 74 ---
core/pom.xml | 30 +-
core/src/com/google/inject/Key.java | 4 +-
.../com/google/inject/internal/BindingBuilder.java | 6 +-
.../com/google/inject/internal/BindingImpl.java | 6 +-
.../inject/internal/ConstructorBindingImpl.java | 10 -
core/src/com/google/inject/internal/Errors.java | 11 +-
.../com/google/inject/internal/InjectorImpl.java | 10 +-
.../com/google/inject/internal/InjectorShell.java | 1 -
.../inject/internal/InstanceBindingImpl.java | 11 -
.../google/inject/internal/LinkedBindingImpl.java | 17 -
.../inject/internal/LinkedProviderBindingImpl.java | 17 -
core/src/com/google/inject/internal/MoreTypes.java | 6 +-
.../internal/ProviderInstanceBindingImpl.java | 11 -
.../com/google/inject/internal/ProviderMethod.java | 13 +-
.../inject/internal/ProviderMethodsModule.java | 104 +++-
.../com/google/inject/internal/RehashableKeys.java | 56 ---
.../inject/internal/UntargettedBindingImpl.java | 11 -
.../src/com/google/inject/internal/WeakKeySet.java | 59 +--
.../inject/internal/util/SourceProvider.java | 7 +-
core/src/com/google/inject/matcher/Matchers.java | 4 +-
core/src/com/google/inject/spi/ElementSource.java | 70 +--
core/src/com/google/inject/spi/Elements.java | 17 +-
core/src/com/google/inject/spi/ProviderLookup.java | 23 +-
core/src/com/google/inject/spi/TypeEncounter.java | 2 +-
core/test/com/google/inject/AllTests.java | 2 -
core/test/com/google/inject/Asserts.java | 4 +-
core/test/com/google/inject/BinderTest.java | 4 +-
core/test/com/google/inject/BinderTestSuite.java | 6 +-
core/test/com/google/inject/BindingTest.java | 5 +-
.../com/google/inject/ImplicitBindingTest.java | 52 +-
core/test/com/google/inject/JitBindingsTest.java | 9 +-
.../com/google/inject/MethodInterceptionTest.java | 4 +-
.../com/google/inject/ProvisionListenerTest.java | 2 +-
.../google/inject/internal/RehashableKeysTest.java | 141 ------
.../com/google/inject/internal/WeakKeySetTest.java | 209 +++------
.../google/inject/internal/WeakKeySetUtils.java | 144 ++++++
.../inject/internal/util/LineNumbersTest.java | 3 +-
core/test/com/google/inject/spi/ElementsTest.java | 2 +-
.../com/google/inject/spi/InjectionPointTest.java | 13 +-
.../com/google/inject/spi/ProviderMethodsTest.java | 268 +++++++++--
.../com/google/inject/spi/SpiBindingsTest.java | 2 +-
extensions/assistedinject/pom.xml | 2 +-
.../assistedinject/FactoryModuleBuilder.java | 4 +-
.../inject/assistedinject/FactoryProvider.java | 2 +-
.../inject/assistedinject/FactoryProvider2.java | 3 +-
.../google/inject/assistedinject/Parameter.java | 11 +-
.../inject/assistedinject/ExtensionSpiTest.java | 83 ++--
.../assistedinject/ManyConstructorsTest.java | 10 +-
extensions/grapher/pom.xml | 2 +-
.../google/inject/grapher/ImplementationNode.java | 5 +-
.../src/com/google/inject/grapher/NameFactory.java | 3 +-
.../grapher/TransitiveDependencyVisitor.java | 8 +-
.../inject/grapher/graphviz/GraphvizGrapher.java | 4 +-
.../inject/grapher/graphviz/PortIdFactory.java | 2 +-
extensions/jmx/pom.xml | 2 +-
.../src/com/google/inject/tools/jmx/Manager.java | 3 +-
extensions/jndi/pom.xml | 2 +-
extensions/mini/pom.xml | 2 +-
.../mini/src/com/google/inject/mini/MiniGuice.java | 12 +-
extensions/multibindings/pom.xml | 2 +-
.../com/google/inject/multibindings/Element.java | 8 +-
.../com/google/inject/multibindings/Indexer.java | 169 +++++++
.../com/google/inject/multibindings/MapBinder.java | 521 +++++++++++----------
.../google/inject/multibindings/Multibinder.java | 98 +++-
.../inject/multibindings/OptionalBinder.java | 464 +++++++++---------
.../google/inject/multibindings/RealElement.java | 240 ++--------
.../com/google/inject/multibindings/AllTests.java | 1 +
.../google/inject/multibindings/MapBinderTest.java | 65 ++-
.../inject/multibindings/MultibinderTest.java | 165 +++++--
.../inject/multibindings/OptionalBinderTest.java | 166 +++++--
.../inject/multibindings/RealElementTest.java | 56 +++
.../com/google/inject/multibindings/SpiUtils.java | 274 ++++++-----
.../inject/multibindings/WeakKeySetUtils.java | 68 ---
extensions/persist/pom.xml | 20 +-
.../com/google/inject/persist/Transactional.java | 3 +-
.../inject/persist/jpa/JpaPersistService.java | 14 +-
.../inject/persist/jpa/DynamicFinderTest.java | 2 +-
.../jpa/EntityManagerFactoryProvisionTest.java | 5 +-
.../inject/persist/jpa/JpaPersistServiceTest.java | 67 +++
extensions/pom.xml | 5 +-
extensions/service/pom.xml | 2 +-
.../com/google/inject/service/AsyncService.java | 12 +-
extensions/servlet/pom.xml | 2 +-
.../inject/servlet/AbstractFilterPipeline.java | 5 +-
.../inject/servlet/AbstractServletPipeline.java | 7 +-
.../inject/servlet/InternalServletModule.java | 2 +-
.../google/inject/servlet/ServletDefinition.java | 8 +-
.../inject/servlet/FilterDefinitionTest.java | 29 +-
.../inject/servlet/ServletDefinitionPathsTest.java | 10 +-
.../inject/servlet/ServletDefinitionTest.java | 4 +-
.../servlet/ServletDispatchIntegrationTest.java | 2 +-
.../google/inject/servlet/ServletModuleTest.java | 11 +
.../ServletPipelineRequestDispatcherTest.java | 10 +-
.../VarargsServletDispatchIntegrationTest.java | 2 +-
extensions/spring/pom.xml | 2 +-
extensions/struts2/pom.xml | 2 +-
.../google/inject/struts2/GuiceObjectFactory.java | 2 +-
.../inject/struts2/Struts2GuicePluginModule.java | 7 +-
extensions/testlib/pom.xml | 2 +-
.../testing/fieldbinder/BoundFieldModule.java | 22 +-
.../testing/fieldbinder/BoundFieldModuleTest.java | 20 +-
extensions/throwingproviders/pom.xml | 2 +-
.../throwingproviders/CheckedProviderMethod.java | 2 +-
.../inject/throwingproviders/CheckedProvides.java | 10 +-
pom.xml | 140 ++++--
uploadApiDiffs.sh | 19 -
uploadJavadocs.sh | 9 -
util/compareBuilds.sh | 105 +++++
util/generate-latest-docs.sh | 30 ++
util/publish-snapshot-on-commit.sh | 17 +
126 files changed, 3182 insertions(+), 2515 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-guice.git
More information about the pkg-java-commits
mailing list