This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository guice.
commit a21bac31c3a6ed221d813f33cde418918c40d5c5 Merge: a28dd25 548dc71 Author: Emmanuel Bourg <[email protected]> Date: Fri Oct 17 00:16:54 2014 +0200 Merge tag 'upstream/4.0_beta5' Upstream version 4.0~beta5 .gitignore | 9 + CONTRIBUTING.md | 61 + README.md | 24 + build.properties | 5 +- build.xml | 228 +- common.xml | 36 +- compareBuilds.sh | 74 - copy.sh | 54 - core/pom.xml | 574 +- core/src/com/google/inject/AbstractModule.java | 59 +- core/src/com/google/inject/Binder.java | 42 +- core/src/com/google/inject/BindingAnnotation.java | 3 +- .../com/google/inject/ConfigurationException.java | 8 +- core/src/com/google/inject/CreationException.java | 8 +- core/src/com/google/inject/Exposed.java | 3 +- core/src/com/google/inject/Guice.java | 9 +- core/src/com/google/inject/ImplementedBy.java | 3 +- core/src/com/google/inject/Inject.java | 9 +- core/src/com/google/inject/Injector.java | 4 +- core/src/com/google/inject/Key.java | 62 +- .../src/com/google/inject/OutOfScopeException.java | 78 +- core/src/com/google/inject/PrivateModule.java | 62 +- core/src/com/google/inject/ProvidedBy.java | 3 +- core/src/com/google/inject/Provides.java | 7 +- core/src/com/google/inject/ProvisionException.java | 11 +- core/src/com/google/inject/ScopeAnnotation.java | 3 +- core/src/com/google/inject/Scopes.java | 91 +- core/src/com/google/inject/Singleton.java | 3 +- core/src/com/google/inject/TypeLiteral.java | 12 +- .../google/inject/binder/LinkedBindingBuilder.java | 8 + .../google/inject/binder/ScopedBindingBuilder.java | 1 + .../inject/internal/AbstractBindingBuilder.java | 4 +- .../inject/internal/AbstractBindingProcessor.java | 335 +- .../google/inject/internal/AbstractProcessor.java | 1 + .../com/google/inject/internal/Annotations.java | 139 +- .../com/google/inject/internal/BindingBuilder.java | 13 +- .../com/google/inject/internal/BindingImpl.java | 8 +- .../google/inject/internal/BindingProcessor.java | 43 +- .../inject/internal/BoundProviderFactory.java | 34 +- .../com/google/inject/internal/BytecodeGen.java | 46 +- .../internal/ConstantBindingBuilderImpl.java | 3 +- .../google/inject/internal/ConstantFactory.java | 4 +- .../google/inject/internal/ConstructionProxy.java | 3 +- .../inject/internal/ConstructorBindingImpl.java | 531 +- .../inject/internal/ConstructorInjector.java | 33 +- .../inject/internal/ConstructorInjectorStore.java | 7 +- .../google/inject/internal/CreationListener.java | 46 +- .../internal/DefaultConstructionProxyFactory.java | 3 +- .../google/inject/internal/DeferredLookups.java | 3 +- .../google/inject/internal/DelayedInitialize.java | 17 + .../internal/DelegatingInvocationHandler.java | 5 +- .../com/google/inject/internal/EncounterImpl.java | 21 +- core/src/com/google/inject/internal/Errors.java | 159 +- .../src/com/google/inject/internal/Exceptions.java | 119 +- .../google/inject/internal/ExposedBindingImpl.java | 7 +- .../google/inject/internal/ExposureBuilder.java | 3 +- .../com/google/inject/internal/FactoryProxy.java | 11 +- .../com/google/inject/internal/FailableCache.java | 18 +- .../google/inject/internal/InheritingState.java | 58 +- .../com/google/inject/internal/Initializer.java | 66 +- .../inject/internal/InjectionRequestProcessor.java | 19 +- .../com/google/inject/internal/InjectorImpl.java | 247 +- .../inject/internal/InjectorOptionsProcessor.java | 158 +- .../com/google/inject/internal/InjectorShell.java | 53 +- .../inject/internal/InstanceBindingImpl.java | 12 +- .../inject/internal/InterceptorStackCallback.java | 24 +- .../google/inject/internal/InternalContext.java | 59 +- .../InternalFactoryToInitializableAdapter.java | 63 + .../internal/InternalFactoryToProviderAdapter.java | 15 +- .../com/google/inject/internal/InternalFlags.java | 36 + .../inject/internal/InternalInjectorCreator.java | 9 +- .../google/inject/internal/LinkedBindingImpl.java | 190 +- .../inject/internal/LinkedProviderBindingImpl.java | 220 +- ...rocessor.java => ListenerBindingProcessor.java} | 10 +- .../inject/internal/MembersInjectorImpl.java | 42 +- .../inject/internal/MembersInjectorStore.java | 18 +- .../google/inject/internal/MessageProcessor.java | 1 + .../com/google/inject/internal/MethodAspect.java | 7 +- core/src/com/google/inject/internal/MoreTypes.java | 18 +- .../com/google/inject/internal/Nullability.java | 7 +- .../inject/internal/PrivateElementProcessor.java | 3 +- .../inject/internal/PrivateElementsImpl.java | 20 +- .../inject/internal/ProcessedBindingData.java | 108 +- .../inject/internal/ProvidedByInternalFactory.java | 93 + .../internal/ProviderInstanceBindingImpl.java | 24 +- .../inject/internal/ProviderInternalFactory.java | 90 + .../com/google/inject/internal/ProviderMethod.java | 140 +- .../inject/internal/ProviderMethodsModule.java | 132 +- .../internal/ProvisionListenerCallbackStore.java | 128 + .../internal/ProvisionListenerStackCallback.java | 150 + .../com/google/inject/internal/ProxyFactory.java | 60 +- .../inject/internal/ScopeBindingProcessor.java | 21 +- core/src/com/google/inject/internal/Scoping.java | 35 +- .../inject/internal/SingleFieldInjector.java | 11 +- .../inject/internal/SingleMethodInjector.java | 1 + .../inject/internal/SingleParameterInjector.java | 12 +- core/src/com/google/inject/internal/State.java | 40 +- .../internal/TypeConverterBindingProcessor.java | 129 +- .../google/inject/internal/UniqueAnnotations.java | 4 +- .../inject/internal/UntargettedBindingImpl.java | 157 +- .../internal/UntargettedBindingProcessor.java | 138 +- .../src/com/google/inject/internal/WeakKeySet.java | 129 +- .../inject/internal/util/AbstractIterator.java | 152 - .../inject/internal/util/AbstractMapEntry.java | 72 - .../util/AsynchronousComputationException.java | 29 - .../com/google/inject/internal/util/Classes.java | 3 +- .../google/inject/internal/util/Collections2.java | 53 - .../internal/util/CustomConcurrentHashMap.java | 2157 ---- .../internal/util/FinalizablePhantomReference.java | 46 - .../inject/internal/util/FinalizableReference.java | 35 - .../internal/util/FinalizableReferenceQueue.java | 314 - .../internal/util/FinalizableSoftReference.java | 42 - .../internal/util/FinalizableWeakReference.java | 42 - .../com/google/inject/internal/util/Finalizer.java | 180 - .../com/google/inject/internal/util/Function.java | 65 - .../com/google/inject/internal/util/Hashing.java | 54 - .../inject/internal/util/ImmutableCollection.java | 259 - .../inject/internal/util/ImmutableEntry.java | 42 - .../google/inject/internal/util/ImmutableList.java | 678 -- .../google/inject/internal/util/ImmutableMap.java | 779 -- .../google/inject/internal/util/ImmutableSet.java | 656 -- .../com/google/inject/internal/util/Iterables.java | 135 - .../com/google/inject/internal/util/Iterators.java | 321 - core/src/com/google/inject/internal/util/Join.java | 315 - .../google/inject/internal/util/LineNumbers.java | 151 +- .../src/com/google/inject/internal/util/Lists.java | 127 - .../com/google/inject/internal/util/MapMaker.java | 1069 -- core/src/com/google/inject/internal/util/Maps.java | 92 - .../inject/internal/util/NullOutputException.java | 30 - .../com/google/inject/internal/util/Nullable.java | 37 - .../google/inject/internal/util/ObjectArrays.java | 44 - .../com/google/inject/internal/util/Objects.java | 64 - .../google/inject/internal/util/Preconditions.java | 465 - core/src/com/google/inject/internal/util/Sets.java | 196 - .../inject/internal/util/SourceProvider.java | 51 +- .../inject/internal/util/StackTraceElements.java | 163 +- .../com/google/inject/internal/util/Strings.java | 57 - .../inject/internal/util/ToStringBuilder.java | 48 - .../inject/internal/util/UnmodifiableIterator.java | 36 - core/src/com/google/inject/matcher/Matchers.java | 9 +- core/src/com/google/inject/name/Named.java | 4 +- core/src/com/google/inject/name/NamedImpl.java | 3 +- core/src/com/google/inject/name/Names.java | 1 + .../google/inject/spi/BindingScopingVisitor.java | 1 + .../com/google/inject/spi/ConstructorBinding.java | 1 + .../inject/spi/ConvertedConstantBinding.java | 5 +- .../inject/spi/DefaultBindingScopingVisitor.java | 1 + .../inject/spi/DefaultBindingTargetVisitor.java | 4 +- .../google/inject/spi/DefaultElementVisitor.java | 12 + core/src/com/google/inject/spi/Dependency.java | 10 +- .../com/google/inject/spi/DependencyAndSource.java | 78 + .../inject/spi/DisableCircularProxiesOption.java | 93 +- core/src/com/google/inject/spi/ElementSource.java | 174 + core/src/com/google/inject/spi/ElementVisitor.java | 20 + core/src/com/google/inject/spi/Elements.java | 183 +- core/src/com/google/inject/spi/InjectionPoint.java | 52 +- .../com/google/inject/spi/InjectionRequest.java | 4 +- .../src/com/google/inject/spi/InstanceBinding.java | 1 + .../com/google/inject/spi/InterceptorBinding.java | 11 +- .../google/inject/spi/MembersInjectorLookup.java | 5 +- core/src/com/google/inject/spi/Message.java | 19 +- core/src/com/google/inject/spi/ModuleSource.java | 166 + .../src/com/google/inject/spi/PrivateElements.java | 1 + .../google/inject/spi/ProviderInstanceBinding.java | 10 +- core/src/com/google/inject/spi/ProviderLookup.java | 18 +- .../google/inject/spi/ProvidesMethodBinding.java | 24 + .../inject/spi/ProvidesMethodTargetVisitor.java | 21 + .../com/google/inject/spi/ProvisionListener.java | 70 + .../inject/spi/ProvisionListenerBinding.java | 71 + ...va => RequireAtInjectOnConstructorsOption.java} | 94 +- ...a => RequireExactBindingAnnotationsOption.java} | 93 +- .../inject/spi/RequireExplicitBindingsOption.java | 93 +- core/src/com/google/inject/spi/ScopeBinding.java | 4 +- .../google/inject/spi/StaticInjectionRequest.java | 4 +- core/src/com/google/inject/spi/Toolable.java | 57 +- .../google/inject/spi/TypeConverterBinding.java | 6 +- core/src/com/google/inject/spi/TypeEncounter.java | 3 +- core/src/com/google/inject/util/Modules.java | 301 +- core/src/com/google/inject/util/Node.java | 114 - core/src/com/google/inject/util/Providers.java | 274 +- core/src/com/google/inject/util/Types.java | 1 + core/test/com/google/inject/AllTests.java | 50 +- core/test/com/google/inject/Asserts.java | 62 +- core/test/com/google/inject/BinderTest.java | 217 +- core/test/com/google/inject/BinderTestSuite.java | 29 +- .../com/google/inject/BindingAnnotationTest.java | 96 +- core/test/com/google/inject/BindingOrderTest.java | 7 +- core/test/com/google/inject/BindingTest.java | 27 +- .../google/inject/BoundInstanceInjectionTest.java | 9 +- .../com/google/inject/CircularDependencyTest.java | 460 +- .../com/google/inject/DuplicateBindingsTest.java | 1147 +- core/test/com/google/inject/ErrorHandlingTest.java | 8 +- .../com/google/inject/GenericInjectionTest.java | 8 +- .../com/google/inject/ImplicitBindingTest.java | 122 +- core/test/com/google/inject/InjectorTest.java | 29 +- core/test/com/google/inject/IntegrationTest.java | 2 + core/test/com/google/inject/JitBindingsTest.java | 13 +- core/test/com/google/inject/KeyTest.java | 81 +- .../com/google/inject/LoggerInjectionTest.java | 5 +- .../com/google/inject/MembersInjectorTest.java | 5 +- .../com/google/inject/MethodInterceptionTest.java | 154 +- core/test/com/google/inject/ModuleTest.java | 112 +- core/test/com/google/inject/ModulesTest.java | 23 +- .../google/inject/NullableInjectionPointTest.java | 15 +- .../com/google/inject/OptionalBindingTest.java | 5 + .../test/com/google/inject/ParentInjectorTest.java | 39 +- .../com/google/inject/PerformanceComparison.java | 8 +- core/test/com/google/inject/PrivateModuleTest.java | 103 +- .../com/google/inject/ProviderInjectionTest.java | 4 +- .../com/google/inject/ProvisionExceptionTest.java | 18 +- .../com/google/inject/ProvisionExceptionsTest.java | 356 +- .../com/google/inject/ProvisionListenerTest.java | 711 ++ core/test/com/google/inject/ReflectionTest.java | 13 +- .../com/google/inject/RequestInjectionTest.java | 56 +- .../inject/RequireAtInjectOnConstructorsTest.java | 202 + core/test/com/google/inject/ScopesTest.java | 258 +- core/test/com/google/inject/SerializationTest.java | 6 +- core/test/com/google/inject/SuiteUtils.java | 47 + .../test/com/google/inject/TypeConversionTest.java | 228 +- core/test/com/google/inject/TypeListenerTest.java | 127 +- .../google/inject/TypeLiteralInjectionTest.java | 7 +- core/test/com/google/inject/TypeLiteralTest.java | 13 +- .../inject/TypeLiteralTypeResolutionTest.java | 9 +- .../inject/example/ClientServiceWithGuice.java | 3 +- .../example/ClientServiceWithGuiceDefaults.java | 1 + .../com/google/inject/example/JndiProvider.java | 1 + .../google/inject/example/JndiProviderClient.java | 4 +- .../com/google/inject/internal/MoreTypesTest.java | 100 +- .../google/inject/internal/ProxyFactoryTest.java | 13 +- .../com/google/inject/internal/WeakKeySetTest.java | 525 + .../google/inject/internal/WeakKeySetUtils.java | 144 + .../util/FinalizableReferenceQueueTest.java | 147 - .../inject/internal/util/ForwardingCollection.java | 101 - .../internal/util/ForwardingConcurrentMap.java | 51 - .../google/inject/internal/util/ForwardingMap.java | 179 - .../inject/internal/util/ForwardingObject.java | 72 - .../google/inject/internal/util/ForwardingSet.java | 43 - .../google/inject/internal/util/Jsr166HashMap.java | 174 - .../inject/internal/util/Jsr166HashMapTest.java | 628 -- .../inject/internal/util/LineNumbersTest.java | 17 +- .../inject/internal/util/MapMakerTestSuite.java | 1211 --- .../com/google/inject/matcher/MatcherTest.java | 10 +- .../google/inject/name/NamedEquivalanceTest.java | 12 +- core/test/com/google/inject/name/NamesTest.java | 9 +- .../inject/spi/BindingTargetVisitorTest.java | 1 + .../com/google/inject/spi/ElementApplyToTest.java | 1 + .../com/google/inject/spi/ElementSourceTest.java | 175 + core/test/com/google/inject/spi/ElementsTest.java | 121 +- .../inject/spi/FailingBindingScopingVisitor.java | 4 +- .../google/inject/spi/FailingTargetVisitor.java | 1 + .../com/google/inject/spi/HasDependenciesTest.java | 8 +- .../com/google/inject/spi/InjectionPointTest.java | 133 +- .../com/google/inject/spi/InjectorSpiTest.java | 148 +- .../com/google/inject/spi/ModuleRewriterTest.java | 5 +- .../com/google/inject/spi/ModuleSourceTest.java | 125 + .../com/google/inject/spi/ProviderMethodsTest.java | 471 +- .../com/google/inject/spi/SpiBindingsTest.java | 51 +- .../google/inject/spi/ToolStageInjectorTest.java | 330 +- .../inject/{ => util}/OverrideModuleTest.java | 159 +- .../test/com/google/inject/util/ProvidersTest.java | 150 +- core/test/com/google/inject/util/TypesTest.java | 38 +- .../test/com/googlecode/guice/BytecodeGenTest.java | 42 +- core/test/com/googlecode/guice/GuiceTck.java | 8 +- core/test/com/googlecode/guice/Jsr330Test.java | 16 +- .../com/googlecode/guice/OSGiContainerTest.java | 34 +- .../googlecode/guice/StrictContainerTestSuite.java | 89 - .../guice/StrictContainerTestSuiteBuilder.java | 173 - .../googlecode/guice/bundle/OSGiTestActivator.java | 18 +- examples/examples.iml | 22 - examples/src/example/xml/Contact.java | 10 +- examples/src/example/xml/Contacts.java | 10 +- examples/src/example/xml/FlashMemory.java | 20 +- examples/src/example/xml/FromFlash.java | 12 +- examples/src/example/xml/FromSim.java | 14 +- examples/src/example/xml/Main.java | 96 +- examples/src/example/xml/Phone.java | 28 +- examples/src/example/xml/SimCard.java | 18 +- examples/src/example/xml/XmlBeanModule.java | 454 +- examples/src/example/xml/phone.xml | 8 +- extensions/assistedinject/assistedinject.iml | 23 - extensions/assistedinject/build.xml | 5 +- .../assistedinject/build/META-INF/MANIFEST.MF | 17 - extensions/assistedinject/pom.xml | 32 +- .../com/google/inject/assistedinject/Assisted.java | 6 +- .../inject/assistedinject/AssistedConstructor.java | 11 +- .../inject/assistedinject/AssistedInject.java | 5 +- .../assistedinject/AssistedInjectBinding.java | 76 +- .../AssistedInjectTargetVisitor.java | 72 +- .../inject/assistedinject/AssistedMethod.java | 112 +- .../inject/assistedinject/BindingCollector.java | 15 +- .../assistedinject/FactoryModuleBuilder.java | 6 +- .../inject/assistedinject/FactoryProvider.java | 74 +- .../inject/assistedinject/FactoryProvider2.java | 134 +- .../google/inject/assistedinject/Parameter.java | 15 +- .../inject/assistedinject/ParameterListKey.java | 1 + .../inject/assistedinject/ExtensionSpiTest.java | 431 +- .../assistedinject/FactoryModuleBuilderTest.java | 101 +- .../assistedinject/FactoryProvider2Test.java | 158 +- .../inject/assistedinject/FactoryProviderTest.java | 95 +- .../assistedinject/ManyConstructorsTest.java | 14 +- extensions/grapher/build.xml | 5 +- extensions/grapher/build/META-INF/MANIFEST.MF | 17 - extensions/grapher/grapher.iml | 16 - extensions/grapher/pom.xml | 70 +- .../inject/grapher/AbstractInjectorGrapher.java | 224 + .../{StringNodeIdFactory.java => Alias.java} | 28 +- .../com/google/inject/grapher/AliasCreator.java | 37 + .../src/com/google/inject/grapher/BindingEdge.java | 56 +- .../google/inject/grapher/DefaultEdgeCreator.java | 154 + .../google/inject/grapher/DefaultNodeCreator.java | 131 + .../inject/grapher/DefaultRootKeySetCreator.java | 46 + .../com/google/inject/grapher/DependencyEdge.java | 58 +- .../src/com/google/inject/grapher/Edge.java | 63 + .../{NodeAliasFactory.java => EdgeCreator.java} | 22 +- .../com/google/inject/grapher/GrapherModule.java | 51 - .../com/google/inject/grapher/GraphingVisitor.java | 374 - .../google/inject/grapher/ImplementationNode.java | 69 +- .../com/google/inject/grapher/InjectorGrapher.java | 142 +- .../com/google/inject/grapher/InstanceNode.java | 66 + .../com/google/inject/grapher/InterfaceNode.java | 39 +- .../src/com/google/inject/grapher/NameFactory.java | 3 +- .../src/com/google/inject/grapher/Node.java | 69 + .../src/com/google/inject/grapher/NodeCreator.java | 18 +- .../src/com/google/inject/grapher/NodeId.java | 77 + .../com/google/inject/grapher/NodeIdFactory.java | 37 - .../inject/grapher/ProviderAliasCreator.java | 43 + .../src/com/google/inject/grapher/Renderer.java | 33 - .../google/inject/grapher/RootKeySetCreator.java} | 23 +- .../google/inject/grapher/ShortNameFactory.java | 11 +- .../grapher/TransitiveDependencyVisitor.java | 44 +- .../grapher/graphviz/BindingEdgeFactory.java | 77 - .../grapher/graphviz/DependencyEdgeFactory.java | 73 - .../google/inject/grapher/graphviz/Graphviz.java} | 11 +- .../inject/grapher/graphviz/GraphvizEdge.java | 14 +- .../inject/grapher/graphviz/GraphvizGrapher.java | 325 + .../inject/grapher/graphviz/GraphvizModule.java | 38 +- .../inject/grapher/graphviz/GraphvizNode.java | 24 +- .../inject/grapher/graphviz/GraphvizRenderer.java | 228 - .../graphviz/ImplementationNodeFactory.java | 91 - .../grapher/graphviz/InterfaceNodeFactory.java | 75 - .../inject/grapher/graphviz/PortIdFactory.java | 5 +- .../grapher/AbstractInjectorGrapherTest.java | 184 + .../test/com/google/inject/grapher/AllTests.java | 2 +- .../google/inject/grapher/GraphingVisitorTest.java | 179 - .../google/inject/grapher/InjectorGrapherTest.java | 142 - .../inject/grapher/ShortNameFactoryTest.java | 6 +- .../grapher/TransitiveDependencyVisitorTest.java | 6 +- .../inject/grapher/demo/AssistedInjectModule.java | 7 +- .../com/google/inject/grapher/demo/DeLorian.java | 3 +- .../com/google/inject/grapher/demo/Driver.java | 4 +- .../inject/grapher/demo/InjectorGrapherDemo.java | 18 +- .../com/google/inject/grapher/demo/Inventor.java | 4 +- .../com/google/inject/grapher/demo/Nuclear.java | 4 +- .../{Renewable.java => PrivateTestModule.java} | 26 +- .../com/google/inject/grapher/demo/Renewable.java | 4 +- .../test/com/google/inject/grapher/demo/Used.java | 4 +- extensions/jmx/build.xml | 5 +- extensions/jmx/build/META-INF/MANIFEST.MF | 16 - extensions/jmx/jmx.iml | 14 - extensions/jmx/pom.xml | 42 +- .../src/com/google/inject/tools/jmx/Manager.java | 5 +- .../test/com/google/inject/tools/jmx/JmxTest.java | 4 +- extensions/jndi/build.xml | 5 +- extensions/jndi/build/META-INF/MANIFEST.MF | 16 - extensions/jndi/jndi.iml | 13 - extensions/jndi/pom.xml | 32 +- .../com/google/inject/jndi/JndiIntegration.java | 1 + extensions/mini/pom.xml | 32 +- .../mini/src/com/google/inject/mini/MiniGuice.java | 13 +- .../test/com/google/inject/mini/MiniGuiceTest.java | 5 +- extensions/multibindings/build.xml | 5 +- .../multibindings/build/META-INF/MANIFEST.MF | 16 - extensions/multibindings/multibindings.iml | 14 - extensions/multibindings/pom.xml | 32 +- .../com/google/inject/multibindings/Element.java | 12 +- .../com/google/inject/multibindings/Indexer.java | 169 + .../com/google/inject/multibindings/MapBinder.java | 593 +- .../inject/multibindings/MapBinderBinding.java | 198 +- .../google/inject/multibindings/Multibinder.java | 234 +- .../inject/multibindings/MultibinderBinding.java | 160 +- .../multibindings/MultibindingsTargetVisitor.java | 92 +- .../inject/multibindings/OptionalBinder.java | 562 + .../multibindings/OptionalBinderBinding.java | 75 + .../google/inject/multibindings/RealElement.java | 73 +- .../com/google/inject/multibindings/AllTests.java | 2 + .../com/google/inject/multibindings/Collector.java | 44 + .../google/inject/multibindings/MapBinderTest.java | 324 +- .../inject/multibindings/MultibinderTest.java | 742 +- .../inject/multibindings/OptionalBinderTest.java | 1018 ++ .../inject/multibindings/RealElementTest.java | 56 + .../com/google/inject/multibindings/SpiUtils.java | 1541 ++- extensions/persist/build.xml | 5 +- extensions/persist/build/META-INF/MANIFEST.MF | 20 - extensions/persist/persist.iml | 34 - extensions/persist/pom.xml | 32 +- .../com/google/inject/persist/PersistFilter.java | 190 +- .../com/google/inject/persist/PersistModule.java | 4 +- .../com/google/inject/persist/Transactional.java | 3 +- .../com/google/inject/persist/finder/Finder.java | 100 +- .../google/inject/persist/finder/FirstResult.java | 68 +- .../google/inject/persist/finder/MaxResults.java | 68 +- .../src/com/google/inject/persist/jpa/Jpa.java | 1 + .../google/inject/persist/jpa/JpaFinderProxy.java | 555 +- .../inject/persist/jpa/JpaLocalTxnInterceptor.java | 322 +- .../inject/persist/jpa/JpaPersistModule.java | 11 +- .../inject/persist/jpa/JpaPersistService.java | 256 +- extensions/persist/src/log4j.properties | 6 - extensions/persist/test/META-INF/persistence.xml | 58 +- .../test/com/google/inject/persist/AllTests.java | 1 + .../test/com/google/inject/persist/EdslTest.java | 5 +- .../ClassLevelManagedLocalTransactionsTest.java | 404 +- ...stomPropsEntityManagerFactoryProvisionTest.java | 124 +- .../inject/persist/jpa/DynamicFinderTest.java | 214 +- .../jpa/EntityManagerFactoryProvisionTest.java | 110 +- .../jpa/EntityManagerPerRequestProvisionTest.java | 237 +- .../persist/jpa/EntityManagerProvisionTest.java | 233 +- .../persist/jpa/JoiningLocalTransactionsTest.java | 340 +- .../inject/persist/jpa/JpaParentTestEntity.java | 113 +- .../inject/persist/jpa/JpaPersistServiceTest.java | 65 + .../google/inject/persist/jpa/JpaTestEntity.java | 146 +- .../inject/persist/jpa/JpaWorkManagerTest.java | 232 +- .../ManagedLocalTransactionsAcrossRequestTest.java | 458 +- .../persist/jpa/ManagedLocalTransactionsTest.java | 352 +- .../jpa/ManualLocalTransactionsConfidenceTest.java | 186 +- .../persist/jpa/ManualLocalTransactionsTest.java | 206 +- ...nualLocalTransactionsWithCustomMatcherTest.java | 6 +- .../{build/classes => test}/log4j.properties | 12 +- extensions/pom.xml | 254 +- extensions/service/pom.xml | 32 +- extensions/service/service.iml | 14 - .../com/google/inject/service/AsyncService.java | 15 +- .../google/inject/service/CompositeService.java | 9 +- .../service/SingleServiceIntegrationTest.java | 19 +- extensions/servlet/build.xml | 5 +- extensions/servlet/build/META-INF/MANIFEST.MF | 17 - extensions/servlet/pom.xml | 62 +- extensions/servlet/servlet.iml | 41 - .../servlet/AbstractServletModuleBinding.java | 122 +- .../servlet/ContinuingHttpServletRequest.java | 77 +- .../inject/servlet/DefaultFilterPipeline.java | 7 +- .../inject/servlet/FilterChainInvocation.java | 91 +- .../google/inject/servlet/FilterDefinition.java | 31 +- .../com/google/inject/servlet/FilterPipeline.java | 8 +- .../inject/servlet/FiltersModuleBuilder.java | 42 +- .../src/com/google/inject/servlet/GuiceFilter.java | 109 +- .../servlet/GuiceServletContextListener.java | 124 +- .../inject/servlet/InstanceFilterBinding.java | 64 +- .../inject/servlet/InstanceFilterBindingImpl.java | 100 +- .../inject/servlet/InstanceServletBinding.java | 64 +- .../inject/servlet/InstanceServletBindingImpl.java | 102 +- .../inject/servlet/InternalServletModule.java | 32 +- .../google/inject/servlet/LinkedFilterBinding.java | 68 +- .../inject/servlet/LinkedFilterBindingImpl.java | 104 +- .../inject/servlet/LinkedServletBinding.java | 68 +- .../inject/servlet/LinkedServletBindingImpl.java | 104 +- .../inject/servlet/ManagedFilterPipeline.java | 18 +- .../inject/servlet/ManagedServletPipeline.java | 30 +- .../google/inject/servlet/RequestParameters.java | 4 +- .../com/google/inject/servlet/RequestScoped.java | 1 + .../google/inject/servlet/ScopingException.java | 17 +- .../{RequestParameters.java => ScopingOnly.java} | 14 +- .../google/inject/servlet/ServletDefinition.java | 73 +- .../com/google/inject/servlet/ServletModule.java | 36 +- .../inject/servlet/ServletModuleBinding.java | 80 +- .../inject/servlet/ServletModuleTargetVisitor.java | 130 +- .../com/google/inject/servlet/ServletScopes.java | 212 +- .../com/google/inject/servlet/ServletUtils.java | 38 + .../inject/servlet/ServletsModuleBuilder.java | 66 +- .../com/google/inject/servlet/SessionScoped.java | 1 + .../com/google/inject/servlet/UriPatternType.java | 12 +- .../test/com/google/inject/servlet/AllTests.java | 5 +- .../com/google/inject/servlet/ContextPathTest.java | 24 +- .../servlet/ContinuingHttpServletRequestTest.java | 105 + .../servlet/ContinuingRequestIntegrationTest.java | 26 +- .../com/google/inject/servlet/DummyFilterImpl.java | 1 + .../com/google/inject/servlet/DummyServlet.java | 1 + .../test/com/google/inject/servlet/EdslTest.java | 4 +- .../google/inject/servlet/ExtensionSpiTest.java | 383 +- .../inject/servlet/FilterDefinitionTest.java | 171 +- .../servlet/FilterDispatchIntegrationTest.java | 186 +- .../google/inject/servlet/FilterPipelineTest.java | 18 +- .../inject/servlet/InjectedFilterPipelineTest.java | 25 +- .../inject/servlet/InvalidScopeBindingTest.java | 9 +- .../MultiModuleDispatchIntegrationTest.java | 18 +- .../servlet/MultipleServletInjectorsTest.java | 16 +- .../servlet/ScopeRequestIntegrationTest.java | 23 +- .../inject/servlet/ServletDefinitionPathsTest.java | 35 +- .../inject/servlet/ServletDefinitionTest.java | 62 +- .../servlet/ServletDispatchIntegrationTest.java | 95 +- .../google/inject/servlet/ServletModuleTest.java | 197 +- .../ServletPipelineRequestDispatcherTest.java | 36 +- .../google/inject/servlet/ServletScopesTest.java | 203 + .../google/inject/servlet/ServletSpiVisitor.java | 301 +- .../com/google/inject/servlet/ServletTest.java | 410 +- .../google/inject/servlet/ServletTestUtils.java | 123 + .../google/inject/servlet/ServletUtilsTest.java | 58 + .../servlet/TransferRequestIntegrationTest.java | 123 + .../google/inject/servlet/UriPatternTypeTest.java | 59 + .../VarargsFilterDispatchIntegrationTest.java | 26 +- .../VarargsServletDispatchIntegrationTest.java | 16 +- extensions/spring/build.xml | 5 +- extensions/spring/build/META-INF/MANIFEST.MF | 17 - extensions/spring/pom.xml | 50 +- extensions/spring/spring.iml | 50 - .../google/inject/spring/SpringIntegration.java | 4 +- .../inject/spring/SpringIntegrationTest.java | 5 +- extensions/struts2/build.xml | 5 +- extensions/struts2/build/META-INF/MANIFEST.MF | 19 - extensions/struts2/build/classes/struts-plugin.xml | 16 - extensions/struts2/example/struts2-example.iml | 141 - extensions/struts2/pom.xml | 72 +- .../google/inject/struts2/GuiceObjectFactory.java | 4 +- .../com/google/inject/struts2/Struts2Factory.java | 17 +- .../inject/struts2/Struts2GuicePluginModule.java | 7 +- extensions/struts2/struts2-plugin.iml | 140 - .../google/inject/struts2/Struts2FactoryTest.java | 21 +- extensions/testlib/build.properties | 7 + extensions/{jmx => testlib}/build.xml | 9 +- extensions/{mini => testlib}/pom.xml | 44 +- .../google/inject/testing/fieldbinder/Bind.java | 48 + .../testing/fieldbinder/BoundFieldModule.java | 381 + .../testing/fieldbinder/BoundFieldModuleTest.java | 732 ++ extensions/throwingproviders/build.xml | 5 +- .../throwingproviders/build/META-INF/MANIFEST.MF | 16 - extensions/throwingproviders/pom.xml | 44 +- .../throwingproviders/CheckedProvideUtils.java | 92 + .../throwingproviders/CheckedProviderMethod.java | 46 +- .../CheckedProviderMethodsModule.java | 15 +- .../CheckedProviderWithDependencies.java | 16 + .../inject/throwingproviders/CheckedProvides.java | 15 +- .../inject/throwingproviders/ThrowingInject.java | 29 +- .../throwingproviders/ThrowingProviderBinder.java | 144 +- .../CheckedProviderMethodsModuleTest.java | 14 +- .../throwingproviders/CheckedProviderTest.java | 793 +- .../google/inject/throwingproviders/TestScope.java | 4 +- .../throwingproviders/ThrowingProviderTest.java | 13 +- extensions/throwingproviders/throwingproviders.iml | 23 - guice.iml | 92 - guice.ipr | 624 -- latest-api-diffs/1.0.xml | 2095 ++++ latest-api-diffs/2.0.xml | 6523 +++++++++++ latest-api-diffs/3.0.xml | 10273 ++++++++++++++++++ latest-api-diffs/4.0.xml | 10774 +++++++++++++++++++ lib/build/guice-3.0.xml | 7246 ++++++------- lib/build/{guice-3.0.xml => guice-4.0.xml} | 8843 ++++++++------- lib/build/jdiff/Null.java | 18 +- pom.xml | 273 +- uploadApiDiffs.sh | 20 - uploadJavadocs.sh | 9 - util/compareBuilds.sh | 105 + util/generate-latest-docs.sh | 30 + util/publish-snapshot-on-commit.sh | 17 + 552 files changed, 65980 insertions(+), 34257 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guice.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
