diff options
| -rw-r--r-- | build.properties | 6 | ||||
| -rw-r--r-- | servlet/build.properties | 4 | ||||
| -rw-r--r-- | servlet/src/com/google/inject/servlet/GuiceFilter.java (renamed from servlet/src/main/java/com/google/inject/servlet/GuiceFilter.java) | 0 | ||||
| -rw-r--r-- | servlet/src/com/google/inject/servlet/RequestParameters.java (renamed from servlet/src/main/java/com/google/inject/servlet/RequestParameters.java) | 0 | ||||
| -rw-r--r-- | servlet/src/com/google/inject/servlet/RequestScoped.java (renamed from servlet/src/main/java/com/google/inject/servlet/RequestScoped.java) | 0 | ||||
| -rw-r--r-- | servlet/src/com/google/inject/servlet/ServletModule.java (renamed from servlet/src/main/java/com/google/inject/servlet/ServletModule.java) | 0 | ||||
| -rw-r--r-- | servlet/src/com/google/inject/servlet/ServletScopes.java (renamed from servlet/src/main/java/com/google/inject/servlet/ServletScopes.java) | 0 | ||||
| -rw-r--r-- | servlet/src/com/google/inject/servlet/SessionScoped.java (renamed from servlet/src/main/java/com/google/inject/servlet/SessionScoped.java) | 0 | ||||
| -rw-r--r-- | servlet/src/com/google/inject/servlet/package-info.java (renamed from servlet/src/main/java/com/google/inject/servlet/package-info.java) | 0 | ||||
| -rw-r--r-- | servlet/test/com/google/inject/servlet/ServletTest.java (renamed from servlet/src/test/java/com/google/inject/servlet/ServletTest.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/AbstractErrorHandler.java (renamed from src/main/java/com/google/inject/AbstractErrorHandler.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/AbstractModule.java (renamed from src/main/java/com/google/inject/AbstractModule.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Binder.java (renamed from src/main/java/com/google/inject/Binder.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/BinderImpl.java (renamed from src/main/java/com/google/inject/BinderImpl.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Binding.java (renamed from src/main/java/com/google/inject/Binding.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/BindingAnnotation.java (renamed from src/main/java/com/google/inject/BindingAnnotation.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/BindingBuilderImpl.java (renamed from src/main/java/com/google/inject/BindingBuilderImpl.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/BindingImpl.java (renamed from src/main/java/com/google/inject/BindingImpl.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ConfigurationException.java (renamed from src/main/java/com/google/inject/ConfigurationException.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ConstantBindingBuilderImpl.java (renamed from src/main/java/com/google/inject/ConstantBindingBuilderImpl.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ConstantConversionException.java (renamed from src/main/java/com/google/inject/ConstantConversionException.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ConstantFactory.java (renamed from src/main/java/com/google/inject/ConstantFactory.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ConstructionContext.java (renamed from src/main/java/com/google/inject/ConstructionContext.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ConstructionProxy.java (renamed from src/main/java/com/google/inject/ConstructionProxy.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ConstructionProxyFactory.java (renamed from src/main/java/com/google/inject/ConstructionProxyFactory.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ConstructorInjector.java (renamed from src/main/java/com/google/inject/ConstructorInjector.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Container.java (renamed from src/main/java/com/google/inject/Container.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ContainerImpl.java (renamed from src/main/java/com/google/inject/ContainerImpl.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ContainerScoped.java (renamed from src/main/java/com/google/inject/ContainerScoped.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Context.java (renamed from src/main/java/com/google/inject/Context.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ContextualCallable.java (renamed from src/main/java/com/google/inject/ContextualCallable.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/CreationException.java (renamed from src/main/java/com/google/inject/CreationException.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/DefaultConstructionProxyFactory.java (renamed from src/main/java/com/google/inject/DefaultConstructionProxyFactory.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ErrorHandler.java (renamed from src/main/java/com/google/inject/ErrorHandler.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ErrorMessages.java (renamed from src/main/java/com/google/inject/ErrorMessages.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ExternalContext.java (renamed from src/main/java/com/google/inject/ExternalContext.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Guice.java (renamed from src/main/java/com/google/inject/Guice.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Inject.java (renamed from src/main/java/com/google/inject/Inject.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/InterceptorStackCallback.java (renamed from src/main/java/com/google/inject/InterceptorStackCallback.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/InternalContext.java (renamed from src/main/java/com/google/inject/InternalContext.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/InternalFactory.java (renamed from src/main/java/com/google/inject/InternalFactory.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/InternalFactoryToProviderAdapter.java (renamed from src/main/java/com/google/inject/InternalFactoryToProviderAdapter.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/InvalidErrorHandler.java (renamed from src/main/java/com/google/inject/InvalidErrorHandler.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Key.java (renamed from src/main/java/com/google/inject/Key.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/LinkedBindingBuilderImpl.java (renamed from src/main/java/com/google/inject/LinkedBindingBuilderImpl.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/MethodAspect.java (renamed from src/main/java/com/google/inject/MethodAspect.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Module.java (renamed from src/main/java/com/google/inject/Module.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Provider.java (renamed from src/main/java/com/google/inject/Provider.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ProviderToInternalFactoryAdapter.java (renamed from src/main/java/com/google/inject/ProviderToInternalFactoryAdapter.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ProvisionException.java (renamed from src/main/java/com/google/inject/ProvisionException.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ProxyFactory.java (renamed from src/main/java/com/google/inject/ProxyFactory.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ProxyFactoryBuilder.java (renamed from src/main/java/com/google/inject/ProxyFactoryBuilder.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Scope.java (renamed from src/main/java/com/google/inject/Scope.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/ScopeAnnotation.java (renamed from src/main/java/com/google/inject/ScopeAnnotation.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Scopes.java (renamed from src/main/java/com/google/inject/Scopes.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/Stage.java (renamed from src/main/java/com/google/inject/Stage.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/TypeLiteral.java (renamed from src/main/java/com/google/inject/TypeLiteral.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/TypeWithArgument.java (renamed from src/main/java/com/google/inject/TypeWithArgument.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/binder/BindingAnnotationBuilder.java (renamed from src/main/java/com/google/inject/binder/BindingAnnotationBuilder.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/binder/BindingBuilder.java (renamed from src/main/java/com/google/inject/binder/BindingBuilder.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/binder/BindingImplementationBuilder.java (renamed from src/main/java/com/google/inject/binder/BindingImplementationBuilder.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/binder/BindingScopeBuilder.java (renamed from src/main/java/com/google/inject/binder/BindingScopeBuilder.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/binder/ConstantBindingBuilder.java (renamed from src/main/java/com/google/inject/binder/ConstantBindingBuilder.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/binder/LinkedBindingBuilder.java (renamed from src/main/java/com/google/inject/binder/LinkedBindingBuilder.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/binder/package-info.java (renamed from src/main/java/com/google/inject/binder/package-info.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/matcher/AbstractMatcher.java (renamed from src/main/java/com/google/inject/matcher/AbstractMatcher.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/matcher/Matcher.java (renamed from src/main/java/com/google/inject/matcher/Matcher.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/matcher/Matchers.java (renamed from src/main/java/com/google/inject/matcher/Matchers.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/matcher/package-info.java (renamed from src/main/java/com/google/inject/matcher/package-info.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/name/Named.java (renamed from src/main/java/com/google/inject/name/Named.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/name/NamedImpl.java (renamed from src/main/java/com/google/inject/name/NamedImpl.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/name/Names.java (renamed from src/main/java/com/google/inject/name/Names.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/name/package-info.java (renamed from src/main/java/com/google/inject/name/package-info.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/package-info.java (renamed from src/main/java/com/google/inject/package-info.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/spi/Message.java (renamed from src/main/java/com/google/inject/spi/Message.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/spi/SourceProvider.java (renamed from src/main/java/com/google/inject/spi/SourceProvider.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/spi/SourceProviders.java (renamed from src/main/java/com/google/inject/spi/SourceProviders.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/spi/package-info.java (renamed from src/main/java/com/google/inject/spi/package-info.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/tools/jmx/ManagedBinding.java (renamed from src/main/java/com/google/inject/tools/jmx/ManagedBinding.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/tools/jmx/ManagedBindingMBean.java (renamed from src/main/java/com/google/inject/tools/jmx/ManagedBindingMBean.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/tools/jmx/Manager.java (renamed from src/main/java/com/google/inject/tools/jmx/Manager.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/AbstractReferenceCache.java (renamed from src/main/java/com/google/inject/util/AbstractReferenceCache.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/Annotations.java (renamed from src/main/java/com/google/inject/util/Annotations.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/DuplicateAnnotationException.java (renamed from src/main/java/com/google/inject/util/DuplicateAnnotationException.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/FinalizablePhantomReference.java (renamed from src/main/java/com/google/inject/util/FinalizablePhantomReference.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/FinalizableReference.java (renamed from src/main/java/com/google/inject/util/FinalizableReference.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/FinalizableReferenceQueue.java (renamed from src/main/java/com/google/inject/util/FinalizableReferenceQueue.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/FinalizableSoftReference.java (renamed from src/main/java/com/google/inject/util/FinalizableSoftReference.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/FinalizableWeakReference.java (renamed from src/main/java/com/google/inject/util/FinalizableWeakReference.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/Function.java (renamed from src/main/java/com/google/inject/util/Function.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/GuiceFastClass.java (renamed from src/main/java/com/google/inject/util/GuiceFastClass.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/GuiceNamingPolicy.java (renamed from src/main/java/com/google/inject/util/GuiceNamingPolicy.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/LineNumbers.java (renamed from src/main/java/com/google/inject/util/LineNumbers.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/Objects.java (renamed from src/main/java/com/google/inject/util/Objects.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/ReferenceCache.java (renamed from src/main/java/com/google/inject/util/ReferenceCache.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/ReferenceMap.java (renamed from src/main/java/com/google/inject/util/ReferenceMap.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/ReferenceType.java (renamed from src/main/java/com/google/inject/util/ReferenceType.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/StackTraceElements.java (renamed from src/main/java/com/google/inject/util/StackTraceElements.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/Stopwatch.java (renamed from src/main/java/com/google/inject/util/Stopwatch.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/Strings.java (renamed from src/main/java/com/google/inject/util/Strings.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/SurrogateAnnotations.java (renamed from src/main/java/com/google/inject/util/SurrogateAnnotations.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/ToStringBuilder.java (renamed from src/main/java/com/google/inject/util/ToStringBuilder.java) | 0 | ||||
| -rw-r--r-- | src/com/google/inject/util/package-info.java (renamed from src/main/java/com/google/inject/util/package-info.java) | 0 | ||||
| -rw-r--r-- | struts2/example/build.properties | 3 | ||||
| -rw-r--r-- | struts2/example/src/com/google/inject/struts2/example/Count.java (renamed from struts2/example/src/main/java/com/google/inject/struts2/example/Count.java) | 0 | ||||
| -rw-r--r-- | struts2/example/src/com/google/inject/struts2/example/Counter.java (renamed from struts2/example/src/main/java/com/google/inject/struts2/example/Counter.java) | 0 | ||||
| -rw-r--r-- | struts2/example/src/com/google/inject/struts2/example/ExampleModule.java (renamed from struts2/example/src/main/java/com/google/inject/struts2/example/ExampleModule.java) | 0 | ||||
| -rw-r--r-- | struts2/example/src/com/google/inject/struts2/example/Main.java (renamed from struts2/example/src/main/java/com/google/inject/struts2/example/Main.java) | 0 | ||||
| -rw-r--r-- | struts2/plugin/build.properties | 2 | ||||
| -rw-r--r-- | struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java (renamed from struts2/plugin/src/main/java/com/google/inject/struts2/GuiceObjectFactory.java) | 0 | ||||
| -rw-r--r-- | struts2/plugin/src/struts-plugin.xml (renamed from struts2/plugin/src/main/java/struts-plugin.xml) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/AllTests.java (renamed from src/test/java/com/google/inject/AllTests.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/BindingAnnotationTest.java (renamed from src/test/java/com/google/inject/BindingAnnotationTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/BindingBuilderTest.java (renamed from src/test/java/com/google/inject/BindingBuilderTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/BoundInstanceInjectionTest.java (renamed from src/test/java/com/google/inject/BoundInstanceInjectionTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/BoundProviderTest.java (renamed from src/test/java/com/google/inject/BoundProviderTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/CircularDependencyTest.java (renamed from src/test/java/com/google/inject/CircularDependencyTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/ConstantConversionTest.java (renamed from src/test/java/com/google/inject/ConstantConversionTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/ContainerTest.java (renamed from src/test/java/com/google/inject/ContainerTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/ErrorHandlingTest.java (renamed from src/test/java/com/google/inject/ErrorHandlingTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/GenericInjectionTest.java (renamed from src/test/java/com/google/inject/GenericInjectionTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/ImplicitBindingTest.java (renamed from src/test/java/com/google/inject/ImplicitBindingTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/IntegrationTest.java (renamed from src/test/java/com/google/inject/IntegrationTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/KeyTest.java (renamed from src/test/java/com/google/inject/KeyTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/NotRequiredTest.java (renamed from src/test/java/com/google/inject/NotRequiredTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/PerformanceComparison.java (renamed from src/test/java/com/google/inject/PerformanceComparison.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/PreloadingTest.java (renamed from src/test/java/com/google/inject/PreloadingTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/ProviderInjectionTest.java (renamed from src/test/java/com/google/inject/ProviderInjectionTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/ProxyFactoryTest.java (renamed from src/test/java/com/google/inject/ProxyFactoryTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/ReflectionTest.java (renamed from src/test/java/com/google/inject/ReflectionTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/ScopesTest.java (renamed from src/test/java/com/google/inject/ScopesTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/StaticInjectionTest.java (renamed from src/test/java/com/google/inject/StaticInjectionTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/SuperclassTest.java (renamed from src/test/java/com/google/inject/SuperclassTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/TypeLiteralTest.java (renamed from src/test/java/com/google/inject/TypeLiteralTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/matcher/MatcherTest.java (renamed from src/test/java/com/google/inject/matcher/MatcherTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/tools/jmx/JmxTest.java (renamed from src/test/java/com/google/inject/tools/jmx/JmxTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/util/FinalizableReferenceQueueTest.java (renamed from src/test/java/com/google/inject/util/FinalizableReferenceQueueTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/util/ReferenceCacheTest.java (renamed from src/test/java/com/google/inject/util/ReferenceCacheTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/util/ReferenceMapTest.java (renamed from src/test/java/com/google/inject/util/ReferenceMapTest.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/util/ReferenceMapTestSuite.java (renamed from src/test/java/com/google/inject/util/ReferenceMapTestSuite.java) | 0 | ||||
| -rw-r--r-- | test/com/google/inject/util/SurrogateAnnotationsTest.java (renamed from src/test/java/com/google/inject/util/SurrogateAnnotationsTest.java) | 0 |
141 files changed, 7 insertions, 8 deletions
diff --git a/build.properties b/build.properties index f2a3e11b..6bfac268 100644 --- a/build.properties +++ b/build.properties @@ -1,8 +1,8 @@ version=1.0rc2 lib.dir=lib -src.dir=src/main/java -test.dir=src/test/java -servlet.src.dir=servlet/src/main/java +src.dir=src +test.dir=test +servlet.src.dir=servlet/src build.dir=build javadoc.packagenames=com.google.inject,com.google.inject.spi,\ com.google.inject.matcher,com.google.inject.servlet,com.google.inject.name,\ diff --git a/servlet/build.properties b/servlet/build.properties index ff420ad5..56546f04 100644 --- a/servlet/build.properties +++ b/servlet/build.properties @@ -1,6 +1,6 @@ version=1.0rc2 lib.dir=lib -src.dir=src/main/java -test.dir=src/test/java +src.dir=src +test.dir=test build.dir=build test.class=com.google.inject.servlet.ServletTest diff --git a/servlet/src/main/java/com/google/inject/servlet/GuiceFilter.java b/servlet/src/com/google/inject/servlet/GuiceFilter.java index 12b903fd..12b903fd 100644 --- a/servlet/src/main/java/com/google/inject/servlet/GuiceFilter.java +++ b/servlet/src/com/google/inject/servlet/GuiceFilter.java diff --git a/servlet/src/main/java/com/google/inject/servlet/RequestParameters.java b/servlet/src/com/google/inject/servlet/RequestParameters.java index 7bcf557b..7bcf557b 100644 --- a/servlet/src/main/java/com/google/inject/servlet/RequestParameters.java +++ b/servlet/src/com/google/inject/servlet/RequestParameters.java diff --git a/servlet/src/main/java/com/google/inject/servlet/RequestScoped.java b/servlet/src/com/google/inject/servlet/RequestScoped.java index 260af5d6..260af5d6 100644 --- a/servlet/src/main/java/com/google/inject/servlet/RequestScoped.java +++ b/servlet/src/com/google/inject/servlet/RequestScoped.java diff --git a/servlet/src/main/java/com/google/inject/servlet/ServletModule.java b/servlet/src/com/google/inject/servlet/ServletModule.java index 0472decf..0472decf 100644 --- a/servlet/src/main/java/com/google/inject/servlet/ServletModule.java +++ b/servlet/src/com/google/inject/servlet/ServletModule.java diff --git a/servlet/src/main/java/com/google/inject/servlet/ServletScopes.java b/servlet/src/com/google/inject/servlet/ServletScopes.java index f7cb0597..f7cb0597 100644 --- a/servlet/src/main/java/com/google/inject/servlet/ServletScopes.java +++ b/servlet/src/com/google/inject/servlet/ServletScopes.java diff --git a/servlet/src/main/java/com/google/inject/servlet/SessionScoped.java b/servlet/src/com/google/inject/servlet/SessionScoped.java index 28b7ad01..28b7ad01 100644 --- a/servlet/src/main/java/com/google/inject/servlet/SessionScoped.java +++ b/servlet/src/com/google/inject/servlet/SessionScoped.java diff --git a/servlet/src/main/java/com/google/inject/servlet/package-info.java b/servlet/src/com/google/inject/servlet/package-info.java index f48ca9e8..f48ca9e8 100644 --- a/servlet/src/main/java/com/google/inject/servlet/package-info.java +++ b/servlet/src/com/google/inject/servlet/package-info.java diff --git a/servlet/src/test/java/com/google/inject/servlet/ServletTest.java b/servlet/test/com/google/inject/servlet/ServletTest.java index e34c09a1..e34c09a1 100644 --- a/servlet/src/test/java/com/google/inject/servlet/ServletTest.java +++ b/servlet/test/com/google/inject/servlet/ServletTest.java diff --git a/src/main/java/com/google/inject/AbstractErrorHandler.java b/src/com/google/inject/AbstractErrorHandler.java index 44d1276a..44d1276a 100644 --- a/src/main/java/com/google/inject/AbstractErrorHandler.java +++ b/src/com/google/inject/AbstractErrorHandler.java diff --git a/src/main/java/com/google/inject/AbstractModule.java b/src/com/google/inject/AbstractModule.java index 3bbed528..3bbed528 100644 --- a/src/main/java/com/google/inject/AbstractModule.java +++ b/src/com/google/inject/AbstractModule.java diff --git a/src/main/java/com/google/inject/Binder.java b/src/com/google/inject/Binder.java index af7c0eba..af7c0eba 100644 --- a/src/main/java/com/google/inject/Binder.java +++ b/src/com/google/inject/Binder.java diff --git a/src/main/java/com/google/inject/BinderImpl.java b/src/com/google/inject/BinderImpl.java index b622415e..b622415e 100644 --- a/src/main/java/com/google/inject/BinderImpl.java +++ b/src/com/google/inject/BinderImpl.java diff --git a/src/main/java/com/google/inject/Binding.java b/src/com/google/inject/Binding.java index c423cac7..c423cac7 100644 --- a/src/main/java/com/google/inject/Binding.java +++ b/src/com/google/inject/Binding.java diff --git a/src/main/java/com/google/inject/BindingAnnotation.java b/src/com/google/inject/BindingAnnotation.java index 664d95e3..664d95e3 100644 --- a/src/main/java/com/google/inject/BindingAnnotation.java +++ b/src/com/google/inject/BindingAnnotation.java diff --git a/src/main/java/com/google/inject/BindingBuilderImpl.java b/src/com/google/inject/BindingBuilderImpl.java index fdb38c80..fdb38c80 100644 --- a/src/main/java/com/google/inject/BindingBuilderImpl.java +++ b/src/com/google/inject/BindingBuilderImpl.java diff --git a/src/main/java/com/google/inject/BindingImpl.java b/src/com/google/inject/BindingImpl.java index 4e21de68..4e21de68 100644 --- a/src/main/java/com/google/inject/BindingImpl.java +++ b/src/com/google/inject/BindingImpl.java diff --git a/src/main/java/com/google/inject/ConfigurationException.java b/src/com/google/inject/ConfigurationException.java index ceac337c..ceac337c 100644 --- a/src/main/java/com/google/inject/ConfigurationException.java +++ b/src/com/google/inject/ConfigurationException.java diff --git a/src/main/java/com/google/inject/ConstantBindingBuilderImpl.java b/src/com/google/inject/ConstantBindingBuilderImpl.java index 5a7e7000..5a7e7000 100644 --- a/src/main/java/com/google/inject/ConstantBindingBuilderImpl.java +++ b/src/com/google/inject/ConstantBindingBuilderImpl.java diff --git a/src/main/java/com/google/inject/ConstantConversionException.java b/src/com/google/inject/ConstantConversionException.java index c90def49..c90def49 100644 --- a/src/main/java/com/google/inject/ConstantConversionException.java +++ b/src/com/google/inject/ConstantConversionException.java diff --git a/src/main/java/com/google/inject/ConstantFactory.java b/src/com/google/inject/ConstantFactory.java index a5a29391..a5a29391 100644 --- a/src/main/java/com/google/inject/ConstantFactory.java +++ b/src/com/google/inject/ConstantFactory.java diff --git a/src/main/java/com/google/inject/ConstructionContext.java b/src/com/google/inject/ConstructionContext.java index 751643b5..751643b5 100644 --- a/src/main/java/com/google/inject/ConstructionContext.java +++ b/src/com/google/inject/ConstructionContext.java diff --git a/src/main/java/com/google/inject/ConstructionProxy.java b/src/com/google/inject/ConstructionProxy.java index 1c2af95d..1c2af95d 100644 --- a/src/main/java/com/google/inject/ConstructionProxy.java +++ b/src/com/google/inject/ConstructionProxy.java diff --git a/src/main/java/com/google/inject/ConstructionProxyFactory.java b/src/com/google/inject/ConstructionProxyFactory.java index 9bdf137c..9bdf137c 100644 --- a/src/main/java/com/google/inject/ConstructionProxyFactory.java +++ b/src/com/google/inject/ConstructionProxyFactory.java diff --git a/src/main/java/com/google/inject/ConstructorInjector.java b/src/com/google/inject/ConstructorInjector.java index 77e0f043..77e0f043 100644 --- a/src/main/java/com/google/inject/ConstructorInjector.java +++ b/src/com/google/inject/ConstructorInjector.java diff --git a/src/main/java/com/google/inject/Container.java b/src/com/google/inject/Container.java index 9ad642d7..9ad642d7 100644 --- a/src/main/java/com/google/inject/Container.java +++ b/src/com/google/inject/Container.java diff --git a/src/main/java/com/google/inject/ContainerImpl.java b/src/com/google/inject/ContainerImpl.java index 0a04eecb..0a04eecb 100644 --- a/src/main/java/com/google/inject/ContainerImpl.java +++ b/src/com/google/inject/ContainerImpl.java diff --git a/src/main/java/com/google/inject/ContainerScoped.java b/src/com/google/inject/ContainerScoped.java index 84bacc9e..84bacc9e 100644 --- a/src/main/java/com/google/inject/ContainerScoped.java +++ b/src/com/google/inject/ContainerScoped.java diff --git a/src/main/java/com/google/inject/Context.java b/src/com/google/inject/Context.java index 46c1c898..46c1c898 100644 --- a/src/main/java/com/google/inject/Context.java +++ b/src/com/google/inject/Context.java diff --git a/src/main/java/com/google/inject/ContextualCallable.java b/src/com/google/inject/ContextualCallable.java index f79d5d0a..f79d5d0a 100644 --- a/src/main/java/com/google/inject/ContextualCallable.java +++ b/src/com/google/inject/ContextualCallable.java diff --git a/src/main/java/com/google/inject/CreationException.java b/src/com/google/inject/CreationException.java index ecc778f0..ecc778f0 100644 --- a/src/main/java/com/google/inject/CreationException.java +++ b/src/com/google/inject/CreationException.java diff --git a/src/main/java/com/google/inject/DefaultConstructionProxyFactory.java b/src/com/google/inject/DefaultConstructionProxyFactory.java index b0bbaa06..b0bbaa06 100644 --- a/src/main/java/com/google/inject/DefaultConstructionProxyFactory.java +++ b/src/com/google/inject/DefaultConstructionProxyFactory.java diff --git a/src/main/java/com/google/inject/ErrorHandler.java b/src/com/google/inject/ErrorHandler.java index 0423a4b1..0423a4b1 100644 --- a/src/main/java/com/google/inject/ErrorHandler.java +++ b/src/com/google/inject/ErrorHandler.java diff --git a/src/main/java/com/google/inject/ErrorMessages.java b/src/com/google/inject/ErrorMessages.java index 330e86f8..330e86f8 100644 --- a/src/main/java/com/google/inject/ErrorMessages.java +++ b/src/com/google/inject/ErrorMessages.java diff --git a/src/main/java/com/google/inject/ExternalContext.java b/src/com/google/inject/ExternalContext.java index e2996527..e2996527 100644 --- a/src/main/java/com/google/inject/ExternalContext.java +++ b/src/com/google/inject/ExternalContext.java diff --git a/src/main/java/com/google/inject/Guice.java b/src/com/google/inject/Guice.java index 1cc233cc..1cc233cc 100644 --- a/src/main/java/com/google/inject/Guice.java +++ b/src/com/google/inject/Guice.java diff --git a/src/main/java/com/google/inject/Inject.java b/src/com/google/inject/Inject.java index 755d3026..755d3026 100644 --- a/src/main/java/com/google/inject/Inject.java +++ b/src/com/google/inject/Inject.java diff --git a/src/main/java/com/google/inject/InterceptorStackCallback.java b/src/com/google/inject/InterceptorStackCallback.java index ad74e699..ad74e699 100644 --- a/src/main/java/com/google/inject/InterceptorStackCallback.java +++ b/src/com/google/inject/InterceptorStackCallback.java diff --git a/src/main/java/com/google/inject/InternalContext.java b/src/com/google/inject/InternalContext.java index 1c256c20..1c256c20 100644 --- a/src/main/java/com/google/inject/InternalContext.java +++ b/src/com/google/inject/InternalContext.java diff --git a/src/main/java/com/google/inject/InternalFactory.java b/src/com/google/inject/InternalFactory.java index 04d5829d..04d5829d 100644 --- a/src/main/java/com/google/inject/InternalFactory.java +++ b/src/com/google/inject/InternalFactory.java diff --git a/src/main/java/com/google/inject/InternalFactoryToProviderAdapter.java b/src/com/google/inject/InternalFactoryToProviderAdapter.java index 2ffabea8..2ffabea8 100644 --- a/src/main/java/com/google/inject/InternalFactoryToProviderAdapter.java +++ b/src/com/google/inject/InternalFactoryToProviderAdapter.java diff --git a/src/main/java/com/google/inject/InvalidErrorHandler.java b/src/com/google/inject/InvalidErrorHandler.java index 4d7e1803..4d7e1803 100644 --- a/src/main/java/com/google/inject/InvalidErrorHandler.java +++ b/src/com/google/inject/InvalidErrorHandler.java diff --git a/src/main/java/com/google/inject/Key.java b/src/com/google/inject/Key.java index 01225daf..01225daf 100644 --- a/src/main/java/com/google/inject/Key.java +++ b/src/com/google/inject/Key.java diff --git a/src/main/java/com/google/inject/LinkedBindingBuilderImpl.java b/src/com/google/inject/LinkedBindingBuilderImpl.java index a0ce0a9c..a0ce0a9c 100644 --- a/src/main/java/com/google/inject/LinkedBindingBuilderImpl.java +++ b/src/com/google/inject/LinkedBindingBuilderImpl.java diff --git a/src/main/java/com/google/inject/MethodAspect.java b/src/com/google/inject/MethodAspect.java index bb55b0f3..bb55b0f3 100644 --- a/src/main/java/com/google/inject/MethodAspect.java +++ b/src/com/google/inject/MethodAspect.java diff --git a/src/main/java/com/google/inject/Module.java b/src/com/google/inject/Module.java index 9dfde3ea..9dfde3ea 100644 --- a/src/main/java/com/google/inject/Module.java +++ b/src/com/google/inject/Module.java diff --git a/src/main/java/com/google/inject/Provider.java b/src/com/google/inject/Provider.java index 5fc2a416..5fc2a416 100644 --- a/src/main/java/com/google/inject/Provider.java +++ b/src/com/google/inject/Provider.java diff --git a/src/main/java/com/google/inject/ProviderToInternalFactoryAdapter.java b/src/com/google/inject/ProviderToInternalFactoryAdapter.java index cd3ab1ea..cd3ab1ea 100644 --- a/src/main/java/com/google/inject/ProviderToInternalFactoryAdapter.java +++ b/src/com/google/inject/ProviderToInternalFactoryAdapter.java diff --git a/src/main/java/com/google/inject/ProvisionException.java b/src/com/google/inject/ProvisionException.java index ee9317c4..ee9317c4 100644 --- a/src/main/java/com/google/inject/ProvisionException.java +++ b/src/com/google/inject/ProvisionException.java diff --git a/src/main/java/com/google/inject/ProxyFactory.java b/src/com/google/inject/ProxyFactory.java index 00fc9235..00fc9235 100644 --- a/src/main/java/com/google/inject/ProxyFactory.java +++ b/src/com/google/inject/ProxyFactory.java diff --git a/src/main/java/com/google/inject/ProxyFactoryBuilder.java b/src/com/google/inject/ProxyFactoryBuilder.java index bb915bc7..bb915bc7 100644 --- a/src/main/java/com/google/inject/ProxyFactoryBuilder.java +++ b/src/com/google/inject/ProxyFactoryBuilder.java diff --git a/src/main/java/com/google/inject/Scope.java b/src/com/google/inject/Scope.java index 8ef6e07a..8ef6e07a 100644 --- a/src/main/java/com/google/inject/Scope.java +++ b/src/com/google/inject/Scope.java diff --git a/src/main/java/com/google/inject/ScopeAnnotation.java b/src/com/google/inject/ScopeAnnotation.java index 85d0972b..85d0972b 100644 --- a/src/main/java/com/google/inject/ScopeAnnotation.java +++ b/src/com/google/inject/ScopeAnnotation.java diff --git a/src/main/java/com/google/inject/Scopes.java b/src/com/google/inject/Scopes.java index c1f7558d..c1f7558d 100644 --- a/src/main/java/com/google/inject/Scopes.java +++ b/src/com/google/inject/Scopes.java diff --git a/src/main/java/com/google/inject/Stage.java b/src/com/google/inject/Stage.java index 7b65a70c..7b65a70c 100644 --- a/src/main/java/com/google/inject/Stage.java +++ b/src/com/google/inject/Stage.java diff --git a/src/main/java/com/google/inject/TypeLiteral.java b/src/com/google/inject/TypeLiteral.java index 78b34d32..78b34d32 100644 --- a/src/main/java/com/google/inject/TypeLiteral.java +++ b/src/com/google/inject/TypeLiteral.java diff --git a/src/main/java/com/google/inject/TypeWithArgument.java b/src/com/google/inject/TypeWithArgument.java index f38a5591..f38a5591 100644 --- a/src/main/java/com/google/inject/TypeWithArgument.java +++ b/src/com/google/inject/TypeWithArgument.java diff --git a/src/main/java/com/google/inject/binder/BindingAnnotationBuilder.java b/src/com/google/inject/binder/BindingAnnotationBuilder.java index 1276d32b..1276d32b 100644 --- a/src/main/java/com/google/inject/binder/BindingAnnotationBuilder.java +++ b/src/com/google/inject/binder/BindingAnnotationBuilder.java diff --git a/src/main/java/com/google/inject/binder/BindingBuilder.java b/src/com/google/inject/binder/BindingBuilder.java index 154a82db..154a82db 100644 --- a/src/main/java/com/google/inject/binder/BindingBuilder.java +++ b/src/com/google/inject/binder/BindingBuilder.java diff --git a/src/main/java/com/google/inject/binder/BindingImplementationBuilder.java b/src/com/google/inject/binder/BindingImplementationBuilder.java index 3d3b528c..3d3b528c 100644 --- a/src/main/java/com/google/inject/binder/BindingImplementationBuilder.java +++ b/src/com/google/inject/binder/BindingImplementationBuilder.java diff --git a/src/main/java/com/google/inject/binder/BindingScopeBuilder.java b/src/com/google/inject/binder/BindingScopeBuilder.java index 6e0a1129..6e0a1129 100644 --- a/src/main/java/com/google/inject/binder/BindingScopeBuilder.java +++ b/src/com/google/inject/binder/BindingScopeBuilder.java diff --git a/src/main/java/com/google/inject/binder/ConstantBindingBuilder.java b/src/com/google/inject/binder/ConstantBindingBuilder.java index d3c215b6..d3c215b6 100644 --- a/src/main/java/com/google/inject/binder/ConstantBindingBuilder.java +++ b/src/com/google/inject/binder/ConstantBindingBuilder.java diff --git a/src/main/java/com/google/inject/binder/LinkedBindingBuilder.java b/src/com/google/inject/binder/LinkedBindingBuilder.java index 7ca6bf63..7ca6bf63 100644 --- a/src/main/java/com/google/inject/binder/LinkedBindingBuilder.java +++ b/src/com/google/inject/binder/LinkedBindingBuilder.java diff --git a/src/main/java/com/google/inject/binder/package-info.java b/src/com/google/inject/binder/package-info.java index 7480df75..7480df75 100644 --- a/src/main/java/com/google/inject/binder/package-info.java +++ b/src/com/google/inject/binder/package-info.java diff --git a/src/main/java/com/google/inject/matcher/AbstractMatcher.java b/src/com/google/inject/matcher/AbstractMatcher.java index 0fd3a7e5..0fd3a7e5 100644 --- a/src/main/java/com/google/inject/matcher/AbstractMatcher.java +++ b/src/com/google/inject/matcher/AbstractMatcher.java diff --git a/src/main/java/com/google/inject/matcher/Matcher.java b/src/com/google/inject/matcher/Matcher.java index 681f1256..681f1256 100644 --- a/src/main/java/com/google/inject/matcher/Matcher.java +++ b/src/com/google/inject/matcher/Matcher.java diff --git a/src/main/java/com/google/inject/matcher/Matchers.java b/src/com/google/inject/matcher/Matchers.java index 49fd4d0e..49fd4d0e 100644 --- a/src/main/java/com/google/inject/matcher/Matchers.java +++ b/src/com/google/inject/matcher/Matchers.java diff --git a/src/main/java/com/google/inject/matcher/package-info.java b/src/com/google/inject/matcher/package-info.java index 59a4f19e..59a4f19e 100644 --- a/src/main/java/com/google/inject/matcher/package-info.java +++ b/src/com/google/inject/matcher/package-info.java diff --git a/src/main/java/com/google/inject/name/Named.java b/src/com/google/inject/name/Named.java index 6ffcace8..6ffcace8 100644 --- a/src/main/java/com/google/inject/name/Named.java +++ b/src/com/google/inject/name/Named.java diff --git a/src/main/java/com/google/inject/name/NamedImpl.java b/src/com/google/inject/name/NamedImpl.java index 40177151..40177151 100644 --- a/src/main/java/com/google/inject/name/NamedImpl.java +++ b/src/com/google/inject/name/NamedImpl.java diff --git a/src/main/java/com/google/inject/name/Names.java b/src/com/google/inject/name/Names.java index 0f06f1b5..0f06f1b5 100644 --- a/src/main/java/com/google/inject/name/Names.java +++ b/src/com/google/inject/name/Names.java diff --git a/src/main/java/com/google/inject/name/package-info.java b/src/com/google/inject/name/package-info.java index 333fb45f..333fb45f 100644 --- a/src/main/java/com/google/inject/name/package-info.java +++ b/src/com/google/inject/name/package-info.java diff --git a/src/main/java/com/google/inject/package-info.java b/src/com/google/inject/package-info.java index c7452402..c7452402 100644 --- a/src/main/java/com/google/inject/package-info.java +++ b/src/com/google/inject/package-info.java diff --git a/src/main/java/com/google/inject/spi/Message.java b/src/com/google/inject/spi/Message.java index bfecf28b..bfecf28b 100644 --- a/src/main/java/com/google/inject/spi/Message.java +++ b/src/com/google/inject/spi/Message.java diff --git a/src/main/java/com/google/inject/spi/SourceProvider.java b/src/com/google/inject/spi/SourceProvider.java index 7af45b6d..7af45b6d 100644 --- a/src/main/java/com/google/inject/spi/SourceProvider.java +++ b/src/com/google/inject/spi/SourceProvider.java diff --git a/src/main/java/com/google/inject/spi/SourceProviders.java b/src/com/google/inject/spi/SourceProviders.java index e52e7d8b..e52e7d8b 100644 --- a/src/main/java/com/google/inject/spi/SourceProviders.java +++ b/src/com/google/inject/spi/SourceProviders.java diff --git a/src/main/java/com/google/inject/spi/package-info.java b/src/com/google/inject/spi/package-info.java index 0e47c3ac..0e47c3ac 100644 --- a/src/main/java/com/google/inject/spi/package-info.java +++ b/src/com/google/inject/spi/package-info.java diff --git a/src/main/java/com/google/inject/tools/jmx/ManagedBinding.java b/src/com/google/inject/tools/jmx/ManagedBinding.java index 798b8f9b..798b8f9b 100644 --- a/src/main/java/com/google/inject/tools/jmx/ManagedBinding.java +++ b/src/com/google/inject/tools/jmx/ManagedBinding.java diff --git a/src/main/java/com/google/inject/tools/jmx/ManagedBindingMBean.java b/src/com/google/inject/tools/jmx/ManagedBindingMBean.java index 6f9469a3..6f9469a3 100644 --- a/src/main/java/com/google/inject/tools/jmx/ManagedBindingMBean.java +++ b/src/com/google/inject/tools/jmx/ManagedBindingMBean.java diff --git a/src/main/java/com/google/inject/tools/jmx/Manager.java b/src/com/google/inject/tools/jmx/Manager.java index 8601e211..8601e211 100644 --- a/src/main/java/com/google/inject/tools/jmx/Manager.java +++ b/src/com/google/inject/tools/jmx/Manager.java diff --git a/src/main/java/com/google/inject/util/AbstractReferenceCache.java b/src/com/google/inject/util/AbstractReferenceCache.java index 3c04cdad..3c04cdad 100644 --- a/src/main/java/com/google/inject/util/AbstractReferenceCache.java +++ b/src/com/google/inject/util/AbstractReferenceCache.java diff --git a/src/main/java/com/google/inject/util/Annotations.java b/src/com/google/inject/util/Annotations.java index d3f86094..d3f86094 100644 --- a/src/main/java/com/google/inject/util/Annotations.java +++ b/src/com/google/inject/util/Annotations.java diff --git a/src/main/java/com/google/inject/util/DuplicateAnnotationException.java b/src/com/google/inject/util/DuplicateAnnotationException.java index 7694affa..7694affa 100644 --- a/src/main/java/com/google/inject/util/DuplicateAnnotationException.java +++ b/src/com/google/inject/util/DuplicateAnnotationException.java diff --git a/src/main/java/com/google/inject/util/FinalizablePhantomReference.java b/src/com/google/inject/util/FinalizablePhantomReference.java index 25198d83..25198d83 100644 --- a/src/main/java/com/google/inject/util/FinalizablePhantomReference.java +++ b/src/com/google/inject/util/FinalizablePhantomReference.java diff --git a/src/main/java/com/google/inject/util/FinalizableReference.java b/src/com/google/inject/util/FinalizableReference.java index b655b22f..b655b22f 100644 --- a/src/main/java/com/google/inject/util/FinalizableReference.java +++ b/src/com/google/inject/util/FinalizableReference.java diff --git a/src/main/java/com/google/inject/util/FinalizableReferenceQueue.java b/src/com/google/inject/util/FinalizableReferenceQueue.java index a29bd4b9..a29bd4b9 100644 --- a/src/main/java/com/google/inject/util/FinalizableReferenceQueue.java +++ b/src/com/google/inject/util/FinalizableReferenceQueue.java diff --git a/src/main/java/com/google/inject/util/FinalizableSoftReference.java b/src/com/google/inject/util/FinalizableSoftReference.java index 826e4c88..826e4c88 100644 --- a/src/main/java/com/google/inject/util/FinalizableSoftReference.java +++ b/src/com/google/inject/util/FinalizableSoftReference.java diff --git a/src/main/java/com/google/inject/util/FinalizableWeakReference.java b/src/com/google/inject/util/FinalizableWeakReference.java index dcb0d9f9..dcb0d9f9 100644 --- a/src/main/java/com/google/inject/util/FinalizableWeakReference.java +++ b/src/com/google/inject/util/FinalizableWeakReference.java diff --git a/src/main/java/com/google/inject/util/Function.java b/src/com/google/inject/util/Function.java index bf717947..bf717947 100644 --- a/src/main/java/com/google/inject/util/Function.java +++ b/src/com/google/inject/util/Function.java diff --git a/src/main/java/com/google/inject/util/GuiceFastClass.java b/src/com/google/inject/util/GuiceFastClass.java index 57d1b54f..57d1b54f 100644 --- a/src/main/java/com/google/inject/util/GuiceFastClass.java +++ b/src/com/google/inject/util/GuiceFastClass.java diff --git a/src/main/java/com/google/inject/util/GuiceNamingPolicy.java b/src/com/google/inject/util/GuiceNamingPolicy.java index 3a66a88c..3a66a88c 100644 --- a/src/main/java/com/google/inject/util/GuiceNamingPolicy.java +++ b/src/com/google/inject/util/GuiceNamingPolicy.java diff --git a/src/main/java/com/google/inject/util/LineNumbers.java b/src/com/google/inject/util/LineNumbers.java index c79a13ff..c79a13ff 100644 --- a/src/main/java/com/google/inject/util/LineNumbers.java +++ b/src/com/google/inject/util/LineNumbers.java diff --git a/src/main/java/com/google/inject/util/Objects.java b/src/com/google/inject/util/Objects.java index 59b3d25e..59b3d25e 100644 --- a/src/main/java/com/google/inject/util/Objects.java +++ b/src/com/google/inject/util/Objects.java diff --git a/src/main/java/com/google/inject/util/ReferenceCache.java b/src/com/google/inject/util/ReferenceCache.java index 4765a1c4..4765a1c4 100644 --- a/src/main/java/com/google/inject/util/ReferenceCache.java +++ b/src/com/google/inject/util/ReferenceCache.java diff --git a/src/main/java/com/google/inject/util/ReferenceMap.java b/src/com/google/inject/util/ReferenceMap.java index 03073f0a..03073f0a 100644 --- a/src/main/java/com/google/inject/util/ReferenceMap.java +++ b/src/com/google/inject/util/ReferenceMap.java diff --git a/src/main/java/com/google/inject/util/ReferenceType.java b/src/com/google/inject/util/ReferenceType.java index 8ec8f38e..8ec8f38e 100644 --- a/src/main/java/com/google/inject/util/ReferenceType.java +++ b/src/com/google/inject/util/ReferenceType.java diff --git a/src/main/java/com/google/inject/util/StackTraceElements.java b/src/com/google/inject/util/StackTraceElements.java index 4fc2e38c..4fc2e38c 100644 --- a/src/main/java/com/google/inject/util/StackTraceElements.java +++ b/src/com/google/inject/util/StackTraceElements.java diff --git a/src/main/java/com/google/inject/util/Stopwatch.java b/src/com/google/inject/util/Stopwatch.java index 9a46ee41..9a46ee41 100644 --- a/src/main/java/com/google/inject/util/Stopwatch.java +++ b/src/com/google/inject/util/Stopwatch.java diff --git a/src/main/java/com/google/inject/util/Strings.java b/src/com/google/inject/util/Strings.java index 56a674e6..56a674e6 100644 --- a/src/main/java/com/google/inject/util/Strings.java +++ b/src/com/google/inject/util/Strings.java diff --git a/src/main/java/com/google/inject/util/SurrogateAnnotations.java b/src/com/google/inject/util/SurrogateAnnotations.java index d461081c..d461081c 100644 --- a/src/main/java/com/google/inject/util/SurrogateAnnotations.java +++ b/src/com/google/inject/util/SurrogateAnnotations.java diff --git a/src/main/java/com/google/inject/util/ToStringBuilder.java b/src/com/google/inject/util/ToStringBuilder.java index a23a376c..a23a376c 100644 --- a/src/main/java/com/google/inject/util/ToStringBuilder.java +++ b/src/com/google/inject/util/ToStringBuilder.java diff --git a/src/main/java/com/google/inject/util/package-info.java b/src/com/google/inject/util/package-info.java index e0c30082..e0c30082 100644 --- a/src/main/java/com/google/inject/util/package-info.java +++ b/src/com/google/inject/util/package-info.java diff --git a/struts2/example/build.properties b/struts2/example/build.properties index f750b501..a155282f 100644 --- a/struts2/example/build.properties +++ b/struts2/example/build.properties @@ -1,4 +1,3 @@ lib.dir=../lib -src.dir=src/main/java -test.dir=src/test/java +src.dir=src build.dir=build diff --git a/struts2/example/src/main/java/com/google/inject/struts2/example/Count.java b/struts2/example/src/com/google/inject/struts2/example/Count.java index 4fca1516..4fca1516 100644 --- a/struts2/example/src/main/java/com/google/inject/struts2/example/Count.java +++ b/struts2/example/src/com/google/inject/struts2/example/Count.java diff --git a/struts2/example/src/main/java/com/google/inject/struts2/example/Counter.java b/struts2/example/src/com/google/inject/struts2/example/Counter.java index c375b981..c375b981 100644 --- a/struts2/example/src/main/java/com/google/inject/struts2/example/Counter.java +++ b/struts2/example/src/com/google/inject/struts2/example/Counter.java diff --git a/struts2/example/src/main/java/com/google/inject/struts2/example/ExampleModule.java b/struts2/example/src/com/google/inject/struts2/example/ExampleModule.java index b8a04f7e..b8a04f7e 100644 --- a/struts2/example/src/main/java/com/google/inject/struts2/example/ExampleModule.java +++ b/struts2/example/src/com/google/inject/struts2/example/ExampleModule.java diff --git a/struts2/example/src/main/java/com/google/inject/struts2/example/Main.java b/struts2/example/src/com/google/inject/struts2/example/Main.java index 60fd0bec..60fd0bec 100644 --- a/struts2/example/src/main/java/com/google/inject/struts2/example/Main.java +++ b/struts2/example/src/com/google/inject/struts2/example/Main.java diff --git a/struts2/plugin/build.properties b/struts2/plugin/build.properties index 794228ac..31ee68de 100644 --- a/struts2/plugin/build.properties +++ b/struts2/plugin/build.properties @@ -1,4 +1,4 @@ version=1.0rc2 lib.dir=../lib -src.dir=src/main/java +src.dir=src build.dir=build diff --git a/struts2/plugin/src/main/java/com/google/inject/struts2/GuiceObjectFactory.java b/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java index 588222c3..588222c3 100644 --- a/struts2/plugin/src/main/java/com/google/inject/struts2/GuiceObjectFactory.java +++ b/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java diff --git a/struts2/plugin/src/main/java/struts-plugin.xml b/struts2/plugin/src/struts-plugin.xml index 6a317568..6a317568 100644 --- a/struts2/plugin/src/main/java/struts-plugin.xml +++ b/struts2/plugin/src/struts-plugin.xml diff --git a/src/test/java/com/google/inject/AllTests.java b/test/com/google/inject/AllTests.java index e1c6fc99..e1c6fc99 100644 --- a/src/test/java/com/google/inject/AllTests.java +++ b/test/com/google/inject/AllTests.java diff --git a/src/test/java/com/google/inject/BindingAnnotationTest.java b/test/com/google/inject/BindingAnnotationTest.java index 65392497..65392497 100644 --- a/src/test/java/com/google/inject/BindingAnnotationTest.java +++ b/test/com/google/inject/BindingAnnotationTest.java diff --git a/src/test/java/com/google/inject/BindingBuilderTest.java b/test/com/google/inject/BindingBuilderTest.java index 95bad9c1..95bad9c1 100644 --- a/src/test/java/com/google/inject/BindingBuilderTest.java +++ b/test/com/google/inject/BindingBuilderTest.java diff --git a/src/test/java/com/google/inject/BoundInstanceInjectionTest.java b/test/com/google/inject/BoundInstanceInjectionTest.java index 4a6cbdc5..4a6cbdc5 100644 --- a/src/test/java/com/google/inject/BoundInstanceInjectionTest.java +++ b/test/com/google/inject/BoundInstanceInjectionTest.java diff --git a/src/test/java/com/google/inject/BoundProviderTest.java b/test/com/google/inject/BoundProviderTest.java index 03e0a8e0..03e0a8e0 100644 --- a/src/test/java/com/google/inject/BoundProviderTest.java +++ b/test/com/google/inject/BoundProviderTest.java diff --git a/src/test/java/com/google/inject/CircularDependencyTest.java b/test/com/google/inject/CircularDependencyTest.java index 81debc43..81debc43 100644 --- a/src/test/java/com/google/inject/CircularDependencyTest.java +++ b/test/com/google/inject/CircularDependencyTest.java diff --git a/src/test/java/com/google/inject/ConstantConversionTest.java b/test/com/google/inject/ConstantConversionTest.java index 8815f8ce..8815f8ce 100644 --- a/src/test/java/com/google/inject/ConstantConversionTest.java +++ b/test/com/google/inject/ConstantConversionTest.java diff --git a/src/test/java/com/google/inject/ContainerTest.java b/test/com/google/inject/ContainerTest.java index 7792b130..7792b130 100644 --- a/src/test/java/com/google/inject/ContainerTest.java +++ b/test/com/google/inject/ContainerTest.java diff --git a/src/test/java/com/google/inject/ErrorHandlingTest.java b/test/com/google/inject/ErrorHandlingTest.java index 436e9422..436e9422 100644 --- a/src/test/java/com/google/inject/ErrorHandlingTest.java +++ b/test/com/google/inject/ErrorHandlingTest.java diff --git a/src/test/java/com/google/inject/GenericInjectionTest.java b/test/com/google/inject/GenericInjectionTest.java index d9b7ee6d..d9b7ee6d 100644 --- a/src/test/java/com/google/inject/GenericInjectionTest.java +++ b/test/com/google/inject/GenericInjectionTest.java diff --git a/src/test/java/com/google/inject/ImplicitBindingTest.java b/test/com/google/inject/ImplicitBindingTest.java index 55530058..55530058 100644 --- a/src/test/java/com/google/inject/ImplicitBindingTest.java +++ b/test/com/google/inject/ImplicitBindingTest.java diff --git a/src/test/java/com/google/inject/IntegrationTest.java b/test/com/google/inject/IntegrationTest.java index 06993b75..06993b75 100644 --- a/src/test/java/com/google/inject/IntegrationTest.java +++ b/test/com/google/inject/IntegrationTest.java diff --git a/src/test/java/com/google/inject/KeyTest.java b/test/com/google/inject/KeyTest.java index 795f4c2c..795f4c2c 100644 --- a/src/test/java/com/google/inject/KeyTest.java +++ b/test/com/google/inject/KeyTest.java diff --git a/src/test/java/com/google/inject/NotRequiredTest.java b/test/com/google/inject/NotRequiredTest.java index d218623e..d218623e 100644 --- a/src/test/java/com/google/inject/NotRequiredTest.java +++ b/test/com/google/inject/NotRequiredTest.java diff --git a/src/test/java/com/google/inject/PerformanceComparison.java b/test/com/google/inject/PerformanceComparison.java index 7953fe0d..7953fe0d 100644 --- a/src/test/java/com/google/inject/PerformanceComparison.java +++ b/test/com/google/inject/PerformanceComparison.java diff --git a/src/test/java/com/google/inject/PreloadingTest.java b/test/com/google/inject/PreloadingTest.java index c8f1abb8..c8f1abb8 100644 --- a/src/test/java/com/google/inject/PreloadingTest.java +++ b/test/com/google/inject/PreloadingTest.java diff --git a/src/test/java/com/google/inject/ProviderInjectionTest.java b/test/com/google/inject/ProviderInjectionTest.java index 8aa0d30f..8aa0d30f 100644 --- a/src/test/java/com/google/inject/ProviderInjectionTest.java +++ b/test/com/google/inject/ProviderInjectionTest.java diff --git a/src/test/java/com/google/inject/ProxyFactoryTest.java b/test/com/google/inject/ProxyFactoryTest.java index 4b8f9e4f..4b8f9e4f 100644 --- a/src/test/java/com/google/inject/ProxyFactoryTest.java +++ b/test/com/google/inject/ProxyFactoryTest.java diff --git a/src/test/java/com/google/inject/ReflectionTest.java b/test/com/google/inject/ReflectionTest.java index e7f4a79a..e7f4a79a 100644 --- a/src/test/java/com/google/inject/ReflectionTest.java +++ b/test/com/google/inject/ReflectionTest.java diff --git a/src/test/java/com/google/inject/ScopesTest.java b/test/com/google/inject/ScopesTest.java index 024f7a81..024f7a81 100644 --- a/src/test/java/com/google/inject/ScopesTest.java +++ b/test/com/google/inject/ScopesTest.java diff --git a/src/test/java/com/google/inject/StaticInjectionTest.java b/test/com/google/inject/StaticInjectionTest.java index d3a4b212..d3a4b212 100644 --- a/src/test/java/com/google/inject/StaticInjectionTest.java +++ b/test/com/google/inject/StaticInjectionTest.java diff --git a/src/test/java/com/google/inject/SuperclassTest.java b/test/com/google/inject/SuperclassTest.java index 63559367..63559367 100644 --- a/src/test/java/com/google/inject/SuperclassTest.java +++ b/test/com/google/inject/SuperclassTest.java diff --git a/src/test/java/com/google/inject/TypeLiteralTest.java b/test/com/google/inject/TypeLiteralTest.java index 0aa70ff1..0aa70ff1 100644 --- a/src/test/java/com/google/inject/TypeLiteralTest.java +++ b/test/com/google/inject/TypeLiteralTest.java diff --git a/src/test/java/com/google/inject/matcher/MatcherTest.java b/test/com/google/inject/matcher/MatcherTest.java index ec0d0cad..ec0d0cad 100644 --- a/src/test/java/com/google/inject/matcher/MatcherTest.java +++ b/test/com/google/inject/matcher/MatcherTest.java diff --git a/src/test/java/com/google/inject/tools/jmx/JmxTest.java b/test/com/google/inject/tools/jmx/JmxTest.java index 65d0279b..65d0279b 100644 --- a/src/test/java/com/google/inject/tools/jmx/JmxTest.java +++ b/test/com/google/inject/tools/jmx/JmxTest.java diff --git a/src/test/java/com/google/inject/util/FinalizableReferenceQueueTest.java b/test/com/google/inject/util/FinalizableReferenceQueueTest.java index 1b9e4eed..1b9e4eed 100644 --- a/src/test/java/com/google/inject/util/FinalizableReferenceQueueTest.java +++ b/test/com/google/inject/util/FinalizableReferenceQueueTest.java diff --git a/src/test/java/com/google/inject/util/ReferenceCacheTest.java b/test/com/google/inject/util/ReferenceCacheTest.java index 05063065..05063065 100644 --- a/src/test/java/com/google/inject/util/ReferenceCacheTest.java +++ b/test/com/google/inject/util/ReferenceCacheTest.java diff --git a/src/test/java/com/google/inject/util/ReferenceMapTest.java b/test/com/google/inject/util/ReferenceMapTest.java index 24d0d336..24d0d336 100644 --- a/src/test/java/com/google/inject/util/ReferenceMapTest.java +++ b/test/com/google/inject/util/ReferenceMapTest.java diff --git a/src/test/java/com/google/inject/util/ReferenceMapTestSuite.java b/test/com/google/inject/util/ReferenceMapTestSuite.java index 50a31f4e..50a31f4e 100644 --- a/src/test/java/com/google/inject/util/ReferenceMapTestSuite.java +++ b/test/com/google/inject/util/ReferenceMapTestSuite.java diff --git a/src/test/java/com/google/inject/util/SurrogateAnnotationsTest.java b/test/com/google/inject/util/SurrogateAnnotationsTest.java index a83467bf..a83467bf 100644 --- a/src/test/java/com/google/inject/util/SurrogateAnnotationsTest.java +++ b/test/com/google/inject/util/SurrogateAnnotationsTest.java |