This is an automated email from the git hooks/post-receive script.
eugene pushed a change to branch master
in repository sisu-guice.
from 4c64171 Upload to unstable
adds e61527a New upstream version 4.2.0
new 3afc7d7 Update upstream source from tag 'upstream/4.2.0'
new 471444a Prepare for upload to sid
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 +
.travis.yml | 15 +-
PATCHES/GUICE_1171_remove_java6_references.patch | 66 +
PATCHES/GUICE_1172_mark_jsr305_as_optional.patch | 17 +
PATCHES/GUICE_1173_fix_osgi_metadata.patch | 41 +
.../GUICE_1174_exclude_ant_dep_from_cglib.patch | 22 +
PATCHES/GUICE_492_slf4j_logger_injection.patch | 20 +-
PATCHES/GUICE_618_extensible_filter_pipeline.patch | 295 +--
PATCHES/SISUFY.patch | 186 +-
bom/pom.xml | 7 +-
build.properties | 1 -
build.xml | 24 +-
common.xml | 12 +-
core/pom.xml | 18 +-
core/src/com/google/inject/AbstractModule.java | 101 +-
core/src/com/google/inject/Binder.java | 424 ++---
core/src/com/google/inject/Binding.java | 55 +-
core/src/com/google/inject/BindingAnnotation.java | 8 +-
.../com/google/inject/ConfigurationException.java | 27 +-
core/src/com/google/inject/CreationException.java | 12 +-
core/src/com/google/inject/Exposed.java | 6 +-
core/src/com/google/inject/Guice.java | 50 +-
core/src/com/google/inject/ImplementedBy.java | 6 +-
core/src/com/google/inject/Inject.java | 47 +-
core/src/com/google/inject/Injector.java | 60 +-
core/src/com/google/inject/Key.java | 247 ++-
core/src/com/google/inject/MembersInjector.java | 1 -
core/src/com/google/inject/Module.java | 20 +-
.../src/com/google/inject/OutOfScopeException.java | 6 +-
core/src/com/google/inject/PrivateBinder.java | 10 +-
core/src/com/google/inject/PrivateModule.java | 115 +-
core/src/com/google/inject/ProvidedBy.java | 8 +-
core/src/com/google/inject/Provider.java | 27 +-
core/src/com/google/inject/Provides.java | 6 +-
core/src/com/google/inject/ProvisionException.java | 13 +-
core/src/com/google/inject/Scope.java | 38 +-
core/src/com/google/inject/ScopeAnnotation.java | 8 +-
core/src/com/google/inject/Scopes.java | 113 +-
core/src/com/google/inject/Singleton.java | 8 +-
core/src/com/google/inject/Stage.java | 10 +-
core/src/com/google/inject/TypeLiteral.java | 135 +-
.../inject/binder/AnnotatedBindingBuilder.java | 13 +-
.../binder/AnnotatedConstantBindingBuilder.java | 13 +-
.../inject/binder/AnnotatedElementBuilder.java | 10 +-
.../inject/binder/ConstantBindingBuilder.java | 46 +-
.../google/inject/binder/LinkedBindingBuilder.java | 39 +-
.../google/inject/binder/ScopedBindingBuilder.java | 16 +-
.../src/com/google/inject/binder/package-info.java | 7 +-
.../inject/internal/AbstractBindingBuilder.java | 27 +-
.../inject/internal/AbstractBindingProcessor.java | 88 +-
.../google/inject/internal/AbstractProcessor.java | 10 +-
.../com/google/inject/internal/Annotations.java | 214 ++-
.../com/google/inject/internal/BindingBuilder.java | 53 +-
.../com/google/inject/internal/BindingImpl.java | 32 +-
.../google/inject/internal/BindingProcessor.java | 291 +--
.../inject/internal/BoundProviderFactory.java | 54 +-
.../com/google/inject/internal/BytecodeGen.java | 251 ++-
.../inject/internal/CircularDependencyProxy.java | 6 +-
.../internal/ConstantBindingBuilderImpl.java | 35 +-
.../google/inject/internal/ConstantFactory.java | 20 +-
.../inject/internal/ConstructionContext.java | 22 +-
.../google/inject/internal/ConstructionProxy.java | 18 +-
.../inject/internal/ConstructionProxyFactory.java | 6 +-
.../inject/internal/ConstructorBindingImpl.java | 144 +-
.../inject/internal/ConstructorInjector.java | 66 +-
.../inject/internal/ConstructorInjectorStore.java | 55 +-
.../google/inject/internal/ContextualCallable.java | 24 -
.../google/inject/internal/CreationListener.java | 4 +-
.../google/inject/internal/CycleDetectingLock.java | 297 +--
.../internal/DefaultConstructionProxyFactory.java | 161 +-
.../google/inject/internal/DeferredLookups.java | 13 +-
.../google/inject/internal/DelayedInitialize.java | 12 +-
.../internal/DelegatingInvocationHandler.java | 14 +-
.../src/com/google/inject/internal}/Element.java | 21 +-
.../com/google/inject/internal/EncounterImpl.java | 26 +-
.../com/google/inject/internal/ErrorHandler.java | 10 +-
core/src/com/google/inject/internal/Errors.java | 657 +++----
.../google/inject/internal/ErrorsException.java | 5 +-
.../src/com/google/inject/internal/Exceptions.java | 62 -
.../google/inject/internal/ExposedBindingImpl.java | 24 +-
.../google/inject/internal/ExposedKeyFactory.java | 11 +-
.../google/inject/internal/ExposureBuilder.java | 14 +-
.../com/google/inject/internal/FactoryProxy.java | 36 +-
.../com/google/inject/internal/FailableCache.java | 37 +-
.../src/com/google/inject/internal}/Indexer.java | 93 +-
.../google/inject/internal/InheritingState.java | 38 +-
.../com/google/inject/internal/Initializable.java | 8 +-
.../com/google/inject/internal/Initializables.java | 16 +-
.../com/google/inject/internal/Initializer.java | 227 ++-
.../inject/internal/InjectionRequestProcessor.java | 40 +-
.../com/google/inject/internal/InjectorImpl.java | 492 ++---
.../inject/internal/InjectorOptionsProcessor.java | 7 +-
.../com/google/inject/internal/InjectorShell.java | 85 +-
.../inject/internal/InstanceBindingImpl.java | 45 +-
.../internal/InterceptorBindingProcessor.java | 10 +-
.../inject/internal/InterceptorStackCallback.java | 48 +-
.../google/inject/internal/InternalContext.java | 166 +-
.../google/inject/internal/InternalFactory.java | 12 +-
.../InternalFactoryToInitializableAdapter.java | 41 +-
.../internal/InternalFactoryToProviderAdapter.java | 23 +-
.../com/google/inject/internal/InternalFlags.java | 15 +-
.../inject/internal/InternalInjectorCreator.java | 128 +-
.../InternalProviderInstanceBindingImpl.java | 195 ++
.../internal/InternalProvisionException.java | 228 +++
.../google/inject/internal/LinkedBindingImpl.java | 32 +-
.../inject/internal/LinkedProviderBindingImpl.java | 63 +-
.../inject/internal/ListenerBindingProcessor.java | 12 +-
.../google/inject/internal/LookupProcessor.java | 12 +-
core/src/com/google/inject/internal/Lookups.java | 2 +-
.../inject/internal/MembersInjectorImpl.java | 157 +-
.../inject/internal/MembersInjectorStore.java | 53 +-
.../google/inject/internal/MessageProcessor.java | 9 +-
core/src/com/google/inject/internal/Messages.java | 401 +++++
.../com/google/inject/internal/MethodAspect.java | 18 +-
.../ModuleAnnotatedMethodScannerProcessor.java | 5 +-
core/src/com/google/inject/internal/MoreTypes.java | 152 +-
.../com/google/inject/internal/Nullability.java | 17 +-
.../inject/internal/PrivateElementProcessor.java | 11 +-
.../inject/internal/PrivateElementsImpl.java | 22 +-
.../inject/internal/ProcessedBindingData.java | 38 +-
.../inject/internal/ProvidedByInternalFactory.java | 66 +-
.../internal/ProviderInstanceBindingImpl.java | 49 +-
.../inject/internal/ProviderInternalFactory.java | 67 +-
.../com/google/inject/internal/ProviderMethod.java | 187 +-
.../inject/internal/ProviderMethodsModule.java | 207 +--
.../internal/ProviderToInternalFactoryAdapter.java | 43 +-
.../inject/internal/ProvidesMethodScanner.java | 148 +-
.../internal/ProvisionListenerCallbackStore.java | 59 +-
.../internal/ProvisionListenerStackCallback.java | 70 +-
.../com/google/inject/internal/ProxyFactory.java | 96 +-
.../com/google/inject/internal}/RealElement.java | 78 +-
.../com/google/inject/internal/RealMapBinder.java | 1344 ++++++++++++++
.../google/inject/internal/RealMultibinder.java | 604 +++++++
.../google/inject/internal/RealOptionalBinder.java | 844 +++++++++
.../inject/internal/ScopeBindingProcessor.java | 11 +-
core/src/com/google/inject/internal/Scoping.java | 256 +--
.../inject/internal/SingleFieldInjector.java | 24 +-
.../inject/internal/SingleMemberInjector.java | 9 +-
.../inject/internal/SingleMethodInjector.java | 64 +-
.../inject/internal/SingleParameterInjector.java | 54 +-
.../com/google/inject/internal/SingletonScope.java | 294 ++-
core/src/com/google/inject/internal/State.java | 231 +--
.../internal/TypeConverterBindingProcessor.java | 218 ++-
.../google/inject/internal/UniqueAnnotations.java | 29 +-
.../inject/internal/UntargettedBindingImpl.java | 33 +-
.../internal/UntargettedBindingProcessor.java | 72 +-
.../src/com/google/inject/internal/WeakKeySet.java | 31 +-
.../com/google/inject/internal/package-info.java | 7 +-
.../com/google/inject/internal/util/Classes.java | 27 +-
.../google/inject/internal/util/LineNumbers.java | 95 +-
.../inject/internal/util/SourceProvider.java | 21 +-
.../inject/internal/util/StackTraceElements.java | 105 +-
.../com/google/inject/internal/util/Stopwatch.java | 10 +-
.../com/google/inject/matcher/AbstractMatcher.java | 24 +-
core/src/com/google/inject/matcher/Matcher.java | 14 +-
core/src/com/google/inject/matcher/Matchers.java | 179 +-
.../com/google/inject/matcher/package-info.java | 7 +-
.../google/inject/multibindings/ClassMapKey.java | 2 +-
.../com/google/inject/multibindings/MapBinder.java | 214 +++
.../inject/multibindings/MapBinderBinding.java | 79 +-
.../com/google/inject/multibindings/MapKey.java | 12 +-
.../google/inject/multibindings/Multibinder.java | 195 ++
.../inject/multibindings/MultibinderBinding.java | 34 +-
.../inject/multibindings/MultibindingsScanner.java | 75 +
.../multibindings/MultibindingsTargetVisitor.java | 23 +-
.../inject/multibindings/OptionalBinder.java | 199 +++
.../multibindings/OptionalBinderBinding.java | 58 +-
.../inject/multibindings/ProvidesIntoMap.java | 26 +-
.../inject/multibindings/ProvidesIntoOptional.java | 16 +-
.../inject/multibindings/ProvidesIntoSet.java | 11 +-
.../google/inject/multibindings/StringMapKey.java | 3 +-
.../google/inject/multibindings/package-info.java | 4 +-
core/src/com/google/inject/name/Named.java | 5 +-
core/src/com/google/inject/name/NamedImpl.java | 10 +-
core/src/com/google/inject/name/Names.java | 17 +-
core/src/com/google/inject/name/package-info.java | 6 +-
core/src/com/google/inject/package-info.java | 34 +-
.../google/inject/spi/BindingScopingVisitor.java | 17 +-
.../google/inject/spi/BindingTargetVisitor.java | 18 +-
.../com/google/inject/spi/ConstructorBinding.java | 13 +-
.../inject/spi/ConvertedConstantBinding.java | 14 +-
.../inject/spi/DefaultBindingScopingVisitor.java | 20 +-
.../inject/spi/DefaultBindingTargetVisitor.java | 20 +-
.../google/inject/spi/DefaultElementVisitor.java | 40 +-
core/src/com/google/inject/spi/Dependency.java | 24 +-
.../com/google/inject/spi/DependencyAndSource.java | 35 +-
.../inject/spi/DisableCircularProxiesOption.java | 5 +-
core/src/com/google/inject/spi/Element.java | 3 +-
core/src/com/google/inject/spi/ElementSource.java | 156 +-
core/src/com/google/inject/spi/ElementVisitor.java | 63 +-
core/src/com/google/inject/spi/Elements.java | 140 +-
core/src/com/google/inject/spi/ExposedBinding.java | 13 +-
.../src/com/google/inject/spi/HasDependencies.java | 4 +-
core/src/com/google/inject/spi/InjectionPoint.java | 361 ++--
.../com/google/inject/spi/InjectionRequest.java | 17 +-
.../src/com/google/inject/spi/InstanceBinding.java | 8 +-
.../com/google/inject/spi/InterceptorBinding.java | 22 +-
.../com/google/inject/spi/LinkedKeyBinding.java | 5 +-
.../google/inject/spi/MembersInjectorLookup.java | 31 +-
core/src/com/google/inject/spi/Message.java | 34 +-
.../inject/spi/ModuleAnnotatedMethodScanner.java | 18 +-
.../spi/ModuleAnnotatedMethodScannerBinding.java | 20 +-
core/src/com/google/inject/spi/ModuleSource.java | 36 +-
.../src/com/google/inject/spi/PrivateElements.java | 11 +-
.../src/com/google/inject/spi/ProviderBinding.java | 4 +-
.../google/inject/spi/ProviderInstanceBinding.java | 11 +-
.../com/google/inject/spi/ProviderKeyBinding.java | 5 +-
core/src/com/google/inject/spi/ProviderLookup.java | 26 +-
.../inject/spi/ProviderWithDependencies.java | 2 +-
.../inject/spi/ProviderWithExtensionVisitor.java | 47 +-
.../google/inject/spi/ProvidesMethodBinding.java | 21 +-
.../inject/spi/ProvidesMethodTargetVisitor.java | 11 +-
.../com/google/inject/spi/ProvisionListener.java | 89 +-
.../inject/spi/ProvisionListenerBinding.java | 18 +-
.../spi/RequireAtInjectOnConstructorsOption.java | 5 +-
.../spi/RequireExactBindingAnnotationsOption.java | 5 +-
.../inject/spi/RequireExplicitBindingsOption.java | 5 +-
core/src/com/google/inject/spi/ScopeBinding.java | 7 +-
.../google/inject/spi/StaticInjectionRequest.java | 21 +-
core/src/com/google/inject/spi/Toolable.java | 14 +-
core/src/com/google/inject/spi/TypeConverter.java | 4 +-
.../google/inject/spi/TypeConverterBinding.java | 30 +-
core/src/com/google/inject/spi/TypeEncounter.java | 40 +-
core/src/com/google/inject/spi/TypeListener.java | 16 +-
.../com/google/inject/spi/TypeListenerBinding.java | 9 +-
.../com/google/inject/spi/UntargettedBinding.java | 2 +-
core/src/com/google/inject/spi/package-info.java | 7 +-
core/src/com/google/inject/util/Modules.java | 155 +-
core/src/com/google/inject/util/Providers.java | 60 +-
core/src/com/google/inject/util/Types.java | 67 +-
core/src/com/google/inject/util/package-info.java | 6 +-
core/test/com/google/inject/AllTests.java | 27 +-
core/test/com/google/inject/Asserts.java | 116 +-
core/test/com/google/inject/BinderTest.java | 625 ++++---
core/test/com/google/inject/BinderTestSuite.java | 345 ++--
.../com/google/inject/BindingAnnotationTest.java | 142 +-
core/test/com/google/inject/BindingOrderTest.java | 108 +-
core/test/com/google/inject/BindingTest.java | 367 ++--
.../google/inject/BoundInstanceInjectionTest.java | 108 +-
core/test/com/google/inject/BoundProviderTest.java | 34 +-
.../com/google/inject/CircularDependencyTest.java | 678 ++++---
.../com/google/inject/DuplicateBindingsTest.java | 575 +++---
.../test/com/google/inject/EagerSingletonTest.java | 157 +-
core/test/com/google/inject/ErrorHandlingTest.java | 79 +-
.../com/google/inject/GenericInjectionTest.java | 193 +-
.../com/google/inject/ImplicitBindingTest.java | 289 +--
core/test/com/google/inject/InjectorTest.java | 239 ++-
core/test/com/google/inject/IntegrationTest.java | 25 +-
core/test/com/google/inject/JitBindingsTest.java | 830 +++++----
core/test/com/google/inject/KeyTest.java | 178 +-
.../com/google/inject/LoggerInjectionTest.java | 49 +-
.../com/google/inject/MembersInjectorTest.java | 365 ++--
.../com/google/inject/MethodInterceptionTest.java | 379 ++--
core/test/com/google/inject/ModuleTest.java | 15 +-
core/test/com/google/inject/ModulesTest.java | 41 +-
.../google/inject/NullableInjectionPointTest.java | 223 ++-
.../com/google/inject/OptionalBindingTest.java | 162 +-
.../test/com/google/inject/ParentInjectorTest.java | 246 ++-
.../com/google/inject/PerformanceComparison.java | 219 +--
core/test/com/google/inject/PrivateModuleTest.java | 725 +++++---
.../com/google/inject/ProviderInjectionTest.java | 239 +--
.../com/google/inject/ProvisionExceptionTest.java | 315 +++-
.../com/google/inject/ProvisionExceptionsTest.java | 192 +-
.../com/google/inject/ProvisionListenerTest.java | 843 +++++----
core/test/com/google/inject/ReflectionTest.java | 54 +-
.../com/google/inject/RequestInjectionTest.java | 232 +--
.../inject/RequireAtInjectOnConstructorsTest.java | 243 +--
core/test/com/google/inject/ScopesTest.java | 939 ++++++----
core/test/com/google/inject/SerializationTest.java | 26 +-
core/test/com/google/inject/SuiteUtils.java | 18 +-
core/test/com/google/inject/SuperclassTest.java | 28 +-
.../test/com/google/inject/TypeConversionTest.java | 328 ++--
core/test/com/google/inject/TypeListenerTest.java | 678 ++++---
.../google/inject/TypeLiteralInjectionTest.java | 51 +-
core/test/com/google/inject/TypeLiteralTest.java | 87 +-
.../inject/TypeLiteralTypeResolutionTest.java | 132 +-
.../ClientServiceWithDependencyInjection.java | 92 +-
.../inject/example/ClientServiceWithFactories.java | 91 +-
.../inject/example/ClientServiceWithGuice.java | 87 +-
.../example/ClientServiceWithGuiceDefaults.java | 83 +-
.../com/google/inject/example/JndiProvider.java | 15 +-
.../google/inject/example/JndiProviderClient.java | 23 +-
.../com/google/inject/internal}/Collector.java | 18 +-
.../inject/internal/CycleDetectingLockTest.java | 272 ++-
.../internal/InternalProvisionExceptionTest.java | 45 +
.../com/google/inject/internal/MapBinderTest.java | 1590 +++++++++++++++++
.../com/google/inject/internal/MoreTypesTest.java | 32 +-
.../google/inject/internal/MultibinderTest.java | 1537 ++++++++++++++++
.../inject/internal}/OptionalBinderTest.java | 1187 +++++++-----
.../google/inject/internal/ProxyFactoryTest.java | 49 +-
.../google/inject/internal}/RealElementTest.java | 28 +-
.../test/com/google/inject/internal}/SpiUtils.java | 777 +++++---
.../inject/internal/UniqueAnnotationsTest.java | 15 +-
.../com/google/inject/internal/WeakKeySetTest.java | 229 ++-
.../google/inject/internal/WeakKeySetUtils.java | 7 +-
.../inject/internal/util/LineNumbersTest.java | 132 +-
.../com/google/inject/matcher/MatcherTest.java | 25 +-
.../inject/multibindings/ProvidesIntoTest.java | 429 +++--
.../google/inject/name/NamedEquivalanceTest.java | 110 +-
core/test/com/google/inject/name/NamesTest.java | 63 +-
.../inject/spi/BindingTargetVisitorTest.java | 6 +-
.../com/google/inject/spi/ElementApplyToTest.java | 8 +-
.../com/google/inject/spi/ElementSourceTest.java | 152 +-
core/test/com/google/inject/spi/ElementsTest.java | 996 ++++++-----
.../inject/spi/FailingBindingScopingVisitor.java | 12 +-
.../google/inject/spi/FailingElementVisitor.java | 5 +-
.../google/inject/spi/FailingTargetVisitor.java | 6 +-
.../com/google/inject/spi/HasDependenciesTest.java | 69 +-
.../com/google/inject/spi/InjectionPointTest.java | 289 ++-
.../com/google/inject/spi/InjectorSpiTest.java | 58 +-
core/test/com/google/inject/spi/MessageTest.java | 25 +
.../spi/ModuleAnnotatedMethodScannerTest.java | 514 ++++--
.../com/google/inject/spi/ModuleRewriterTest.java | 91 +-
.../com/google/inject/spi/ModuleSourceTest.java | 66 +-
.../com/google/inject/spi/ProviderMethodsTest.java | 728 +++++---
.../com/google/inject/spi/SpiBindingsTest.java | 428 +++--
.../google/inject/spi/ToolStageInjectorTest.java | 156 +-
.../com/google/inject/util/NoopOverrideTest.java | 9 +-
.../com/google/inject/util/OverrideModuleTest.java | 777 ++++----
.../test/com/google/inject/util/ProvidersTest.java | 49 +-
core/test/com/google/inject/util/TypesTest.java | 74 +-
.../test/com/googlecode/guice/BytecodeGenTest.java | 320 +++-
core/test/com/googlecode/guice/GuiceTck.java | 43 +-
core/test/com/googlecode/guice/Jsr330Test.java | 389 ++--
.../com/googlecode/guice/OSGiContainerTest.java | 76 +-
.../guice/PackageVisibilityTestModule.java | 7 +-
.../googlecode/guice/bundle/OSGiTestActivator.java | 366 ++--
debian/changelog | 11 +
debian/control | 8 +-
debian/libsisu-guice-java.poms | 1 +
debian/maven.ignoreRules | 1 +
debian/patches/allow_maven2.diff | 16 -
debian/patches/series | 1 -
debian/rules | 2 -
examples/src/example/xml/Contact.java | 4 +-
examples/src/example/xml/FromFlash.java | 5 +-
examples/src/example/xml/FromSim.java | 3 +-
examples/src/example/xml/Main.java | 23 +-
examples/src/example/xml/SimCard.java | 2 +-
examples/src/example/xml/XmlBeanModule.java | 42 +-
extensions/assistedinject/pom.xml | 17 +-
.../com/google/inject/assistedinject/Assisted.java | 11 +-
.../inject/assistedinject/AssistedConstructor.java | 34 +-
.../inject/assistedinject/AssistedInject.java | 39 +-
.../assistedinject/AssistedInjectBinding.java | 8 +-
.../AssistedInjectTargetVisitor.java | 12 +-
.../inject/assistedinject/AssistedMethod.java | 30 +-
.../inject/assistedinject/BindingCollector.java | 7 +-
.../assistedinject/FactoryModuleBuilder.java | 180 +-
.../inject/assistedinject/FactoryProvider.java | 184 +-
.../inject/assistedinject/FactoryProvider2.java | 431 +++--
.../google/inject/assistedinject/Parameter.java | 44 +-
.../inject/assistedinject/ParameterListKey.java | 21 +-
.../google/inject/assistedinject/package-info.java | 4 +-
.../inject/assistedinject/ExtensionSpiTest.java | 136 +-
.../assistedinject/FactoryModuleBuilderTest.java | 566 +++---
.../assistedinject/FactoryProvider2Test.java | 1036 ++++++-----
.../inject/assistedinject/FactoryProviderTest.java | 646 ++++---
.../assistedinject/ManyConstructorsTest.java | 271 +--
extensions/dagger-adapter/build.xml | 1 -
extensions/dagger-adapter/pom.xml | 28 +-
.../google/inject/daggeradapter/DaggerAdapter.java | 57 +-
.../inject/daggeradapter/DaggerMethodScanner.java | 45 +-
.../inject/daggeradapter/DaggerAdapterTest.java | 81 +-
extensions/grapher/.gitignore | 1 -
extensions/grapher/pom.xml | 21 +-
.../inject/grapher/AbstractInjectorGrapher.java | 17 +-
.../src/com/google/inject/grapher/Alias.java | 2 +-
.../com/google/inject/grapher/AliasCreator.java | 2 +-
.../src/com/google/inject/grapher/BindingEdge.java | 19 +-
.../google/inject/grapher/DefaultEdgeCreator.java | 93 +-
.../google/inject/grapher/DefaultNodeCreator.java | 46 +-
.../inject/grapher/DefaultRootKeySetCreator.java | 12 +-
.../com/google/inject/grapher/DependencyEdge.java | 24 +-
.../src/com/google/inject/grapher/Edge.java | 8 +-
.../src/com/google/inject/grapher/EdgeCreator.java | 2 +-
.../google/inject/grapher/ImplementationNode.java | 31 +-
.../com/google/inject/grapher/InjectorGrapher.java | 10 +-
.../com/google/inject/grapher/InstanceNode.java | 28 +-
.../com/google/inject/grapher/InterfaceNode.java | 13 +-
.../src/com/google/inject/grapher/NameFactory.java | 12 +-
.../src/com/google/inject/grapher/Node.java | 12 +-
.../src/com/google/inject/grapher/NodeCreator.java | 2 +-
.../src/com/google/inject/grapher/NodeId.java | 21 +-
.../inject/grapher/ProviderAliasCreator.java | 16 +-
.../google/inject/grapher/RootKeySetCreator.java | 2 +-
.../google/inject/grapher/ShortNameFactory.java | 27 +-
.../grapher/TransitiveDependencyVisitor.java | 41 +-
.../google/inject/grapher/graphviz/ArrowType.java | 10 +-
.../inject/grapher/graphviz/CompassPoint.java | 9 +-
.../google/inject/grapher/graphviz/EdgeStyle.java | 6 +-
.../google/inject/grapher/graphviz/Graphviz.java | 2 +-
.../inject/grapher/graphviz/GraphvizEdge.java | 14 +-
.../inject/grapher/graphviz/GraphvizGrapher.java | 93 +-
.../inject/grapher/graphviz/GraphvizModule.java | 13 +-
.../inject/grapher/graphviz/GraphvizNode.java | 20 +-
.../google/inject/grapher/graphviz/NodeShape.java | 12 +-
.../google/inject/grapher/graphviz/NodeStyle.java | 6 +-
.../inject/grapher/graphviz/PortIdFactory.java | 6 +-
.../inject/grapher/graphviz/PortIdFactoryImpl.java | 3 +-
.../grapher/AbstractInjectorGrapherTest.java | 165 +-
.../test/com/google/inject/grapher/AllTests.java | 6 +-
.../inject/grapher/ShortNameFactoryTest.java | 116 +-
.../grapher/TransitiveDependencyVisitorTest.java | 91 +-
.../inject/grapher/demo/AssistedInjectModule.java | 12 +-
.../inject/grapher/demo/BackToTheFutureModule.java | 15 +-
.../com/google/inject/grapher/demo/DanceParty.java | 2 +-
.../inject/grapher/demo/DancePartyFactory.java | 2 +-
.../google/inject/grapher/demo/DancePartyImpl.java | 2 +-
.../com/google/inject/grapher/demo/DeLorian.java | 6 +-
.../com/google/inject/grapher/demo/DocBrown.java | 2 +-
.../com/google/inject/grapher/demo/Driver.java | 7 +-
.../google/inject/grapher/demo/EnergySource.java | 4 +-
.../inject/grapher/demo/EnergySourceProvider.java | 13 +-
.../google/inject/grapher/demo/FluxCapacitor.java | 4 +-
.../inject/grapher/demo/InjectorGrapherDemo.java | 16 +-
.../com/google/inject/grapher/demo/Inventor.java | 7 +-
.../com/google/inject/grapher/demo/Lightning.java | 8 +-
.../com/google/inject/grapher/demo/MartyMcFly.java | 4 +-
.../inject/grapher/demo/MultibinderModule.java | 2 +-
.../com/google/inject/grapher/demo/Nuclear.java | 7 +-
.../com/google/inject/grapher/demo/Person.java | 4 +-
.../google/inject/grapher/demo/PinballParts.java | 2 +-
.../com/google/inject/grapher/demo/Plutonium.java | 4 +-
.../inject/grapher/demo/PlutoniumProvider.java | 6 +-
.../inject/grapher/demo/PrivateTestModule.java | 6 +-
.../com/google/inject/grapher/demo/Renewable.java | 7 +-
.../test/com/google/inject/grapher/demo/Used.java | 7 +-
extensions/jmx/pom.xml | 13 +-
.../google/inject/tools/jmx/ManagedBinding.java | 5 +-
.../inject/tools/jmx/ManagedBindingMBean.java | 14 +-
.../src/com/google/inject/tools/jmx/Manager.java | 44 +-
.../com/google/inject/tools/jmx/package-info.java | 6 +-
.../test/com/google/inject/tools/jmx/JmxTest.java | 21 +-
extensions/jndi/.gitignore | 1 -
extensions/jndi/pom.xml | 16 +-
.../com/google/inject/jndi/JndiIntegration.java | 13 +-
.../src/com/google/inject/jndi/package-info.java | 6 +-
extensions/mini/pom.xml | 16 +-
.../mini/src/com/google/inject/mini/MiniGuice.java | 207 ++-
.../test/com/google/inject/mini/MiniGuiceTest.java | 211 ++-
extensions/multibindings/.gitignore | 1 -
extensions/multibindings/build.properties | 7 -
extensions/multibindings/build.xml | 20 -
extensions/multibindings/pom.xml | 41 +-
extensions/multibindings/src/README | 4 +
.../com/google/inject/multibindings/MapBinder.java | 854 ---------
.../google/inject/multibindings/Multibinder.java | 575 ------
.../inject/multibindings/OptionalBinder.java | 754 --------
.../com/google/inject/multibindings/AllTests.java | 36 -
.../google/inject/multibindings/MapBinderTest.java | 1032 -----------
.../inject/multibindings/MultibinderTest.java | 1221 -------------
extensions/persist/.gitignore | 1 -
extensions/persist/pom.xml | 17 +-
.../com/google/inject/persist/PersistFilter.java | 65 +-
.../com/google/inject/persist/PersistModule.java | 8 +-
.../com/google/inject/persist/PersistService.java | 24 +-
.../com/google/inject/persist/Transactional.java | 44 +-
.../src/com/google/inject/persist/UnitOfWork.java | 38 +-
.../inject/persist/finder/DynamicFinder.java | 2 +-
.../com/google/inject/persist/finder/Finder.java | 18 +-
.../google/inject/persist/finder/FirstResult.java | 11 +-
.../google/inject/persist/finder/MaxResults.java | 10 +-
.../google/inject/persist/finder/package-info.java | 6 +-
.../src/com/google/inject/persist/jpa/Jpa.java | 6 +-
.../google/inject/persist/jpa/JpaFinderProxy.java | 55 +-
.../inject/persist/jpa/JpaLocalTxnInterceptor.java | 28 +-
.../inject/persist/jpa/JpaPersistModule.java | 132 +-
.../inject/persist/jpa/JpaPersistService.java | 47 +-
.../google/inject/persist/jpa/package-info.java | 6 +-
.../com/google/inject/persist/package-info.java | 4 +-
.../test/com/google/inject/persist/AllTests.java | 9 +-
.../test/com/google/inject/persist/EdslTest.java | 20 +-
.../ClassLevelManagedLocalTransactionsTest.java | 70 +-
...stomPropsEntityManagerFactoryProvisionTest.java | 14 +-
.../inject/persist/jpa/DynamicFinderTest.java | 14 +-
.../EnsureJpaCanTakeObjectsInPropertiesTest.java | 2 +-
.../jpa/EntityManagerFactoryProvisionTest.java | 18 +-
.../jpa/EntityManagerPerRequestProvisionTest.java | 35 +-
.../persist/jpa/EntityManagerProvisionTest.java | 28 +-
.../persist/jpa/JoiningLocalTransactionsTest.java | 65 +-
.../inject/persist/jpa/JpaParentTestEntity.java | 48 +-
.../inject/persist/jpa/JpaPersistServiceTest.java | 17 +-
.../google/inject/persist/jpa/JpaTestEntity.java | 5 +-
.../inject/persist/jpa/JpaWorkManagerTest.java | 36 +-
.../ManagedLocalTransactionsAcrossRequestTest.java | 80 +-
.../persist/jpa/ManagedLocalTransactionsTest.java | 63 +-
.../jpa/ManualLocalTransactionsConfidenceTest.java | 17 +-
.../persist/jpa/ManualLocalTransactionsTest.java | 25 +-
...nualLocalTransactionsWithCustomMatcherTest.java | 33 +-
extensions/pom.xml | 5 +-
extensions/service/.gitignore | 1 -
extensions/service/pom.xml | 16 +-
.../com/google/inject/service/AsyncService.java | 70 +-
.../google/inject/service/CompositeService.java | 56 +-
.../src/com/google/inject/service/Service.java | 50 +-
.../service/SingleServiceIntegrationTest.java | 56 +-
extensions/servlet/.gitignore | 1 -
extensions/servlet/pom.xml | 16 +-
.../inject/servlet/AbstractFilterPipeline.java | 33 +-
.../servlet/AbstractServletModuleBinding.java | 21 +-
.../inject/servlet/AbstractServletPipeline.java | 37 +-
.../servlet/ContinuingHttpServletRequest.java | 49 +-
.../inject/servlet/DefaultFilterPipeline.java | 21 +-
.../inject/servlet/FilterChainInvocation.java | 38 +-
.../google/inject/servlet/FilterDefinition.java | 91 +-
.../com/google/inject/servlet/FilterPipeline.java | 22 +-
.../inject/servlet/FiltersModuleBuilder.java | 75 +-
.../src/com/google/inject/servlet/GuiceFilter.java | 107 +-
.../servlet/GuiceServletContextListener.java | 27 +-
.../inject/servlet/InstanceFilterBinding.java | 5 +-
.../inject/servlet/InstanceFilterBindingImpl.java | 36 +-
.../inject/servlet/InstanceServletBinding.java | 5 +-
.../inject/servlet/InstanceServletBindingImpl.java | 35 +-
.../inject/servlet/InternalServletModule.java | 59 +-
.../google/inject/servlet/LinkedFilterBinding.java | 6 +-
.../inject/servlet/LinkedFilterBindingImpl.java | 35 +-
.../inject/servlet/LinkedServletBinding.java | 6 +-
.../inject/servlet/LinkedServletBindingImpl.java | 33 +-
.../inject/servlet/ManagedFilterPipeline.java | 16 +-
.../inject/servlet/ManagedServletPipeline.java | 9 +-
.../google/inject/servlet/RequestParameters.java | 9 +-
.../com/google/inject/servlet/RequestScoped.java | 5 +-
.../com/google/inject/servlet/RequestScoper.java | 20 +
.../google/inject/servlet/ScopingException.java | 2 +-
.../src/com/google/inject/servlet/ScopingOnly.java | 9 +-
.../google/inject/servlet/ServletDefinition.java | 235 ++-
.../com/google/inject/servlet/ServletModule.java | 170 +-
.../inject/servlet/ServletModuleBinding.java | 6 +-
.../inject/servlet/ServletModuleTargetVisitor.java | 49 +-
.../com/google/inject/servlet/ServletScopes.java | 331 ++--
.../com/google/inject/servlet/ServletUtils.java | 190 +-
.../inject/servlet/ServletsModuleBuilder.java | 80 +-
.../com/google/inject/servlet/SessionScoped.java | 5 +-
.../google/inject/servlet/UriPatternMatcher.java | 16 +-
.../com/google/inject/servlet/UriPatternType.java | 76 +-
.../com/google/inject/servlet/package-info.java | 7 +-
.../test/com/google/inject/servlet/AllTests.java | 6 +-
.../com/google/inject/servlet/ContextPathTest.java | 63 +-
.../servlet/ContinuingHttpServletRequestTest.java | 24 +-
.../servlet/ContinuingRequestIntegrationTest.java | 149 +-
.../com/google/inject/servlet/DummyFilterImpl.java | 21 +-
.../com/google/inject/servlet/DummyServlet.java | 7 +-
.../test/com/google/inject/servlet/EdslTest.java | 103 +-
.../google/inject/servlet/ExtensionSpiTest.java | 289 ++-
.../inject/servlet/FilterDefinitionTest.java | 209 +--
.../servlet/FilterDispatchIntegrationTest.java | 358 ++--
.../google/inject/servlet/FilterPipelineTest.java | 81 +-
.../inject/servlet/InjectedFilterPipelineTest.java | 121 +-
.../inject/servlet/InvalidScopeBindingTest.java | 67 +-
.../MultiModuleDispatchIntegrationTest.java | 87 +-
.../servlet/MultipleServletInjectorsTest.java | 49 +-
.../servlet/ScopeRequestIntegrationTest.java | 89 +-
.../inject/servlet/ServletDefinitionPathsTest.java | 256 +--
.../inject/servlet/ServletDefinitionTest.java | 61 +-
.../servlet/ServletDispatchIntegrationTest.java | 197 +-
.../google/inject/servlet/ServletModuleTest.java | 71 +-
.../ServletPipelineRequestDispatcherTest.java | 179 +-
.../google/inject/servlet/ServletScopesTest.java | 100 +-
.../google/inject/servlet/ServletSpiVisitor.java | 54 +-
.../com/google/inject/servlet/ServletTest.java | 530 +++---
.../google/inject/servlet/ServletTestUtils.java | 97 +-
.../google/inject/servlet/ServletUtilsTest.java | 63 +-
.../servlet/TransferRequestIntegrationTest.java | 225 ++-
.../google/inject/servlet/UriPatternTypeTest.java | 14 +-
.../VarargsFilterDispatchIntegrationTest.java | 143 +-
.../VarargsServletDispatchIntegrationTest.java | 133 +-
extensions/spring/pom.xml | 16 +-
.../google/inject/spring/SpringIntegration.java | 34 +-
.../src/com/google/inject/spring/package-info.java | 6 +-
.../inject/spring/SpringIntegrationTest.java | 77 +-
.../com/google/inject/struts2/example/Count.java | 5 +-
.../com/google/inject/struts2/example/Counter.java | 6 +-
.../inject/struts2/example/ExampleListener.java | 28 +-
.../com/google/inject/struts2/example/Main.java | 8 +-
extensions/struts2/pom.xml | 16 +-
.../google/inject/struts2/GuiceObjectFactory.java | 115 +-
.../com/google/inject/struts2/Struts2Factory.java | 108 +-
.../inject/struts2/Struts2GuicePluginModule.java | 7 +-
.../google/inject/struts2/Struts2FactoryTest.java | 33 +-
extensions/testlib/build.xml | 13 +
extensions/testlib/pom.xml | 35 +-
.../google/inject/testing/fieldbinder/Bind.java | 17 +-
.../testing/fieldbinder/BoundFieldModule.java | 187 +-
.../throwingproviders/CheckedProviderSubject.java | 83 +
.../testing/fieldbinder/BoundFieldModuleTest.java | 553 ++++--
.../CheckedProviderSubjectTest.java | 120 ++
extensions/throwingproviders/.gitignore | 1 -
extensions/throwingproviders/pom.xml | 24 +-
.../throwingproviders/CheckedProvideUtils.java | 36 +-
.../inject/throwingproviders/CheckedProvider.java | 21 +-
.../throwingproviders/CheckedProviderMethod.java | 31 +-
.../CheckedProviderMethodsModule.java | 54 +-
.../CheckedProviderWithDependencies.java | 12 +-
.../inject/throwingproviders/CheckedProviders.java | 238 +++
.../inject/throwingproviders/CheckedProvides.java | 35 +-
.../inject/throwingproviders/ProviderChecker.java | 120 ++
.../inject/throwingproviders/ThrowingInject.java | 12 +-
.../inject/throwingproviders/ThrowingProvider.java | 20 +-
.../throwingproviders/ThrowingProviderBinder.java | 379 ++--
.../inject/throwingproviders/package-info.java | 4 +-
.../CheckedProviderMethodsModuleTest.java | 82 +-
.../throwingproviders/CheckedProviderTest.java | 1882 +++++++++++---------
.../throwingproviders/CheckedProvidersTest.java | 161 ++
.../google/inject/throwingproviders/TestScope.java | 17 +-
.../throwingproviders/ThrowingProviderTest.java | 1124 +++++++-----
jdk8-tests/pom.xml | 12 +-
.../inject/jdk8/DefaultMethodInterceptionTest.java | 126 +-
.../jdk8/Java8LanguageFeatureBindingTest.java | 125 +-
.../inject/jdk8/StaticInterfaceMethodsTest.java | 63 +
lib/build/jdiff/Null.java | 10 +-
pom.xml | 86 +-
util/generate-latest-docs.sh | 2 +-
613 files changed, 37972 insertions(+), 27000 deletions(-)
create mode 100644 PATCHES/GUICE_1171_remove_java6_references.patch
create mode 100644 PATCHES/GUICE_1172_mark_jsr305_as_optional.patch
create mode 100644 PATCHES/GUICE_1173_fix_osgi_metadata.patch
create mode 100644 PATCHES/GUICE_1174_exclude_ant_dep_from_cglib.patch
delete mode 100644 core/src/com/google/inject/internal/ContextualCallable.java
rename {extensions/multibindings/src/com/google/inject/multibindings =>
core/src/com/google/inject/internal}/Element.java (79%)
delete mode 100644 core/src/com/google/inject/internal/Exceptions.java
rename {extensions/multibindings/src/com/google/inject/multibindings =>
core/src/com/google/inject/internal}/Indexer.java (59%)
create mode 100644
core/src/com/google/inject/internal/InternalProviderInstanceBindingImpl.java
create mode 100644
core/src/com/google/inject/internal/InternalProvisionException.java
create mode 100644 core/src/com/google/inject/internal/Messages.java
rename
extensions/multibindings/src/com/google/inject/multibindings/MultibindingsScanner.java
=> core/src/com/google/inject/internal/ProvidesMethodScanner.java (51%)
rename {extensions/multibindings/src/com/google/inject/multibindings =>
core/src/com/google/inject/internal}/RealElement.java (58%)
create mode 100644 core/src/com/google/inject/internal/RealMapBinder.java
create mode 100644 core/src/com/google/inject/internal/RealMultibinder.java
create mode 100644 core/src/com/google/inject/internal/RealOptionalBinder.java
rename {extensions/multibindings =>
core}/src/com/google/inject/multibindings/ClassMapKey.java (99%)
create mode 100644 core/src/com/google/inject/multibindings/MapBinder.java
rename {extensions/multibindings =>
core}/src/com/google/inject/multibindings/MapBinderBinding.java (54%)
rename {extensions/multibindings =>
core}/src/com/google/inject/multibindings/MapKey.java (86%)
create mode 100644 core/src/com/google/inject/multibindings/Multibinder.java
rename {extensions/multibindings =>
core}/src/com/google/inject/multibindings/MultibinderBinding.java (78%)
create mode 100644
core/src/com/google/inject/multibindings/MultibindingsScanner.java
rename {extensions/multibindings =>
core}/src/com/google/inject/multibindings/MultibindingsTargetVisitor.java (83%)
create mode 100644 core/src/com/google/inject/multibindings/OptionalBinder.java
rename {extensions/multibindings =>
core}/src/com/google/inject/multibindings/OptionalBinderBinding.java (57%)
rename {extensions/multibindings =>
core}/src/com/google/inject/multibindings/ProvidesIntoMap.java (71%)
rename {extensions/multibindings =>
core}/src/com/google/inject/multibindings/ProvidesIntoOptional.java (88%)
rename {extensions/multibindings =>
core}/src/com/google/inject/multibindings/ProvidesIntoSet.java (89%)
rename {extensions/multibindings =>
core}/src/com/google/inject/multibindings/StringMapKey.java (99%)
rename {extensions/multibindings =>
core}/src/com/google/inject/multibindings/package-info.java (90%)
rename {extensions/multibindings/test/com/google/inject/multibindings =>
core/test/com/google/inject/internal}/Collector.java (75%)
create mode 100644
core/test/com/google/inject/internal/InternalProvisionExceptionTest.java
create mode 100644 core/test/com/google/inject/internal/MapBinderTest.java
create mode 100644 core/test/com/google/inject/internal/MultibinderTest.java
rename {extensions/multibindings/test/com/google/inject/multibindings =>
core/test/com/google/inject/internal}/OptionalBinderTest.java (56%)
rename {extensions/multibindings/test/com/google/inject/multibindings =>
core/test/com/google/inject/internal}/RealElementTest.java (87%)
rename {extensions/multibindings/test/com/google/inject/multibindings =>
core/test/com/google/inject/internal}/SpiUtils.java (62%)
rename {extensions/multibindings =>
core}/test/com/google/inject/multibindings/ProvidesIntoTest.java (51%)
create mode 100644 core/test/com/google/inject/spi/MessageTest.java
delete mode 100644 debian/patches/allow_maven2.diff
delete mode 100644 debian/patches/series
delete mode 100644 extensions/grapher/.gitignore
delete mode 100644 extensions/jndi/.gitignore
delete mode 100644 extensions/multibindings/.gitignore
delete mode 100644 extensions/multibindings/build.properties
delete mode 100644 extensions/multibindings/build.xml
create mode 100644 extensions/multibindings/src/README
delete mode 100644
extensions/multibindings/src/com/google/inject/multibindings/MapBinder.java
delete mode 100644
extensions/multibindings/src/com/google/inject/multibindings/Multibinder.java
delete mode 100644
extensions/multibindings/src/com/google/inject/multibindings/OptionalBinder.java
delete mode 100644
extensions/multibindings/test/com/google/inject/multibindings/AllTests.java
delete mode 100644
extensions/multibindings/test/com/google/inject/multibindings/MapBinderTest.java
delete mode 100644
extensions/multibindings/test/com/google/inject/multibindings/MultibinderTest.java
delete mode 100644 extensions/persist/.gitignore
delete mode 100644 extensions/service/.gitignore
delete mode 100644 extensions/servlet/.gitignore
create mode 100644
extensions/servlet/src/com/google/inject/servlet/RequestScoper.java
create mode 100644
extensions/testlib/src/com/google/inject/testing/throwingproviders/CheckedProviderSubject.java
create mode 100644
extensions/testlib/test/com/google/inject/testing/throwingproviders/CheckedProviderSubjectTest.java
delete mode 100644 extensions/throwingproviders/.gitignore
create mode 100644
extensions/throwingproviders/src/com/google/inject/throwingproviders/CheckedProviders.java
create mode 100644
extensions/throwingproviders/src/com/google/inject/throwingproviders/ProviderChecker.java
create mode 100644
extensions/throwingproviders/test/com/google/inject/throwingproviders/CheckedProvidersTest.java
create mode 100644
jdk8-tests/test/com/google/inject/jdk8/StaticInterfaceMethodsTest.java
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/sisu-guice.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
