[sisu-guice] 01/02: Merge tag 'upstream/3.2.6'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Nov 19 23:13:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository sisu-guice.
commit 61666f2c0f394796fae628760049595a733e8edf
Merge: e5bba7b 2b456ee
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Nov 19 23:51:30 2015 +0100
Merge tag 'upstream/3.2.6'
Upstream version 3.2.6
.../GUICE_183_fine_grained_singleton_lock.patch | 80 ----
PATCHES/SISUFY.patch | 60 ++-
bom/pom.xml | 7 +-
build.properties | 2 +
build.xml | 13 +-
core/pom.xml | 2 +-
core/src/com/google/inject/Binder.java | 38 +-
core/src/com/google/inject/PrivateModule.java | 1 +
core/src/com/google/inject/Scopes.java | 3 +
.../google/inject/binder/LinkedBindingBuilder.java | 1 +
.../com/google/inject/internal/Annotations.java | 15 +-
.../google/inject/internal/BindingProcessor.java | 4 +-
.../inject/internal/BoundProviderFactory.java | 5 +-
.../inject/internal/ConstructionContext.java | 17 +-
.../inject/internal/ConstructorBindingImpl.java | 4 +-
.../inject/internal/ConstructorInjector.java | 13 +-
.../google/inject/internal/CycleDetectingLock.java | 302 ++++++++++++++
.../internal/DelegatingInvocationHandler.java | 29 +-
core/src/com/google/inject/internal/Errors.java | 48 +++
.../google/inject/internal/InheritingState.java | 32 +-
.../com/google/inject/internal/InjectorImpl.java | 64 ++-
.../com/google/inject/internal/InjectorShell.java | 20 +
.../google/inject/internal/InternalContext.java | 83 +++-
.../InternalFactoryToInitializableAdapter.java | 7 +-
.../com/google/inject/internal/InternalFlags.java | 21 +
.../google/inject/internal/LookupProcessor.java | 2 +-
.../ModuleAnnotatedMethodScannerProcessor.java} | 34 +-
core/src/com/google/inject/internal/MoreTypes.java | 55 ++-
.../inject/internal/ProvidedByInternalFactory.java | 7 +-
.../inject/internal/ProviderInternalFactory.java | 15 +-
.../com/google/inject/internal/ProviderMethod.java | 83 +++-
.../inject/internal/ProviderMethodsModule.java | 127 +++---
core/src/com/google/inject/internal/Scoping.java | 6 +-
.../com/google/inject/internal/SingletonScope.java | 324 +++++++++++++--
core/src/com/google/inject/internal/State.java | 20 +-
.../google/inject/spi/DefaultElementVisitor.java | 4 +
core/src/com/google/inject/spi/Dependency.java | 3 +-
.../com/google/inject/spi/DependencyAndSource.java | 1 +
core/src/com/google/inject/spi/ElementSource.java | 2 +
core/src/com/google/inject/spi/ElementVisitor.java | 8 +
core/src/com/google/inject/spi/Elements.java | 165 ++++++--
core/src/com/google/inject/spi/InjectionPoint.java | 14 +
.../inject/spi/ModuleAnnotatedMethodScanner.java | 55 +++
.../spi/ModuleAnnotatedMethodScannerBinding.java | 59 +++
core/src/com/google/inject/spi/ModuleSource.java | 60 +--
.../google/inject/spi/ProviderInstanceBinding.java | 5 +-
core/src/com/google/inject/spi/ProviderLookup.java | 23 +-
.../google/inject/spi/ProvidesMethodBinding.java | 14 +-
.../com/google/inject/spi/ProvisionListener.java | 6 +-
core/src/com/google/inject/util/Modules.java | 27 +-
core/test/com/google/inject/AllTests.java | 2 +
core/test/com/google/inject/Asserts.java | 42 ++
core/test/com/google/inject/JitBindingsTest.java | 180 ++++++---
core/test/com/google/inject/KeyTest.java | 43 ++
core/test/com/google/inject/ScopesTest.java | 433 +++++++++++++++++----
.../inject/internal/CycleDetectingLockTest.java | 101 +++++
.../com/google/inject/internal/WeakKeySetTest.java | 20 +-
.../google/inject/internal/WeakKeySetUtils.java | 42 --
.../spi/ModuleAnnotatedMethodScannerTest.java | 394 +++++++++++++++++++
.../com/google/inject/spi/ProviderMethodsTest.java | 195 ++++++++--
.../com/google/inject/util/OverrideModuleTest.java | 52 ++-
.../googlecode/guice/bundle/OSGiTestActivator.java | 258 ++++++------
extensions/assistedinject/pom.xml | 2 +-
.../inject/assistedinject/FactoryProvider2.java | 183 ++++++++-
.../assistedinject/FactoryProvider2Test.java | 86 ++++
extensions/dagger-adapter/build.properties | 8 +
extensions/dagger-adapter/build.xml | 21 +
extensions/{grapher => dagger-adapter}/pom.xml | 22 +-
.../google/inject/daggeradapter/DaggerAdapter.java | 90 +++++
.../inject/daggeradapter/DaggerMethodScanner.java | 75 ++++
.../inject/daggeradapter/DaggerAdapterTest.java | 99 +++++
extensions/grapher/pom.xml | 2 +-
.../inject/grapher/AbstractInjectorGrapher.java | 6 +-
.../src/com/google/inject/grapher/Alias.java | 1 +
.../com/google/inject/grapher/AliasCreator.java | 1 +
.../inject/grapher/DefaultRootKeySetCreator.java | 1 +
.../src/com/google/inject/grapher/Edge.java | 1 +
.../src/com/google/inject/grapher/EdgeCreator.java | 1 +
.../com/google/inject/grapher/InjectorGrapher.java | 6 +-
.../com/google/inject/grapher/InstanceNode.java | 1 +
.../src/com/google/inject/grapher/Node.java | 1 +
.../src/com/google/inject/grapher/NodeCreator.java | 1 +
.../src/com/google/inject/grapher/NodeId.java | 6 +-
.../google/inject/grapher/RootKeySetCreator.java | 1 +
.../inject/grapher/graphviz/GraphvizGrapher.java | 1 +
extensions/jmx/pom.xml | 2 +-
extensions/jndi/pom.xml | 2 +-
extensions/multibindings/pom.xml | 2 +-
.../google/inject/multibindings/ClassMapKey.java} | 23 +-
.../com/google/inject/multibindings/MapBinder.java | 72 +++-
.../com/google/inject/multibindings/MapKey.java | 60 +++
.../google/inject/multibindings/Multibinder.java | 50 ++-
.../inject/multibindings/MultibindingsScanner.java | 194 +++++++++
.../inject/multibindings/OptionalBinder.java | 33 +-
.../inject/multibindings/ProvidesIntoMap.java | 59 +++
.../inject/multibindings/ProvidesIntoOptional.java | 66 ++++
.../inject/multibindings/ProvidesIntoSet.java} | 45 ++-
.../google/inject/multibindings/StringMapKey.java} | 24 +-
.../com/google/inject/multibindings/AllTests.java | 1 +
.../google/inject/multibindings/MapBinderTest.java | 11 +-
.../inject/multibindings/MultibinderTest.java | 85 ++--
.../inject/multibindings/OptionalBinderTest.java | 3 +-
.../inject/multibindings/ProvidesIntoTest.java | 373 ++++++++++++++++++
extensions/persist/pom.xml | 2 +-
extensions/pom.xml | 4 +-
.../com/google/inject/service/AsyncService.java | 9 +-
extensions/servlet/pom.xml | 2 +-
.../google/inject/servlet/ScopingException.java | 1 +
.../src/com/google/inject/servlet/ScopingOnly.java | 1 +
.../com/google/inject/servlet/ServletScopes.java | 3 +
extensions/spring/pom.xml | 2 +-
extensions/struts2/pom.xml | 2 +-
extensions/testlib/pom.xml | 2 +-
extensions/throwingproviders/pom.xml | 2 +-
.../throwingproviders/CheckedProviderMethod.java | 12 +-
.../CheckedProviderMethodsModule.java | 9 +-
.../inject/throwingproviders/CheckedProvides.java | 7 +-
.../inject/throwingproviders/ThrowingInject.java | 1 +
.../throwingproviders/ThrowingProviderBinder.java | 111 +++++-
.../throwingproviders/CheckedProviderTest.java | 88 ++++-
.../throwingproviders/ThrowingProviderTest.java | 74 +++-
pom.xml | 35 +-
122 files changed, 4860 insertions(+), 980 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